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

Compare commits

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

No commits in common. "607a8fcfee3565e84e67da14227fbed1693217f0" and "4a137f2c588ae038f05e87acd38a596bd4b299ac" have entirely different histories.
607a8fcfee ... 4a137f2c58

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 { in pkgs.python3Packages.buildPythonPackage rec {
name = "artiq-board-${target}-${variant}-${version}"; name = "artiq-board-${target}-${variant}-${version}";
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; }); version = import ./pkgs/artiq-version.nix;
phases = [ "buildPhase" "installPhase" ]; phases = [ "buildPhase" "installPhase" ];
buildPhase = buildPhase =
'' ''

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

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

2
artiq/conda-artiq.nix
View File

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

6
main.nix
View File

@ -26,12 +26,12 @@ let
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; } generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
'' ''
TMPDIR=`mktemp -d` TMPDIR=`mktemp -d`
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed3
HASH=`nix-hash --type sha256 --base32 $TMPDIR` HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out echo \"$HASH\" > $out
''; '';
artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; }; artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; }); artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix";
windowsRunner = overrides: windowsRunner = overrides:
import "${generatedNix}/windows/run-test.nix" ({ import "${generatedNix}/windows/run-test.nix" ({
inherit pkgs; 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 ${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 mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed cp ${generatedNix}/pkgs/artiq-version.nix $out/passed3
''; '';
}; };
} }