From 6114dbb73887f8804dfa04c4e108ffcff6abc3e7 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 6 May 2019 23:09:11 +0800
Subject: [PATCH] artiq: better version numbers

---
 artiq/pkgs/artiq-version.nix | 3 ++-
 main.nix                     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/artiq/pkgs/artiq-version.nix b/artiq/pkgs/artiq-version.nix
index 00eaada..73d9d63 100644
--- a/artiq/pkgs/artiq-version.nix
+++ b/artiq/pkgs/artiq-version.nix
@@ -5,9 +5,10 @@ let
     src = import ./artiq-src.nix { inherit fetchgit; };
     buildPhase = ''
       REV=`${git}/bin/git rev-parse HEAD`
+      COMMITCOUNT=`${git}/bin/git rev-list --count HEAD`
     '';
     installPhase = ''
-      echo -n 5e.`cut -c1-8 <<< $REV` > $out
+      echo -n 5.$COMMITCOUNT.`cut -c1-8 <<< $REV`-beta > $out
     '';
   };
 in
diff --git a/main.nix b/main.nix
index c8af551..f75cf0d 100644
--- a/main.nix
+++ b/main.nix
@@ -5,6 +5,7 @@ let
     ''
     cp --no-preserve=mode,ownership -R ${./artiq} $out
     REV=`git --git-dir ${artiqSrc}/.git rev-parse HEAD`
+    COMMITCOUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD`
     TIMESTAMP=`git --git-dir ${artiqSrc}/.git log -1 --format=%ct`
     ARTIQ_SRC_CLEAN=`mktemp -d`
     cp -a ${artiqSrc}/. $ARTIQ_SRC_CLEAN
@@ -20,7 +21,7 @@ let
       sha256 = "$HASH";
     }
     EOF
-    echo "{ stdenv, git, fetchgit }: \"5e.`cut -c1-8 <<< $REV`\"" > $out/pkgs/artiq-version.nix
+    echo "{ stdenv, git, fetchgit }: \"5.$COMMITCOUNT.`cut -c1-8 <<< $REV`-beta\"" > $out/pkgs/artiq-version.nix
     echo "{ stdenv, git, fetchgit }: \"$TIMESTAMP\"" > $out/pkgs/artiq-timestamp.nix
     '';
   generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }