From e20980dd849ee61cd9e9c9909f60b4d554eda8fa Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Wed, 28 Nov 2018 20:07:44 -0500 Subject: [PATCH] Switch to 18.09 upstream --- .version | 2 +- release.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.version b/.version index a88d2ca..770bde1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -18.03 +18.09 diff --git a/release.nix b/release.nix index 2afb964..a3b8e5a 100644 --- a/release.nix +++ b/release.nix @@ -1,11 +1,11 @@ { ccpkgs # Checked out ccpkgs git repo ? { outPath = ./.; - revCount = 1234; + revCount = 1234 + 88; shortRev = "gabcdef"; } , nixpkgs # Checked out nixpkgs git repe ? { outPath = ./upstream; - revCount = 56789; + revCount = 56789 + 151577; shortRev = "gfedcba"; } , nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; } @@ -54,8 +54,8 @@ in let suffix = "${versionSeparator}${count}.${commit}"; }; - nixpkgsVersion = mkVersion 0 nixpkgsGit; - ccpkgsVersion = mkVersion 0 ccpkgsGit; + nixpkgsVersion = mkVersion 151577 nixpkgsGit; + ccpkgsVersion = mkVersion 88 ccpkgsGit; versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";