Skip to content

Commit c48d659

Browse files
committed
regenerate_cargo_nix.sh: set --extra-experimental-features flakes
This otherwise just fails with a message about flakes being disabled.
1 parent cf03486 commit c48d659

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

regenerate_cargo_nix.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -Eeuo pipefail
55
top="$(readlink -f "$(dirname "$0")")"
66

77
if [ -z "${IN_CRATE2NIX_SHELL:-}" ]; then
8-
exec nix-shell --pure "$top/shell.nix" --run "$(printf "%q " $0 "$@")"
8+
exec nix-shell --extra-experimental-features flakes --pure "$top/shell.nix" --run "$(printf "%q " $0 "$@")"
99
fi
1010

1111
options=$(getopt -o '' --long offline,no-cargo-build -- "$@")
@@ -53,13 +53,13 @@ else
5353
echo "Skipping because of --no-cargo-build"
5454
fi
5555

56-
noisily nix-build --arg release false $NIX_OPTIONS
57-
crate2nix=$(nix-build --arg release false $NIX_OPTIONS)/bin/crate2nix
56+
noisily nix-build --extra-experimental-features flakes --arg release false $NIX_OPTIONS
57+
crate2nix=$(nix-build --extra-experimental-features flakes --arg release false $NIX_OPTIONS)/bin/crate2nix
5858
noisily "$crate2nix" generate -n ../nix/nixpkgs.nix \
5959
-f ./crate2nix/Cargo.toml -o ./crate2nix/Cargo.nix || \
6060
{ echo "Regeneration of ./Cargo.nix failed." >&2 ; exit 1; }
6161

62-
nix-instantiate tests.nix --eval --strict --json -A buildTestConfigs | \
62+
nix-instantiate --extra-experimental-features flakes tests.nix --eval --strict --json -A buildTestConfigs | \
6363
jq -r .[].pregeneratedBuild | \
6464
while read cargo_nix; do
6565
if [ "$cargo_nix" = "null" ]; then

0 commit comments

Comments
 (0)