diff options
| author | lassulus <lass@aidsballs.de> | 2016-01-10 12:34:09 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-01-10 12:34:09 +0100 |
| commit | 9737eeed58e2dfc8e4efcfe1e02dc2f315116e90 (patch) | |
| tree | e100bcd397d114f470a7ea639a9e6689dee38ebb /makefu/2configs/default.nix | |
| parent | 3f4cec9196253a72833d7b8e8328227ce665eefe (diff) | |
| parent | 49b6fd9c87678893ed47794b116660700994b1bc (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/default.nix')
| -rw-r--r-- | makefu/2configs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index a0b49edaf..7593eaff7 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -23,8 +23,8 @@ with lib; source = { git.nixpkgs = { #url = https://github.com/NixOS/nixpkgs; - url = mkDefault https://github.com/makefu/nixpkgs; - rev = mkDefault "3fd2c24685f604edc925f73ed56600b8c66236b3"; # nixos-15.09 + cherry-picking + url = mkDefault https://github.com/nixos/nixpkgs; + rev = mkDefault "93d8671e2c6d1d25f126ed30e5e6f16764330119"; # unstable @ 2015-01-03, tested on filepimp target-path = "/var/src/nixpkgs"; }; |