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

reintroduce conda-board with new version scheme

This commit is contained in:
Sebastien Bourdeauducq 2019-02-15 00:56:56 +08:00
parent 28876a34dc
commit f35f61b65d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/conda-board.nix
View File

@ -12,15 +12,13 @@ let
cat << EOF > $out/fake-conda/meta.yaml cat << EOF > $out/fake-conda/meta.yaml
package: package:
name: artiq-board-${target}-${variant} name: artiq-board-${target}-${variant}
version: {{ environ["GIT_DESCRIBE_TAG"] }} version: 5e-{{ environ["GIT_FULL_HASH"][:8] }}
source: source:
git_url: .. git_url: ..
build: build:
noarch: python noarch: python
number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
ignore_prefix_files: True ignore_prefix_files: True
outputs: outputs:

12
main.nix
View File

@ -31,12 +31,12 @@ 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-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;
# variant = board.variant; variant = board.variant;
#}; };
}) {} boards; }) {} boards;
jobs = { jobs = {