diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2016-08-04 15:56:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-04 15:56:08 +0200 |
| commit | 3f3d18c0174786baff0d9e378b2f014c4663ef27 (patch) | |
| tree | d7f3a4421f7453b088914d6166427c922bcdb829 /nixos | |
| parent | ea7e705cd905e01bc65f2a7ccc6e700bd1bcd4e0 (diff) | |
| parent | 1e534e234b0a92bf06361fa41b7ac8691fdbc769 (diff) | |
| download | nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.tar nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.tar.gz nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.tar.bz2 nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.tar.lz nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.tar.xz nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.tar.zst nixpkgs-3f3d18c0174786baff0d9e378b2f014c4663ef27.zip | |
Merge pull request #17218 from bennofs/fix-nixos-version
fix nixos-version --hash when building from git
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/get-git-revision (renamed from nixos/modules/installer/tools/get-version-suffix) | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-git-revision index b8972cd57d2..b57d9cf9fa0 100644 --- a/nixos/modules/installer/tools/get-version-suffix +++ b/nixos/modules/installer/tools/get-git-revision @@ -17,6 +17,6 @@ getVersion() { if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then getVersion $nixpkgs if [ -n "$rev" ]; then - echo ".git.$rev" + echo "$rev" fi fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 5ecdcdb3cdb..80a4537375c 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -311,9 +311,10 @@ fi # nixos-version shows something useful). if [ -n "$canRun" ]; then if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true) - if [ -n "$suffix" ]; then - echo -n "$suffix" > "$nixpkgs/.version-suffix" || true + revision=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-git-revision "${extraBuildFlags[@]}" || true) + if [ -n "$revision" ]; then + echo -n ".git.$revision" > "$nixpkgs/.version-suffix" || true + echo -n "$revision" > "$nixpkgs/.git-revision" || true fi fi fi |