diff options
| author | makefu <github@syntax-fehler.de> | 2016-06-02 11:17:18 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-06-02 11:17:18 +0200 |
| commit | 4f28d9a306c2989304b52889c07e22992e40da0b (patch) | |
| tree | d07166696ed3bd97bb6a165418af8611b8f68571 /krebs/5pkgs/default.nix | |
| parent | d5961aa09e399bb30f940eb5ac2cfe26dfa51d65 (diff) | |
| parent | 7bd85d7bbbce68ba7317e16b805b1093ded3f1e2 (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 c96e7153..53fc4de4 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -36,13 +36,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 |