diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-14 08:33:51 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-14 08:33:51 +0100 |
commit | d039c879845ddcde6108203781e4b001c409e2c2 (patch) | |
tree | 1f9e2a99d95c8866ddbef81b4bfa6a49ce979451 /pkgs/tools/package-management | |
parent | 34922a3951a0ada7af4fe808250abaf5feb4e28e (diff) | |
parent | 6a036d9fca013265b4109ffcaf6df62efa010fa3 (diff) |
Merge branch 'master' into closure-size
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 3a7158994a9cb..8369873368934 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"; + }; + }); + */ } |