diff options
| author | lassulus <lassulus@lassul.us> | 2018-11-30 20:42:01 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-11-30 20:42:01 +0100 |
| commit | f6b5bbc305c8e59d532d95e1c5b011b96fe1ed43 (patch) | |
| tree | 4737d2417707eaaba3882ba5e873c1178af05ed2 /krebs | |
| parent | 7f5431a4999fea9626df300f707aa8c62de894e3 (diff) | |
| parent | 574356c63e8b11abd4fb7224cff9dca1c86332a2 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/5pkgs/haskell/default.nix | 9 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/default.nix | 8 |
2 files changed, 2 insertions, 15 deletions
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix index 7cdf65ea5..e824699f9 100644 --- a/krebs/5pkgs/haskell/default.nix +++ b/krebs/5pkgs/haskell/default.nix @@ -1,13 +1,6 @@ with import <stockholm/lib>; let - overrides = self: super: - listToAttrs - (map - (name: nameValuePair (removeSuffix ".nix" name) - (self.callPackage (./. + "/${name}") {})) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (attrNames (readDir ./.)))); + overrides = self: super: mapNixDir (path: self.callPackage path {}) ./.; in self: super: { diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix index 1b9d8c235..6ba4fec83 100644 --- a/krebs/5pkgs/simple/default.nix +++ b/krebs/5pkgs/simple/default.nix @@ -15,10 +15,4 @@ let else override; in - listToAttrs - (map - (name: nameValuePair (removeSuffix ".nix" name) - (callPackage (./. + "/${name}") {})) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (attrNames (readDir ./.)))) + mapNixDir (path: callPackage path {}) ./. |