diff options
author | tv <tv@shackspace.de> | 2015-10-22 20:14:01 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-10-22 20:14:01 +0200 |
commit | 128e5feae9829ec1c60d16f3d44382435ff1ef86 (patch) | |
tree | f98601e8408a8f949022d86610828afef6836e0f /makefu/2configs/base-sources.nix | |
parent | 9ba8fc142cb14aa3768cb99bf9170f7875beafd1 (diff) | |
parent | f092e6acb4500569eccee7aed65b521adb3b07b6 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/2configs/base-sources.nix')
-rw-r--r-- | makefu/2configs/base-sources.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/makefu/2configs/base-sources.nix b/makefu/2configs/base-sources.nix index 826cd6fef..7e6bebec3 100644 --- a/makefu/2configs/base-sources.nix +++ b/makefu/2configs/base-sources.nix @@ -3,9 +3,9 @@ { krebs.build.source = { git.nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - #url = https://github.com/makefu/nixpkgs; - rev = "dc18f39bfb2f9d1ba62c7e8ad98544bb15cb26b2"; # nixos-15.09 + #url = https://github.com/NixOS/nixpkgs; + url = https://github.com/makefu/nixpkgs; + rev = "78340b042463fd35caa587b0db2e400e5666dbe1"; # nixos-15.09 + cherry-picked iodine }; dir.secrets = { |