From bf4e7a579f4ec8e03011c553407b30877b008ae4 Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Fri, 29 Jun 2018 00:35:26 -0400
Subject: [PATCH] Upstream changed channel version suffix scheme

---
 release.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index 65012fa..f80b155 100644
--- a/release.nix
+++ b/release.nix
@@ -45,7 +45,7 @@ in let
     in
       assert (versionNixpkgs == versionCcpkgs); versionCcpkgs;
 
-  versionSeparator = if stableBranch then "." else "beta";
+  versionSeparator = if stableBranch then "." else "pre";
 
   mkVersion = base: git: rec {
     count = toString (git.revCount - base);
@@ -53,8 +53,8 @@ in let
     suffix = "${versionSeparator}${count}.${commit}";
   };
 
-  nixpkgsVersion = mkVersion 114283 nixpkgsGit;
-  ccpkgsVersion  = mkVersion      0 ccpkgsGit;
+  nixpkgsVersion = mkVersion 0 nixpkgsGit;
+  ccpkgsVersion  = mkVersion 0 ccpkgsGit;
 
   versionSuffix = "${versionSeparator}${ccpkgsVersion.count}.${nixpkgsVersion.count}.${ccpkgsVersion.commit}.${nixpkgsVersion.commit}";