Skip to content

Commit f4592f3

Browse files
Merge branch 'nix-community:main' into main
2 parents 1aaf07d + 77e6a4e commit f4592f3

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
result
1+
result*
22
/.direnv
33
/docs/book

scripts/create-release.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env nix
2+
#! nix shell nixpkgs#bash nixpkgs#gnused --command bash
23

3-
set -eu -o pipefail
4+
set -euo pipefail
45

56
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
67
cd "$SCRIPT_DIR/.."

src/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let
3333
in
3434
stdenv.mkDerivation {
3535
pname = "nixos-anywhere";
36-
version = "1.6.0";
36+
version = "1.8.0";
3737
src = ./..;
3838
nativeBuildInputs = [ makeWrapper ];
3939
installPhase = ''

src/nixos-anywhere.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ if [ ${copyHostKeys-n} = "y" ]; then
719719
cp -a "\$p" "/mnt/\$p"
720720
done
721721
fi
722-
NIXOS_NO_CHECK=1 nixos-install --no-root-passwd --no-channel-copy --system "$nixosSystem"
722+
nixos-install --no-root-passwd --no-channel-copy --system "$nixosSystem"
723723
if [[ ${phases[reboot]} == 1 ]]; then
724724
if command -v zpool >/dev/null && [ "\$(zpool list)" != "no pools available" ]; then
725725
# we always want to export the zfs pools so people can boot from it without force import

0 commit comments

Comments
 (0)