ma pkgs/default: remove stockholm dependency

This commit is contained in:
makefu 2018-08-16 12:18:59 +02:00
parent 01978cd376
commit d5744deab6
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -1,6 +1,5 @@
with import <stockholm/lib>; self: super:
self: super: let with super.lib; with builtins; let
# This callPackage will try to detect obsolete overrides. # This callPackage will try to detect obsolete overrides.
callPackage = path: args: let callPackage = path: args: let
override = super.callPackage path args; override = super.callPackage path args;
@ -15,6 +14,7 @@ self: super: let
override override
else override; else override;
eq = x: y: x == y;
subdirsOf = path: subdirsOf = path:
mapAttrs (name: _: path + "/${name}") mapAttrs (name: _: path + "/${name}")
(filterAttrs (_: eq "directory") (readDir path)); (filterAttrs (_: eq "directory") (readDir path));
@ -40,6 +40,6 @@ in {
}; };
} }
// mapAttrs (_: flip callPackage {}) // (mapAttrs (_: flip callPackage {})
(filterAttrs (_: dir: pathExists (dir + "/default.nix")) (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.)) (subdirsOf ./.)))