Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2017-08-10 14:23:12 +02:00
commit 6e1ecc5c57
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
krebs/5pkgs/haskell/default.nix
View File

@ -11,9 +11,13 @@ let
in in
self: super: self: super:
{ {
haskell.packages = mapAttrs (_: pkgs: pkgs.override { haskell = super.haskell // {
inherit overrides; packages = mapAttrs (name: value:
}) super.haskell.packages; if hasAttr "override" value
then value.override { inherit overrides; }
else value
) super.haskell.packages;
};
haskellPackages = super.haskellPackages.override { haskellPackages = super.haskellPackages.override {
inherit overrides; inherit overrides;
}; };

4
krebs/5pkgs/simple/populate/default.nix
View File

@ -13,12 +13,12 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "populate"; name = "populate";
version = "1.2.1"; version = "1.2.2";
src = fetchgit { src = fetchgit {
url = http://cgit.ni.krebsco.de/populate; url = http://cgit.ni.krebsco.de/populate;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "13viizpmjkqxc3d9mk2bzspgnal07bma5m9lc90mcdlk36na3pkq"; sha256 = "041rpyhss6kby3jm14k7lhvagmg7hwvwxli06b00p76s110is40w";
}; };
phases = [ phases = [