forked from M-Labs/nix-scripts
reintroduce conda-board with new version scheme
This commit is contained in:
parent
28876a34dc
commit
f35f61b65d
|
@ -12,15 +12,13 @@ let
|
|||
cat << EOF > $out/fake-conda/meta.yaml
|
||||
package:
|
||||
name: artiq-board-${target}-${variant}
|
||||
version: {{ environ["GIT_DESCRIBE_TAG"] }}
|
||||
version: 5e-{{ environ["GIT_FULL_HASH"][:8] }}
|
||||
|
||||
source:
|
||||
git_url: ..
|
||||
|
||||
build:
|
||||
noarch: python
|
||||
number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
|
||||
string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
|
||||
ignore_prefix_files: True
|
||||
|
||||
outputs:
|
||||
|
|
12
main.nix
12
main.nix
|
@ -31,12 +31,12 @@ let
|
|||
in
|
||||
start // {
|
||||
"artiq-board-${board.target}-${board.variant}" = boardBinaries;
|
||||
#"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } {
|
||||
# artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
|
||||
# boardBinaries = boardBinaries;
|
||||
# target = board.target;
|
||||
# variant = board.variant;
|
||||
#};
|
||||
"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } {
|
||||
artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
|
||||
boardBinaries = boardBinaries;
|
||||
target = board.target;
|
||||
variant = board.variant;
|
||||
};
|
||||
}) {} boards;
|
||||
|
||||
jobs = {
|
||||
|
|
Loading…
Reference in New Issue