From 0b332b36a2dd69e8fed724daf003aa419d40790e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 1 Jun 2019 10:35:01 +0800
Subject: [PATCH] use new STM32 build code on Hydra

---
 hydra/stm32.nix                | 14 ++++++++------
 stm32/release.nix => stm32.nix |  0
 stm32/default.nix              |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename stm32/release.nix => stm32.nix (100%)

diff --git a/hydra/stm32.nix b/hydra/stm32.nix
index 5ec6eac..9fcb200 100644
--- a/hydra/stm32.nix
+++ b/hydra/stm32.nix
@@ -4,12 +4,12 @@
     ''
     cat > $out << EOF
     {
-        "stabilizer": {
+        "stm32": {
             "enabled": 1,
             "hidden": false,
-            "description": "Stabilizer firmware",
-            "nixexprinput": "stabilizer",
-            "nixexprpath": "release.nix",
+            "description": "STM32 firmware",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "stm32.nix",
             "checkinterval": 300,
             "schedulingshares": 10,
             "enableemail": false,
@@ -17,8 +17,10 @@
             "keepnr": 10,
             "inputs": {
                 "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
-                "stabilizer": { "type": "git", "value": "git://github.com/quartiq/stabilizer.git", "emailresponsible": false },
-                "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false }
+                "mozillaOverlay": { "type": "git", "value": "git://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": "git://github.com/quartiq/stabilizer.git", "emailresponsible": false },
+                "thermostatSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/thermostat.git", "emailresponsible": false }
             }
         }
     }
diff --git a/stm32/release.nix b/stm32.nix
similarity index 100%
rename from stm32/release.nix
rename to stm32.nix
diff --git a/stm32/default.nix b/stm32/default.nix
index 7d5d4f0..023ec8e 100644
--- a/stm32/default.nix
+++ b/stm32/default.nix
@@ -31,12 +31,12 @@ in
   {
     stabilizer = buildStm32Firmware {
       name = "stabilizer";
-      src = /home/sb/stabilizer;
-      cargoSha256 = "1m4cxf6c4lh28xv4iagp20ni97cya1f12yg58q0m733qahk8gncb";
+      src = <stabilizerSrc>;
+      cargoSha256 = "184pr64z71h5wi0n9k2ddjyzklbg1cw5vly4ppgck2q6zlb3qbm4";
     };
     thermostat = buildStm32Firmware {
       name = "thermostat";
-      src = /home/sb/thermostat;
+      src = <thermostatSrc>;
       cargoSha256 = "1i9p5d5n01ajbp8lmavyway6vr1mmy107qnccff9glvr91rqx352";
     };
   }