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

move artiq-extras to artiq-full

This commit is contained in:
Sebastien Bourdeauducq 2019-07-17 20:22:13 +08:00
parent 0507ade49d
commit 11608e139c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq-full.nix
View File

@ -8,6 +8,7 @@ let
mkdir $out mkdir $out
cp -a ${<artiq-fast>} $out/fast cp -a ${<artiq-fast>} $out/fast
cp ${./artiq-full/extras.nix} $out/extras.nix
REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD` REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
SINARA_SRC_CLEAN=`mktemp -d` SINARA_SRC_CLEAN=`mktemp -d`
@ -91,8 +92,9 @@ let
"; ";
}; };
})) {} variants; })) {} variants;
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) asyncserial artiq; };
in in
artiq-fast // generic-kasli // { artiq-fast // extras // generic-kasli // {
artiq-board-sayma-satellite = artiq-board { artiq-board-sayma-satellite = artiq-board {
target = "sayma"; target = "sayma";
variant = "satellite"; variant = "satellite";

6
artiq-fast/artiq-extras.nix → artiq-full/extras.nix
View File

@ -13,7 +13,7 @@ let
inherit version src; inherit version src;
buildInputs = (with pkgs.python3Packages; [ sphinx sphinx_rtd_theme sphinx-argparse ]) ++ [ artiq ]; buildInputs = (with pkgs.python3Packages; [ sphinx sphinx_rtd_theme sphinx-argparse ]) ++ [ artiq ];
preBuild = '' preBuild = ''
export SOURCE_DATE_EPOCH=${with pkgs; import ./pkgs/artiq-timestamp.nix { inherit stdenv fetchgit git; }} export SOURCE_DATE_EPOCH=${import ./fast/pkgs/artiq-timestamp.nix { inherit (pkgs) stdenv fetchgit git; }}
cd doc cd doc
''; '';
makeFlags = [ "html" ]; makeFlags = [ "html" ];
@ -29,9 +29,9 @@ let
echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
''; '';
}; };
"conda-${name}" = import ./conda-build.nix { inherit pkgs; } { "conda-${name}" = import ./fast/conda-build.nix { inherit pkgs; } {
name = "conda-${name}"; name = "conda-${name}";
src = import ./conda-fake-source.nix { inherit pkgs; } ({ src = import ./fast/conda-fake-source.nix { inherit pkgs; } ({
inherit name version src; inherit name version src;
} // condaOptions); } // condaOptions);
}; };