Remove needless --experimental-feature
in a CA drvs test
This is already blanket enabled for these tests
This commit is contained in:
parent
ffadc35df1
commit
f9443143ae
1 changed files with 7 additions and 7 deletions
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
source common.sh
|
source common.sh
|
||||||
|
|
||||||
drv=$(nix-instantiate --experimental-features ca-derivations ./content-addressed.nix -A rootCA --arg seed 1)
|
drv=$(nix-instantiate ./content-addressed.nix -A rootCA --arg seed 1)
|
||||||
nix --experimental-features 'nix-command ca-derivations' show-derivation "$drv" --arg seed 1
|
nix show-derivation "$drv" --arg seed 1
|
||||||
|
|
||||||
buildAttr () {
|
buildAttr () {
|
||||||
local derivationPath=$1
|
local derivationPath=$1
|
||||||
local seedValue=$2
|
local seedValue=$2
|
||||||
shift; shift
|
shift; shift
|
||||||
local args=("--experimental-features" "ca-derivations" "./content-addressed.nix" "-A" "$derivationPath" --arg seed "$seedValue" "--no-out-link")
|
local args=("./content-addressed.nix" "-A" "$derivationPath" --arg seed "$seedValue" "--no-out-link")
|
||||||
args+=("$@")
|
args+=("$@")
|
||||||
nix-build "${args[@]}"
|
nix-build "${args[@]}"
|
||||||
}
|
}
|
||||||
|
@ -46,17 +46,17 @@ testCutoff () {
|
||||||
}
|
}
|
||||||
|
|
||||||
testGC () {
|
testGC () {
|
||||||
nix-instantiate --experimental-features ca-derivations ./content-addressed.nix -A rootCA --arg seed 5
|
nix-instantiate ./content-addressed.nix -A rootCA --arg seed 5
|
||||||
nix-collect-garbage --experimental-features ca-derivations --option keep-derivations true
|
nix-collect-garbage --option keep-derivations true
|
||||||
clearStore
|
clearStore
|
||||||
buildAttr rootCA 1 --out-link $TEST_ROOT/rootCA
|
buildAttr rootCA 1 --out-link $TEST_ROOT/rootCA
|
||||||
nix-collect-garbage --experimental-features ca-derivations
|
nix-collect-garbage
|
||||||
buildAttr rootCA 1 -j0
|
buildAttr rootCA 1 -j0
|
||||||
}
|
}
|
||||||
|
|
||||||
testNixCommand () {
|
testNixCommand () {
|
||||||
clearStore
|
clearStore
|
||||||
nix build --experimental-features 'nix-command ca-derivations' --file ./content-addressed.nix --no-link
|
nix build --file ./content-addressed.nix --no-link
|
||||||
}
|
}
|
||||||
|
|
||||||
# Regression test for https://github.com/NixOS/nix/issues/4775
|
# Regression test for https://github.com/NixOS/nix/issues/4775
|
||||||
|
|
Loading…
Reference in a new issue