forked from M-Labs/nix-scripts
artiq: avoid conda breakage with - in version number
This commit is contained in:
parent
6114dbb738
commit
66456afae9
|
@ -8,7 +8,7 @@ let
|
||||||
COMMITCOUNT=`${git}/bin/git rev-list --count HEAD`
|
COMMITCOUNT=`${git}/bin/git rev-list --count HEAD`
|
||||||
'';
|
'';
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
echo -n 5.$COMMITCOUNT.`cut -c1-8 <<< $REV`-beta > $out
|
echo -n 5.$COMMITCOUNT.`cut -c1-8 <<< $REV`.beta > $out
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
2
main.nix
2
main.nix
|
@ -21,7 +21,7 @@ let
|
||||||
sha256 = "$HASH";
|
sha256 = "$HASH";
|
||||||
}
|
}
|
||||||
EOF
|
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
|
echo "{ stdenv, git, fetchgit }: \"$TIMESTAMP\"" > $out/pkgs/artiq-timestamp.nix
|
||||||
'';
|
'';
|
||||||
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
|
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
|
||||||
|
|
Loading…
Reference in New Issue