diff options
| author | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
| commit | d81b068113325fb7604089c3647c365a41804978 (patch) | |
| tree | 4c43ad2142825ac7c0a7045e5c48a039b25f6786 /krebs/5pkgs/default.nix | |
| parent | 1542f9bbee823025f703e6abf3836905cee416fd (diff) | |
| parent | f12578c66f8b7b829c0dec5255f358778c0d3366 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/5pkgs/default.nix')
| -rw-r--r-- | krebs/5pkgs/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index f2bbaf7f4..f0bda0ee1 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -38,13 +38,13 @@ with config.krebs.lib; ReaktorPlugins = callPackage ./Reaktor/plugins.nix {}; - #buildbot = callPackage <nixpkgs/pkgs/development/tools/build-managers/buildbot> { - # inherit (pkgs.pythonPackages) twisted jinja2; - # dateutil = pkgs.pythonPackages.dateutil_1_5; - # sqlalchemy_migrate_0_7 = pkgs.pythonPackages.sqlalchemy_migrate_func (pkgs.pythonPackages.sqlalchemy7.override { - # doCheck = false; - # }); - #}; + buildbot = callPackage <nixpkgs/pkgs/development/tools/build-managers/buildbot> { + inherit (pkgs.pythonPackages) twisted jinja2; + dateutil = pkgs.pythonPackages.dateutil_1_5; + sqlalchemy_migrate_0_7 = pkgs.pythonPackages.sqlalchemy_migrate_func (pkgs.pythonPackages.sqlalchemy7.override { + doCheck = false; + }); + }; # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d symlinkJoin = { name, paths, ... }@args: let |