From 5f90f65d59df54614556b7b59f2a123cb095c027 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Wed, 19 Jan 2022 16:40:51 +0800 Subject: [PATCH] hydra: add humpback-dds flakes job --- hydra/mcu.json | 13 ++++++++++++- mcu/default.nix | 11 ----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hydra/mcu.json b/hydra/mcu.json index a140b33..207341e 100644 --- a/hydra/mcu.json +++ b/hydra/mcu.json @@ -15,7 +15,6 @@ "mozillaOverlay": { "type": "git", "value": "https://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "stabilizerSrc": { "type": "git", "value": "https://github.com/HarryMakes/stabilizer.git pre-mqtt 1", "emailresponsible": false }, - "humpbackDdsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/humpback-dds.git", "emailresponsible": false }, "saymaMmcSrc": { "type": "git", "value": "https://github.com/sinara-hw/openMMC.git sayma-devel", "emailresponsible": false } } }, @@ -30,5 +29,17 @@ "enableemail": false, "emailoverride": "", "keepnr": 10 + }, + "humpback-dds": { + "enabled": 1, + "type": 1, + "hidden": false, + "description": "Firmware for Humpback-DDS", + "flake": "git+https://git.m-labs.hk/M-Labs/humpback-dds.git", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 10 } } diff --git a/mcu/default.nix b/mcu/default.nix index ca1c28f..264529b 100644 --- a/mcu/default.nix +++ b/mcu/default.nix @@ -41,7 +41,6 @@ let dontFixup = true; }; - migen = (import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) lib fetchgit fetchFromGitHub python3Packages; misoc-new = true; }).migen; in pkgs.lib.attrsets.mapAttrs' (name: value: pkgs.lib.attrsets.nameValuePair ("stabilizer-" + name) @@ -77,16 +76,6 @@ in }; } // { - humpback-dds = buildStm32Firmware { - name = "humpback-dds"; - src = ; - extraNativeBuildInputs = [ - (pkgs.python3.withPackages(ps: [ migen ])) - pkgs.yosys - pkgs.nextpnr - pkgs.icestorm - ]; - }; # openMMC build system breaks if host compiler is not available, so do not use stdenvNoCC here sayma-mmc = pkgs.stdenv.mkDerivation { name = "sayma-mmc";