summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/base-sources.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-10-20 23:47:39 +0200
committerlassulus <lass@aidsballs.de>2015-10-20 23:47:39 +0200
commit114bbe669a632d65fc0d57608f96fdb6fb034f07 (patch)
tree3b727293ef5442700c0015d42fbd83d6f92e096f /makefu/2configs/base-sources.nix
parentf6187b3796edcfcce71bd239bbc1e793e6bb806a (diff)
parent24271c6f6b4e730eccb238c28ca4b04eb70ede92 (diff)
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/2configs/base-sources.nix')
-rw-r--r--makefu/2configs/base-sources.nix6
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 = {