From c84c57e2805c2bb9292c369719beab49669366c1 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Tue, 26 Jan 2021 19:56:54 -0500 Subject: [PATCH] Switch to 20.09 upstream --- .version | 2 +- release.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.version b/.version index 88b8320..3eea3c4 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -20.03 \ No newline at end of file +20.09 diff --git a/release.nix b/release.nix index 1011059..5230d6b 100644 --- a/release.nix +++ b/release.nix @@ -1,11 +1,11 @@ { ccpkgs # Checked out ccpkgs git repo ? { outPath = ./.; - revCount = 1234 + 143; + revCount = 1234 + 149; shortRev = "gabcdef"; } , nixpkgs # Checked out nixpkgs git repe ? { outPath = ./upstream; - revCount = 5678 + 212894; + revCount = 5678 + 242760; shortRev = "gfedcba"; } , nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; } @@ -54,8 +54,8 @@ in let suffix = "${versionSeparator}${count}.${commit}"; }; - nixpkgsVersion = mkVersion 212894 nixpkgsGit; - ccpkgsVersion = mkVersion 143 ccpkgsGit; + nixpkgsVersion = mkVersion 242760 nixpkgsGit; + ccpkgsVersion = mkVersion 149 ccpkgsGit; versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";