diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-15 20:05:29 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-15 20:05:29 +0100 |
commit | 41698c9efae1302f17b9ecef585979d7ddf7621a (patch) | |
tree | a1fd4746388fce0d47d9da9ac0fefc96b523ef4d /pkgs/tools/package-management | |
parent | 359ba5c971ec8aab1b62cc295e33da8f780b80ce (diff) | |
parent | 2029027d8883ab22e3044a71a4a33cc7a0beaf2e (diff) | |
download | nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.tar nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.gz nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.bz2 nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.lz nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.xz nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.zst nixlib-41698c9efae1302f17b9ecef585979d7ddf7621a.zip |
Merge branch 'master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d615ac10646a..3b303bab3b74 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -86,25 +86,25 @@ let in rec { - nix = nixStable; - - nixStable = common rec { - name = "nix-1.11.1"; - src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a"; - }; - }; - - nixUnstable = nixStable; - /* - nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4379_786046c"; - src = fetchurl { - url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz"; - sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5"; - }; - }); - */ + nix = nixStable; + + nixStable = common rec { + name = "nix-1.11.2"; + src = fetchurl { + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6"; + }; + }; + + nixUnstable = nixStable; + /* + nixUnstable = lib.lowPrio (common rec { + name = "nix-1.11pre4379_786046c"; + src = fetchurl { + url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz"; + sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5"; + }; + }); + */ } |