Merge branch 'main' into main

Author: mergify[bot]

scripts/create-release.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+cd "$SCRIPT_DIR/.."
+
+version=${1:-}
+if [[ -z $version ]]; then
+  echo "USAGE: $0 version" >&2
+  exit 1
+fi
+
+if [[ "$(git symbolic-ref --short HEAD)" != "main" ]]; then
+  echo "must be on main branch" >&2
+  exit 1
+fi
+
+# ensure we are up-to-date
+uncommitted_changes=$(git diff --compact-summary)
+if [[ -n $uncommitted_changes ]]; then
+  echo -e "There are uncommitted changes, exiting:\n${uncommitted_changes}" >&2
+  exit 1
+fi
+git pull [email protected]:nix-community/nixos-anywhere main
+unpushed_commits=$(git log --format=oneline origin/main..main)
+if [[ $unpushed_commits != "" ]]; then
+  echo -e "\nThere are unpushed changes, exiting:\n$unpushed_commits" >&2
+  exit 1
+fi
+sed -i -e "s!version = \".*\";!version = \"${version}\";!" src/default.nix
+git add src/default.nix
+nix-shell -p nix-fast-build --command "nix-fast-build --eval-workers 2"
+git commit -m "bump version ${version}"
+git tag "${version}"
+
+echo "now run 'git push --tags origin main'"

src/default.nix

@@ -33,7 +33,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "nixos-anywhere";
-  version = "1.3.0";
+  version = "1.6.0";
   src = ./..;
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''

src/nixos-anywhere.sh

@@ -74,7 +74,7 @@ Options:
   Also supports variants:
   nixos-anywhere --flake .#nixosConfigurations.mymachine.config.virtualisation.vmVariant
 * --target-host <ssh-host>
-  specified the SSH target host to deploy onto.
+  set the SSH target host to deploy onto.
 * -i <identity_file>
   selects which SSH private key file to use.
 * -p, --ssh-port <ssh_port>
@@ -342,6 +342,9 @@ parseArgs() {
 }
 
 # ssh wrapper
+runSshNoTty() {
+  ssh -i "$sshKeyDir"/nixos-anywhere -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${sshArgs[@]}" "$sshConnection" "$@"
+}
 runSshTimeout() {
   timeout 10 ssh -i "$sshKeyDir"/nixos-anywhere -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${sshArgs[@]}" "$sshConnection" "$@"
 }
@@ -458,19 +461,18 @@ generateHardwareConfig() {
   nixos-facter)
     if [[ ${isInstaller} == "y" ]]; then
       if [[ ${hasNixOSFacter} == "n" ]]; then
-        abort "nixos-facter is not available in booted installer. You may want to boot an installer image from here instead: https://github.com/nix-community/nixos-images"
+        abort "nixos-facter is not available in booted installer, use nixos-generate-config. For nixos-facter, you may want to boot an installer image from here instead: https://github.com/nix-community/nixos-images"
       fi
     else
       maybeSudo=""
     fi
 
     step "Generating hardware-configuration.nix using nixos-facter"
-    # FIXME: if we take the output directly it adds some weird characters at the beginning
-    runSsh -o ConnectTimeout=10 ${maybeSudo} "nixos-facter" >"$hardwareConfigPath"
+    runSshNoTty -o ConnectTimeout=10 ${maybeSudo} "nixos-facter" >"$hardwareConfigPath"
     ;;
   nixos-generate-config)
     step "Generating hardware-configuration.nix using nixos-generate-config"
-    runSsh -o ConnectTimeout=10 nixos-generate-config --show-hardware-config --no-filesystems >"$hardwareConfigPath"
+    runSshNoTty -o ConnectTimeout=10 nixos-generate-config --show-hardware-config --no-filesystems >"$hardwareConfigPath"
     ;;
   *)
     abort "Unknown hardware config backend: $hardwareConfigBackend"