From 9a342421ba54cec81de0e52504be89366d154579 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 14 Nov 2019 16:56:36 +0800 Subject: [PATCH] artiq: take into account beta version marker --- artiq-fast/pkgs/artiq-version.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/artiq-fast/pkgs/artiq-version.nix b/artiq-fast/pkgs/artiq-version.nix index 2a21317..39f9120 100644 --- a/artiq-fast/pkgs/artiq-version.nix +++ b/artiq-fast/pkgs/artiq-version.nix @@ -6,10 +6,15 @@ let buildPhase = '' REV=`${git}/bin/git rev-parse HEAD` MAJOR_VERSION=`cat MAJOR_VERSION` + if [ -e BETA ]; then + SUFFIX=".beta" + else + SUFFIX="" + fi COMMIT_COUNT=`${git}/bin/git rev-list --count HEAD` ''; installPhase = '' - echo -n $MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`.beta > $out + echo -n $MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`$SUFFIX > $out ''; }; in