From 052da73d2bef667a7e6ab18d300c7f5d77dd4269 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 27 Jan 2023 11:24:54 +0800 Subject: [PATCH] remove last legacy drtio ddb --- artiq-full.nix | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/artiq-full.nix b/artiq-full.nix index 2a5d5cb..cfda6c8 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -147,35 +147,9 @@ let }; }) ) {} ${serializedTargets}; - drtio-systems = { - ${pkgs.lib.optionalString use-generated '' - ap = { - master = "apmaster"; - satellites = { - "1" = "apsatellite1"; - "2" = "apsatellite2"; - }; - }; - ''} - }; - drtio-ddbs = pkgs.lib.attrsets.mapAttrs' - (system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system) - (pkgs.stdenv.mkDerivation { - name = "device-db-\''${system}"; - buildInputs = ddbDeps; - phases = [ "buildPhase" ]; - buildPhase = " - mkdir \$out - artiq_ddb_template \ - \''${pkgs.lib.strings.concatStringsSep " " (pkgs.lib.attrsets.mapAttrsToList (dest: desc: "-s " + dest + " " + (src + "/\''${desc}.json")) crates.satellites) } \ - \''${src}/\''${crates.master}.json -o \$out/device_db.py - mkdir \$out/nix-support - echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products - "; - })) drtio-systems; extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; }; in - artiq-fast // artiq-targets // drtio-ddbs // extras // rec { + artiq-fast // artiq-targets // extras // rec { conda-artiq-board-kasli-tester = conda-artiq-board { target = "kasli"; variant = "tester";