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

Switch to 18.09 upstream

Browse Source
This commit is contained in:
Tyson Whitehead
2018-11-28 20:07:44 -05:00
parent d5b35e9d00
commit e20980dd84
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 @@
18.03 18.09

8
release.nix
View File

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