summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-10-13 21:06:43 +0200
committertv <tv@krebsco.de>2016-10-13 21:51:27 +0200
commitb4ec1fba50dc81df89cce88808dab1e232806cf4 (patch)
treec855686d7ed53e22bdfc9a2a9c2c860295792b17 /krebs
parent9cb65273b1e832f1bf7d98e977a0179c81d24b44 (diff)
lib: inline has-default-nix
Diffstat (limited to 'krebs')
-rw-r--r--krebs/4lib/default.nix2
-rw-r--r--krebs/5pkgs/default.nix2
2 files changed, 1 insertions, 3 deletions
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index cf5395039..b95564f74 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -28,8 +28,6 @@ let out = lib // rec {
lib = lib // { inherit genid optionalTrace; };
};
- dir.has-default-nix = path: pathExists (path + "/default.nix");
-
genid = import ./genid.nix { lib = lib // out; };
genid_signed = x: ((genid x) + 16777216) / 2;
git = import ./git.nix { lib = lib // out; };
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index cdab64212..75d1dac82 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -17,7 +17,7 @@ with config.krebs.lib;
in {}
// import ./builders.nix args
// mapAttrs (_: flip callPackage {})
- (filterAttrs (_: dir.has-default-nix)
+ (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.))
// {
empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";