Merge branch 'build-with-strictDeps' of https://github.com/hercules-ci/nix

This commit is contained in:
Eelco Dolstra 2021-04-15 14:15:21 +02:00
commit 76980a1f3d
6 changed files with 14 additions and 9 deletions

View file

@ -78,7 +78,8 @@
buildPackages.git
buildPackages.mercurial
buildPackages.jq
];
]
++ lib.optionals stdenv.isLinux [(pkgs.util-linuxMinimal or pkgs.utillinuxMinimal)];
buildDeps =
[ curl
@ -90,7 +91,7 @@
lowdown
gmock
]
++ lib.optionals stdenv.isLinux [libseccomp (pkgs.util-linuxMinimal or pkgs.utillinuxMinimal)]
++ lib.optionals stdenv.isLinux [libseccomp]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optional stdenv.isx86_64 libcpuid;
@ -233,6 +234,8 @@
separateDebugInfo = true;
strictDeps = true;
passthru.perl-bindings = with final; stdenv.mkDerivation {
name = "nix-perl-${version}";
@ -517,6 +520,8 @@
installCheckFlags = "sysconfdir=$(out)/etc";
stripAllList = ["bin"];
strictDeps = true;
};
});

View file

@ -1,5 +1,5 @@
if ! canUseSandbox; then exit; fi
if ! [[ $busybox =~ busybox ]]; then exit; fi
if ! canUseSandbox; then exit 99; fi
if ! [[ $busybox =~ busybox ]]; then exit 99; fi
unset NIX_STORE_DIR
unset NIX_STATE_DIR

View file

@ -4,7 +4,7 @@ case $system in
*linux*)
;;
*)
exit 0;
exit 99;
esac
set -m # enable job control, needed for kill

View file

@ -2,13 +2,13 @@ source common.sh
clearStore
if ! canUseSandbox; then exit; fi
if ! canUseSandbox; then exit 99; fi
# Note: we need to bind-mount $SHELL into the chroot. Currently we
# only support the case where $SHELL is in the Nix store, because
# otherwise things get complicated (e.g. if it's in /bin, do we need
# /lib as well?).
if [[ ! $SHELL =~ /nix/store ]]; then exit; fi
if [[ ! $SHELL =~ /nix/store ]]; then exit 99; fi
chmod -R u+w $TEST_ROOT/store0 || true
rm -rf $TEST_ROOT/store0

View file

@ -1,7 +1,7 @@
source common.sh
# FIXME
if [[ $(uname) != Linux ]]; then exit; fi
if [[ $(uname) != Linux ]]; then exit 99; fi
clearStore

View file

@ -6,7 +6,7 @@ clearCache
nix shell -f shell-hello.nix hello -c hello | grep 'Hello World'
nix shell -f shell-hello.nix hello -c hello NixOS | grep 'Hello NixOS'
if ! canUseSandbox; then exit; fi
if ! canUseSandbox; then exit 99; fi
chmod -R u+w $TEST_ROOT/store0 || true
rm -rf $TEST_ROOT/store0