diff options
| author | lassulus <lassulus@lassul.us> | 2017-08-10 12:54:09 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-08-10 12:54:09 +0200 |
| commit | 2bf77c0cc0a10ad2a7a5be07a6aa2a36af4742fb (patch) | |
| tree | 9c517ba7e5c55cc06c0e6319da6dc3c28bd6a106 /krebs | |
| parent | a6676174a858ee98a3568d13871b6f4e3bf4e73c (diff) | |
| parent | 3d36c20b3669f544f567351463dfbb99b973a338 (diff) | |
Merge remote-tracking branch 'ni/master' into HEAD
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/5pkgs/haskell/default.nix | 23 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/dic/default.nix | 4 |
2 files changed, 16 insertions, 11 deletions
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix index 1120356a7..64c5f9257 100644 --- a/krebs/5pkgs/haskell/default.nix +++ b/krebs/5pkgs/haskell/default.nix @@ -1,15 +1,20 @@ 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 ./.)))); +in self: super: { + haskell.packages = mapAttrs (_: pkgs: pkgs.override { + inherit overrides; + }) super.haskell.packages; haskellPackages = super.haskellPackages.override { - overrides = self: super: - listToAttrs - (map - (name: nameValuePair (removeSuffix ".nix" name) - (self.callPackage (./. + "/${name}") {})) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (attrNames (readDir ./.)))); + inherit overrides; }; } diff --git a/krebs/5pkgs/simple/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix index 963786f0c..ffd1092f7 100644 --- a/krebs/5pkgs/simple/dic/default.nix +++ b/krebs/5pkgs/simple/dic/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = http://cgit.ni.krebsco.de/dic; - rev = "refs/tags/v1.0.1"; - sha256 = "1686mba1z4m7vq70w26qpl00z1cz286c9bya9ql36g6w2pbcs8d3"; + rev = "refs/tags/v1.0.2"; + sha256 = "133x2z3dr5synckdvgnyc9fa7jdca43vj0973v148i13x4dqgr36"; }; phases = [ |