diff --git a/release.nix b/release.nix index 11276fa695a..4ccbd2ef754 100644 --- a/release.nix +++ b/release.nix @@ -1,11 +1,11 @@ -{ nixosSrc ? {outPath = ./.; rev = 1234;} -, nixpkgs ? {outPath = ; rev = 5678;} +{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; } +, nixpkgs ? {outPath = ; revCount = 5678; shortRev = "fedcba"; } }: let version = builtins.readFile ./.version; - versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}"; + versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}"; makeIso = @@ -85,7 +85,7 @@ let src = nixosSrc; - inherit officialRelease version; + inherit officialRelease version versionSuffix; distPhase = '' echo -n $VERSION_SUFFIX > .version-suffix