nixos-rebuild: inline get-version-suffix script (1bf0ffb2) · Commits · mdf / nixpkgs

nixos/modules/installer/tools/get-version-suffix

deleted100644 → 0

+0 −23

Original line number	Diff line number	Diff line
		getVersion() {
		local dir="$1"
		rev=
		gitDir="$dir/.git"
		if [ -e "$gitDir" ]; then
		if [ -z "$(type -P git)" ]; then
		echo "warning: Git not found; cannot figure out revision of $dir" >&2
		return
		fi
		cd "$dir"
		rev=$(git --git-dir="$gitDir" rev-parse --short HEAD)
		if git --git-dir="$gitDir" describe --always --dirty \| grep -q dirty; then
		rev+=M
		fi
		fi
		}

		if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
		getVersion $nixpkgs
		if [ -n "$rev" ]; then
		echo ".git.$rev"
		fi
		fi

+21 −1

Original line number	Diff line number	Diff line
		@@ -548,6 +548,26 @@ getNixDrv() {
		fi
		}

		getVersion() {
		local dir="$1"
		local rev=
		local gitDir="$dir/.git"
		if [ -e "$gitDir" ]; then
		if [ -z "$(type -P git)" ]; then
		echo "warning: Git not found; cannot figure out revision of $dir" >&2
		return
		fi
		cd "$dir"
		rev=$(git --git-dir="$gitDir" rev-parse --short HEAD)
		if git --git-dir="$gitDir" describe --always --dirty \| grep -q dirty; then
		rev+=M
		fi
		fi

		echo ".git.$rev"
		}


		if [[ -n $buildNix && -z $flake ]]; then
		log "building Nix..."
		getNixDrv
		@@ -569,7 +589,7 @@ fi
		# nixos-version shows something useful).
		if [[ -n $canRun && -z $flake ]]; then
		if nixpkgs=$(runCmd nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then
		suffix=$(runCmd $SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" \|\| true)
		suffix=$(getVersion "$nixpkgs" \|\| true)
		if [ -n "$suffix" ]; then
		echo -n "$suffix" > "$nixpkgs/.version-suffix" \|\| true
		fi