From 0bffe0382863e317b392996685bb1eedccd9fc90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Jun 2017 20:09:12 +0200 Subject: [PATCH] nix: 1.11.9 -> 1.11.10 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++--- pkgs/tools/package-management/nix/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 833782477199..6ccc645a125e 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9"; - i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9"; - x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9"; + x86_64-linux = "/nix/store/qiiwjyc338xigks5wqyxn0nnqiwy7xav-nix-1.11.10"; + i686-linux = "/nix/store/30fi96qqggjs51c5085y3fiws0a3wdcl-nix-1.11.10"; + x86_64-darwin = "/nix/store/zs6msqwjgjr9v9kbs5s0sap7vhdw692z-nix-1.11.10"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 40ef90fa2b22..bef203e588ec 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -39,7 +39,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli readline ] # Since 1.12 - ++ lib.optional (stdenv.isLinux && is112) libseccomp + ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) (aws-sdk-cpp.override { apis = ["s3"]; @@ -148,10 +148,10 @@ in rec { nix = nixStable; nixStable = (common rec { - name = "nix-1.11.9"; + name = "nix-1.11.10"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1"; + sha256 = "b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467"; }; }) // { perl-bindings = nixStable; };