summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-05-24 01:43:50 +0200
committertv <tv@krebsco.de>2017-05-24 01:43:50 +0200
commitf0b98bd0114df1e1ebb82ff300f9532d86b3eb18 (patch)
tree58a39173f7d6d7caa10a7b8fec1b5a1e54f0c08c /krebs/5pkgs/default.nix
parent46d6506916f699e3b707dc41cd68c92b98e50e5a (diff)
krebs/5pkgs: move simple pkgs to a subdir
Diffstat (limited to 'krebs/5pkgs/default.nix')
-rw-r--r--krebs/5pkgs/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 81481e14b..5af541258 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,10 +12,8 @@ with import <stockholm/lib>;
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
in {}
+ // import ./simple pkgs oldpkgs
// import ./writers.nix pkgs oldpkgs
- // mapAttrs (_: flip callPackage {})
- (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
- (subdirsOf ./.))
// {
empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
@@ -33,13 +31,12 @@ with import <stockholm/lib>;
(builtins.readDir ./haskell-overrides));
};
- ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
+ ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
- buildbot = callPackage ./buildbot {};
- buildbot-full = callPackage ./buildbot {
+ buildbot-full = callPackage ./simple/buildbot {
plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
};
- buildbot-worker = callPackage ./buildbot/worker.nix {};
+ buildbot-worker = callPackage ./simple/buildbot/worker.nix {};
# https://github.com/proot-me/PRoot/issues/106
proot = pkgs.writeDashBin "proot" ''