diff options
| author | lassulus <lassulus@lassul.us> | 2017-08-10 14:23:12 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-08-10 14:23:12 +0200 |
| commit | 6e1ecc5c57c0ec33e62d9dd77e6f59e71d04800c (patch) | |
| tree | bf14b514a1fddddf344ee3f94d39a4e8f7dac2d8 | |
| parent | 2bf77c0cc0a10ad2a7a5be07a6aa2a36af4742fb (diff) | |
| parent | 585092f686f82316911641c9eeecd3843e9031f0 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/5pkgs/haskell/default.nix | 10 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/populate/default.nix | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix index 64c5f9257..7cdf65ea5 100644 --- a/krebs/5pkgs/haskell/default.nix +++ b/krebs/5pkgs/haskell/default.nix @@ -11,9 +11,13 @@ let in self: super: { - haskell.packages = mapAttrs (_: pkgs: pkgs.override { - inherit overrides; - }) super.haskell.packages; + haskell = super.haskell // { + packages = mapAttrs (name: value: + if hasAttr "override" value + then value.override { inherit overrides; } + else value + ) super.haskell.packages; + }; haskellPackages = super.haskellPackages.override { inherit overrides; }; diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix index c2ca00590..48afee037 100644 --- a/krebs/5pkgs/simple/populate/default.nix +++ b/krebs/5pkgs/simple/populate/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.2.1"; + version = "1.2.2"; src = fetchgit { url = http://cgit.ni.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "13viizpmjkqxc3d9mk2bzspgnal07bma5m9lc90mcdlk36na3pkq"; + sha256 = "041rpyhss6kby3jm14k7lhvagmg7hwvwxli06b00p76s110is40w"; }; phases = [ |