diff options
| author | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
| commit | 03764d6765f8d2734d0960bc75cc6856bf0893d8 (patch) | |
| tree | b8cbbdc3a0381b5d1b1d08149c38a6bd5be5e9c5 /makefu/5pkgs/default.nix | |
| parent | 86466154f11748365cdab50b6ac113bdfd5542be (diff) | |
| parent | 96c4ab61202f515c7a361ef76c398e542771d6b4 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
| -rw-r--r-- | makefu/5pkgs/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index b1d6df67e..390c13ffe 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -1,6 +1,5 @@ -with import <stockholm/lib>; -self: super: let - +self: super: +with super.lib; with builtins; let # This callPackage will try to detect obsolete overrides. callPackage = path: args: let override = super.callPackage path args; @@ -15,6 +14,7 @@ self: super: let override else override; + eq = x: y: x == y; subdirsOf = path: mapAttrs (name: _: path + "/${name}") (filterAttrs (_: eq "directory") (readDir path)); @@ -40,6 +40,6 @@ in { }; } -// mapAttrs (_: flip callPackage {}) +// (mapAttrs (_: flip callPackage {}) (filterAttrs (_: dir: pathExists (dir + "/default.nix")) - (subdirsOf ./.)) + (subdirsOf ./.))) |