diff options
| author | Silvan Mosberger <silvan.mosberger@tweag.io> | 2024-01-16 20:40:39 +0100 |
|---|---|---|
| committer | Silvan Mosberger <silvan.mosberger@tweag.io> | 2024-01-16 21:15:40 +0100 |
| commit | 91b754edff9120b6dd868e61b2f50348f465a0d1 (patch) | |
| tree | 4e16e1ed1eb2aa0d0f1b0b90e2d68619cbcd2c06 /pkgs/test | |
| parent | e524c9dd3a1452c081b527a2f49f776a2193f62d (diff) | |
| download | nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.tar nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.tar.gz nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.tar.bz2 nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.tar.lz nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.tar.xz nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.tar.zst nixlib-91b754edff9120b6dd868e61b2f50348f465a0d1.zip | |
tests.nixpkgs-check-by-name: Minor Nix build refactor
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/nixpkgs-check-by-name/default.nix | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/test/nixpkgs-check-by-name/default.nix b/pkgs/test/nixpkgs-check-by-name/default.nix index d2de2d960042..c6991820fff2 100644 --- a/pkgs/test/nixpkgs-check-by-name/default.nix +++ b/pkgs/test/nixpkgs-check-by-name/default.nix @@ -10,6 +10,21 @@ let runtimeExprPath = ./src/eval.nix; nixpkgsLibPath = ../../../lib; + + # Needed to make Nix evaluation work inside nix builds + initNix = '' + export TEST_ROOT=$(pwd)/test-tmp + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + + # Ensure that even if tests run in parallel, we don't get an error + # We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first + nix-store --init + ''; + package = rustPlatform.buildRustPackage { name = "nixpkgs-check-by-name"; @@ -22,21 +37,8 @@ let makeWrapper ]; env.NIX_CHECK_BY_NAME_EXPR_PATH = "${runtimeExprPath}"; - # Needed to make Nix evaluation work inside the nix build - preCheck = '' - export TEST_ROOT=$(pwd)/test-tmp - export NIX_CONF_DIR=$TEST_ROOT/etc - export NIX_LOCALSTATE_DIR=$TEST_ROOT/var - export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_STORE_DIR=$TEST_ROOT/store - - export NIXPKGS_LIB_PATH=${nixpkgsLibPath} - - # Ensure that even if tests run in parallel, we don't get an error - # We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first - nix-store --init - ''; + env.NIXPKGS_LIB_PATH = "${nixpkgsLibPath}"; + preCheck = initNix; postCheck = '' cargo fmt --check cargo clippy -- -D warnings |