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

consistent naming

This commit is contained in:
Sebastien Bourdeauducq 2019-02-15 17:25:57 +08:00
parent 57ca15ebb8
commit d9f6661fa3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/conda-board.nix → artiq/conda-artiq-board.nix
View File

@ -46,10 +46,10 @@ let
EOF EOF
chmod 755 $out/fake-conda/build.sh chmod 755 $out/fake-conda/build.sh
''; '';
conda-board = import ./conda-build.nix { inherit pkgs; } { conda-artiq-board = import ./conda-build.nix { inherit pkgs; } {
name = "conda-artiq-board-${target}-${variant}"; name = "conda-artiq-board-${target}-${variant}";
src = fakeCondaSource; src = fakeCondaSource;
recipe = "fake-conda"; recipe = "fake-conda";
}; };
in in
conda-board conda-artiq-board

2
main.nix
View File

@ -31,7 +31,7 @@ let
in in
start // { start // {
"artiq-board-${board.target}-${board.variant}" = boardBinaries; "artiq-board-${board.target}-${board.variant}" = boardBinaries;
"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } { "conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-artiq-board.nix" { inherit pkgs; } {
artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
boardBinaries = boardBinaries; boardBinaries = boardBinaries;
target = board.target; target = board.target;