Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to 20.03 upstream

Browse Source
This commit is contained in:
Tyson Whitehead
2021-01-21 11:36:43 -05:00
parent 400422accd
commit a14b35ae83
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@@ -1 +1 @@
19.09
20.03

8
release.nix
View File

@@ -1,11 +1,11 @@
{ ccpkgs # Checked out ccpkgs git repo
? { outPath = ./.;
revCount = 1234 + 139;
revCount = 1234 + 143;
shortRev = "gabcdef";
}
, nixpkgs # Checked out nixpkgs git repe
? { outPath = ./upstream;
revCount = 5678 + 192668;
revCount = 5678 + 212894;
shortRev = "gfedcba";
}
, nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; }
@@ -54,8 +54,8 @@ in let
suffix = "${versionSeparator}${count}.${commit}";
};
nixpkgsVersion = mkVersion 192668 nixpkgsGit;
ccpkgsVersion = mkVersion 139 ccpkgsGit;
nixpkgsVersion = mkVersion 212894 nixpkgsGit;
ccpkgsVersion = mkVersion 143 ccpkgsGit;
versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";