summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-08-16 12:18:59 +0200
committermakefu <github@syntax-fehler.de>2018-08-16 12:18:59 +0200
commitd5744deab6429ae2b2cde64dcb10c869a49b1fe8 (patch)
treec9153f96f8537b33e08143bc3ff21a65b08b1be5
parent01978cd376f4c1add7e4ef1ad65a3cd068bf31b5 (diff)
ma pkgs/default: remove stockholm dependency
-rw-r--r--makefu/5pkgs/default.nix10
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 ./.)))