Upstream changed channel version suffix scheme

This commit is contained in:
Tyson Whitehead
2018-06-29 00:35:26 -04:00
parent bcbb1ef4fb
commit bf4e7a579f

View File

@@ -45,7 +45,7 @@ in let
in
assert (versionNixpkgs == versionCcpkgs); versionCcpkgs;
versionSeparator = if stableBranch then "." else "beta";
versionSeparator = if stableBranch then "." else "pre";
mkVersion = base: git: rec {
count = toString (git.revCount - base);
@@ -53,8 +53,8 @@ in let
suffix = "${versionSeparator}${count}.${commit}";
};
nixpkgsVersion = mkVersion 114283 nixpkgsGit;
ccpkgsVersion = mkVersion 0 ccpkgsGit;
nixpkgsVersion = mkVersion 0 nixpkgsGit;
ccpkgsVersion = mkVersion 0 ccpkgsGit;
versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";