From 09a7b7e43e5481a29d8d03ee68788dd6df6141a3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Aug 2017 13:33:00 +0200
Subject: populate: 1.2.1 -> 1.2.2
---
krebs/5pkgs/simple/populate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 = [
--
cgit v1.2.3
From 585092f686f82316911641c9eeecd3843e9031f0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Aug 2017 14:02:12 +0200
Subject: haskell overlay: only override packages
Fixes a regression introduced by a4c61396ed53bb640b8b557d80b3b283264ccd1a.
---
krebs/5pkgs/haskell/default.nix | 10 +++++++---
1 file changed, 7 insertions(+), 3 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;
};
--
cgit v1.2.3