forked from M-Labs/artiq
nix: consistent naming of board artifacts
This commit is contained in:
parent
8194f74252
commit
f673ce276f
|
@ -41,7 +41,7 @@ let
|
|||
buildenv = import ./artiq-dev.nix { inherit pkgs; };
|
||||
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
name = "artiq-board";
|
||||
name = "artiq-board-kasli-tester";
|
||||
src = null;
|
||||
phases = [ "buildPhase" "installPhase" ];
|
||||
buildPhase =
|
||||
|
|
|
@ -14,7 +14,7 @@ let
|
|||
|
||||
cat << EOF > $out/fake-conda/meta.yaml
|
||||
package:
|
||||
name: artiq-${target}-${variant}
|
||||
name: artiq-board-${target}-${variant}
|
||||
version: {{ environ["GIT_DESCRIBE_TAG"] }}
|
||||
|
||||
source:
|
||||
|
@ -27,7 +27,7 @@ let
|
|||
ignore_prefix_files: True
|
||||
|
||||
outputs:
|
||||
- name: artiq-${target}-${variant}
|
||||
- name: artiq-board-${target}-${variant}
|
||||
noarch: python
|
||||
files:
|
||||
- site-packages
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
{ pkgs ? import <nixpkgs> {}}:
|
||||
let
|
||||
artiqPkgs = import ./default.nix { inherit pkgs; };
|
||||
artiq-board = import ./artiq-board.nix { inherit pkgs; };
|
||||
artiq-board-kasli-tester = import ./artiq-board.nix { inherit pkgs; };
|
||||
jobs = rec {
|
||||
conda-artiq = import ./conda-build.nix { inherit pkgs; } {
|
||||
name = "conda-artiq";
|
||||
src = ../.;
|
||||
recipe = "conda/artiq";
|
||||
};
|
||||
inherit artiq-board;
|
||||
conda-artiq-board = import ./conda-board.nix { inherit pkgs; } {
|
||||
inherit artiq-board-kasli-tester;
|
||||
conda-artiq-board-kasli-tester = import ./conda-board.nix { inherit pkgs; } {
|
||||
artiqSrc = ../.;
|
||||
boardBinaries = artiq-board;
|
||||
boardBinaries = artiq-board-kasli-tester;
|
||||
};
|
||||
} // artiqPkgs;
|
||||
in
|
||||
|
|
Loading…
Reference in New Issue