Skip to content

nixUnstable: add util-linuxMinimal to nativeBuildInputs; skip flakey test #117295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cole-h merged 2 commits into from
Mar 24, 2021
Merged

nixUnstable: add util-linuxMinimal to nativeBuildInputs; skip flakey test #117295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1143d07
nixUnstable: add util-linuxMinimal to nativeBuildInputs
cole-h Mar 22, 2021
d8f3445
nixUnstable: skip flakey tests/ca/substitute.sh
cole-h Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let

common =
{ lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz
, bash, coreutils, gzip, gnutar
, bash, coreutils, util-linuxMinimal, gzip, gnutar
, pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid
Expand Down Expand Up @@ -41,6 +41,7 @@ common =

nativeBuildInputs =
[ pkg-config ]
++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
Expand Down Expand Up @@ -139,8 +140,13 @@ common =
doInstallCheck = true; # not cross

# socket path becomes too long otherwise
preInstallCheck = lib.optional stdenv.isDarwin ''
preInstallCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=$NIX_BUILD_TOP
'' +
# tests/ca/substitute.sh is flakey for some reason, so we skip it
# for now. https://github.com/NixOS/nix/issues/4667
lib.optionalString is24 ''
echo "exit 99" > tests/ca/substitute.sh
'';

separateDebugInfo = stdenv.isLinux;
Expand Down