about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-26 16:54:54 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-26 17:00:15 +0100
commit42e53ba62c46d3f48440a5859f3530ba54fe25d8 (patch)
tree52c36bbbcb009078ea5cb20ede8190f022ebd3f2 /pkgs/tools
parentc03b113a63abd8b46582468c86bc559c97551206 (diff)
downloadnixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.tar
nixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.tar.gz
nixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.tar.bz2
nixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.tar.lz
nixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.tar.xz
nixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.tar.zst
nixlib-42e53ba62c46d3f48440a5859f3530ba54fe25d8.zip
nix: 1.10 -> 1.11.1
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/package-management/nix/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b7b240780773..d615ac10646a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -89,13 +89,15 @@ in rec {
    nix = nixStable;
 
    nixStable = common rec {
-     name = "nix-1.10";
+     name = "nix-1.11.1";
      src = fetchurl {
        url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-       sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6";
+       sha256 = "21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a";
      };
    };
 
+   nixUnstable = nixStable;
+   /*
    nixUnstable = lib.lowPrio (common rec {
      name = "nix-1.11pre4379_786046c";
      src = fetchurl {
@@ -103,5 +105,6 @@ in rec {
        sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
      };
    });
+   */
 
 }