mcu-contrib: break apart stabilizer and stabilizer-pounder

This reverts commit b72d035311.

hydra/artiq.json

@@ -182,7 +182,7 @@
         "emailoverride": "",
         "keepnr": 50,
         "inputs": {
-            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-23.11", "emailresponsible": false },
+            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false },
             "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
             "urukulSrc": { "type": "git", "value": "https://github.com/quartiq/urukul.git", "emailresponsible": false },
             "mirnySrc": { "type": "git", "value": "https://github.com/quartiq/mirny.git", "emailresponsible": false },

hydra/mcu.json

@@ -11,10 +11,11 @@
         "emailoverride": "",
         "keepnr": 10,
         "inputs": {
-            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-23.11", "emailresponsible": false },
+            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false },
             "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/quartiq/stabilizer.git", "emailresponsible": false },
+            "stabilizerSrc": { "type": "git", "value": "https://github.com/quartiq/stabilizer.git main", "emailresponsible": false },
+            "stabilizerPounderSrc": { "type": "git", "value": "https://github.com/spaqin/stabilizer.git pounder-telemetry", "emailresponsible": false },
             "saymaMmcSrc": { "type": "git", "value": "https://github.com/sinara-hw/openMMC.git sayma-devel", "emailresponsible": false }
         }
     },
@@ -41,5 +42,17 @@
         "enableemail": false,
         "emailoverride": "",
         "keepnr": 10
+    },
+    "kirdy": {
+        "enabled": 1,
+        "type": 1,
+        "hidden": false,
+        "description": "Firmware for the Sinara 1550 Kirdy laser diode driver",
+        "flake": "git+https://git.m-labs.hk/M-Labs/kirdy.git",
+        "checkinterval": 300,
+        "schedulingshares": 10,
+        "enableemail": false,
+        "emailoverride": "",
+        "keepnr": 10
     }
 }

hydra/web.json

@@ -11,7 +11,7 @@
         "emailoverride": "",
         "keepnr": 10,
         "inputs": {
-            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-23.11", "emailresponsible": false },
+            "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false },
             "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
             "webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false },
             "nmigenSrc": { "type": "git", "value": "https://gitlab.com/nmigen/nmigen.git", "emailresponsible": false }

mcu-contrib/default.nix

@@ -52,6 +52,7 @@ let
       '';
 
       dontFixup = true;
+      auditable = false;
     };
 in
   pkgs.lib.attrsets.mapAttrs'
@@ -62,20 +63,18 @@ in
       binaryName = name;
       cargoDepsName = "stabilizer";
       src = <stabilizerSrc>;
-      patchPhase = ''
-        substituteInPlace src/net/mod.rs \
-          --replace "[10, 34, 16, 10];" \
-                    "[192, 168, 1, 10];"  # or other default MQTT broker address
-      '';
       doCheck = false;
     } // value))) {
       dual-iir = {};
-      dual-iir-pounder_v1_0 = {
-        binaryName = "dual-iir";
-        extraCargoBuildArgs = "--features pounder_v1_0";
-      };
       lockin = {};
     } //
+    { stabilizer-pounder-dual-iir = buildStm32Firmware {
+      name = "stabilizer-pounder-dual-iir";
+      binaryName = "dual-iir";
+      cargoDepsName = "stabilizer";
+      src = <stabilizerPounderSrc>;
+      doCheck = false;
+    }; } //
   {
     # openMMC build system breaks if host compiler is not available, so do not use stdenvNoCC here
     sayma-mmc = pkgs.stdenv.mkDerivation {