From 66456afae9aa4e45ca5d44a6c1bb9e707be68693 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 6 May 2019 23:14:33 +0800
Subject: [PATCH] artiq: avoid conda breakage with - in version number

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

diff --git a/artiq/pkgs/artiq-version.nix b/artiq/pkgs/artiq-version.nix
index 73d9d63..9715fd5 100644
--- a/artiq/pkgs/artiq-version.nix
+++ b/artiq/pkgs/artiq-version.nix
@@ -8,7 +8,7 @@ let
       COMMITCOUNT=`${git}/bin/git rev-list --count HEAD`
     '';
     installPhase = ''
-      echo -n 5.$COMMITCOUNT.`cut -c1-8 <<< $REV`-beta > $out
+      echo -n 5.$COMMITCOUNT.`cut -c1-8 <<< $REV`.beta > $out
     '';
   };
 in
diff --git a/main.nix b/main.nix
index f75cf0d..3d4a183 100644
--- a/main.nix
+++ b/main.nix
@@ -21,7 +21,7 @@ let
       sha256 = "$HASH";
     }
     EOF
-    echo "{ stdenv, git, fetchgit }: \"5.$COMMITCOUNT.`cut -c1-8 <<< $REV`-beta\"" > $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 ]; }