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

fix other uses of artiq-version.nix

This commit is contained in:
Sebastien Bourdeauducq 2019-04-24 15:17:40 +08:00
parent b509b728dd
commit 607a8fcfee
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File 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; version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
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; version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
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; version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
fakeCondaSource = import ./conda-fake-source.nix { inherit pkgs; } { fakeCondaSource = import ./conda-fake-source.nix { inherit pkgs; } {
name = "artiq"; name = "artiq";
inherit version; inherit version;

2
main.nix
View File

@ -31,7 +31,7 @@ let
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"; artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
windowsRunner = overrides: windowsRunner = overrides:
import "${generatedNix}/windows/run-test.nix" ({ import "${generatedNix}/windows/run-test.nix" ({
inherit pkgs; inherit pkgs;