From 303bc7b162d14ef735640728a65e244cd0f331c4 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 14 Nov 2019 17:44:36 +0800
Subject: [PATCH] fix beta version marker handling

---
 artiq-fast.nix                    | 6 ++++++
 artiq-fast/pkgs/artiq-version.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/artiq-fast.nix b/artiq-fast.nix
index 76b0096..7ded29d 100644
--- a/artiq-fast.nix
+++ b/artiq-fast.nix
@@ -2,10 +2,16 @@ let
   pkgs = import <nixpkgs> {};
   artiqSrc = <artiqSrc>;
   generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
+    # keep in sync with artiq-fast/pkgs/artiq-version.nix
     ''
     cp --no-preserve=mode,ownership -R ${./artiq-fast} $out
     REV=`git --git-dir ${artiqSrc}/.git rev-parse HEAD`
     MAJOR_VERSION=`cat ${artiqSrc}/MAJOR_VERSION`
+    if [ -e BETA ]; then
+      SUFFIX=".beta"
+    else
+      SUFFIX=""
+    fi
     COMMIT_COUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD`
     TIMESTAMP=`git --git-dir ${artiqSrc}/.git log -1 --format=%ct`
     ARTIQ_SRC_CLEAN=`mktemp -d`
diff --git a/artiq-fast/pkgs/artiq-version.nix b/artiq-fast/pkgs/artiq-version.nix
index 39f9120..6363d5e 100644
--- a/artiq-fast/pkgs/artiq-version.nix
+++ b/artiq-fast/pkgs/artiq-version.nix
@@ -3,6 +3,7 @@ let
   artiq-version = stdenv.mkDerivation {
     name = "artiq-version";
     src = import ./artiq-src.nix { inherit fetchgit; };
+    # keep in sync with ../../artiq-fast.nix
     buildPhase = ''
       REV=`${git}/bin/git rev-parse HEAD`
       MAJOR_VERSION=`cat MAJOR_VERSION`