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

Compare commits

base: M-Labs:4a137f2c588ae038f05e87acd38a596bd4b299ac
Branches Tags
M-Labs:master
...
compare: M-Labs:607a8fcfee3565e84e67da14227fbed1693217f0
Branches Tags
M-Labs:master

2 Commits
4a137f2c58 ... 607a8fcfee

Author SHA1 Message Date
Sebastien Bourdeauducq 607a8fcfee fix other uses of artiq-version.nix 2019-04-24 15:20:55 +08:00
Sebastien Bourdeauducq b509b728dd restore initial generateTestOkHash 2019-04-24 15:17:28 +08:00
4 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
artiq/artiq-board.nix
View File

@ -46,7 +46,7 @@ let
in pkgs.python3Packages.buildPythonPackage rec {
name = "artiq-board-${target}-${variant}-${version}";
version = import ./pkgs/artiq-version.nix;
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
phases = [ "buildPhase" "installPhase" ];
buildPhase =
''

2
artiq/conda-artiq-board.nix
View File

@ -4,7 +4,7 @@
with pkgs;
let
version = import ./pkgs/artiq-version.nix;
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
fakeCondaSource = runCommand "fake-condasrc-artiq-board-${target}-${variant}" { }
''
mkdir -p $out/fake-conda;

2
artiq/conda-artiq.nix
View File

@ -1,7 +1,7 @@
{ pkgs }:
let
version = import ./pkgs/artiq-version.nix;
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
fakeCondaSource = import ./conda-fake-source.nix { inherit pkgs; } {
name = "artiq";
inherit version;

6
main.nix
View File

@ -26,12 +26,12 @@ let
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
''
TMPDIR=`mktemp -d`
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed3
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed
HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out
'';
artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix";
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
windowsRunner = overrides:
import "${generatedNix}/windows/run-test.nix" ({
inherit pkgs;
@ -103,7 +103,7 @@ in
${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh
mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed3
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed
'';
};
}