diff options
| author | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
| commit | 2ae2bdc586177f674a987e354940765ad86cbaa2 (patch) | |
| tree | 0ba9baf9ff358a9eb2bb1111090d513b93268df7 /makefu/2configs/default.nix | |
| parent | 780ddec4ab268fbfd43ea9bf511ed4b3b0d35783 (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 c0d7685e3..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 "78340b042463fd35caa587b0db2e400e5666dbe1"; # 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"; }; |