M-Labs
/
nix-scripts
9
0
Fork 7
Code Issues 6 Pull Requests 3 Releases Wiki Activity

artiq: avoid conda breakage with - in version number

pull/16/head
Sebastien Bourdeauducq 2019-05-06 23:14:33 +08:00
parent 6114dbb738
commit 66456afae9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/pkgs/artiq-version.nix
View File

@ -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

2
main.nix
View File

@ -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 ]; }