diff --git a/nix/artiq-board.nix b/nix/artiq-board.nix index cde05539d..944044ecb 100644 --- a/nix/artiq-board.nix +++ b/nix/artiq-board.nix @@ -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 = diff --git a/nix/conda-board.nix b/nix/conda-board.nix index d8152bfc3..51775887d 100644 --- a/nix/conda-board.nix +++ b/nix/conda-board.nix @@ -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 diff --git a/nix/release.nix b/nix/release.nix index ac927d991..ba91ff029 100644 --- a/nix/release.nix +++ b/nix/release.nix @@ -1,17 +1,17 @@ { pkgs ? import {}}: 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