Skip to content

Commit

Permalink
nix: 1.11.9 -> 1.11.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@edolstra
edolstra committed Jun 12, 2017
1 parent b733a34 commit 0bffe03
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
}
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down Expand Up @@ -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; };

Expand Down

1 comment on commit 0bffe03

@vcunat
Copy link
Member

@vcunat vcunat commented on 0bffe03 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nix tests got broken on Hydra+Darwin:

running test tests/simple.sh
++ nix-instantiate simple.nix
warning: you did not specify ‘--add-root’; the result might be removed by the garbage collector
+ drvPath=/private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv
++ nix-store -q --binding system /private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv
+ test x86_64-darwin = x86_64-darwin
+ echo 'derivation is /private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv'
derivation is /private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv
++ nix-store -rvv /private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv
these derivations will be built:
  /private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv
building path(s) ‘/private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/0gsvb1kfgandpfpvdxa1yraskhnl7z03-simple’
|   executing builder ‘/nix/store/w37k77yaagi7kdyiy263cma1bnrxz0ry-bash-4.4-p12/bin/bash’
sandbox-exec: sandbox_apply_container: Operation not permitted
builder for ‘/private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv’ failed with exit code 71
error: build of ‘/private/tmp/nix-build-nix-1.11.10.drv-0/nix-1.11.10/tests/test-tmp/store/yfq3g093x67avb6mhfa11jlajl0fd1sf-simple.drv’ failed
+ outPath=
FAIL: tests/simple.sh

Please sign in to comment.