forked from M-Labs/nix-scripts
fix other uses of artiq-version.nix
This commit is contained in:
parent
b509b728dd
commit
607a8fcfee
|
@ -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 =
|
||||||
''
|
''
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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
2
main.nix
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue