Upstream changed channel version suffix scheme
This commit is contained in:
@@ -45,7 +45,7 @@ in let
|
|||||||
in
|
in
|
||||||
assert (versionNixpkgs == versionCcpkgs); versionCcpkgs;
|
assert (versionNixpkgs == versionCcpkgs); versionCcpkgs;
|
||||||
|
|
||||||
versionSeparator = if stableBranch then "." else "beta";
|
versionSeparator = if stableBranch then "." else "pre";
|
||||||
|
|
||||||
mkVersion = base: git: rec {
|
mkVersion = base: git: rec {
|
||||||
count = toString (git.revCount - base);
|
count = toString (git.revCount - base);
|
||||||
@@ -53,8 +53,8 @@ in let
|
|||||||
suffix = "${versionSeparator}${count}.${commit}";
|
suffix = "${versionSeparator}${count}.${commit}";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgsVersion = mkVersion 114283 nixpkgsGit;
|
nixpkgsVersion = mkVersion 0 nixpkgsGit;
|
||||||
ccpkgsVersion = mkVersion 0 ccpkgsGit;
|
ccpkgsVersion = mkVersion 0 ccpkgsGit;
|
||||||
|
|
||||||
versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";
|
versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user