From c46534d41b5b0f714f3dfae433ec0eab69c1ee4e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 17 Feb 2021 16:13:09 +0800
Subject: [PATCH] ARTIQ-6 is now stable, add legacy builds

---
 hydra/artiq.json | 63 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/hydra/artiq.json b/hydra/artiq.json
index cb12b6c..073281a 100644
--- a/hydra/artiq.json
+++ b/hydra/artiq.json
@@ -52,6 +52,7 @@
             "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false }
         }
     },
+
     "fast": {
         "enabled": 1,
         "hidden": false,
@@ -64,9 +65,27 @@
         "emailoverride": "",
         "keepnr": 10,
         "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
+            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
             "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
+            "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-6 1", "emailresponsible": false }
+        }
+    },
+    "board-generated": {
+        "enabled": 1,
+        "hidden": false,
+        "description": "Generated code for ARTIQ targets",
+        "nixexprinput": "nixScripts",
+        "nixexprpath": "artiq-board-generated",
+        "checkinterval": 14400,
+        "schedulingshares": 1,
+        "enableemail": false,
+        "emailoverride": "",
+        "keepnr": 10,
+        "inputs": {
+            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
+            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+            "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
+            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
         }
     },
     "full": {
@@ -80,14 +99,51 @@
         "enableemail": false,
         "emailoverride": "",
         "keepnr": 10,
+        "inputs": {
+            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
+            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+            "a6p": { "type": "boolean", "value": "true" },
+            "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false }
+        }
+    },
+
+    "fast-legacy": {
+        "enabled": 1,
+        "hidden": false,
+        "description": "Core ARTIQ packages to build fast for CI purposes (legacy version)",
+        "nixexprinput": "nixScripts",
+        "nixexprpath": "artiq-fast.nix",
+        "checkinterval": 300,
+        "schedulingshares": 10,
+        "enableemail": false,
+        "emailoverride": "",
+        "keepnr": 10,
+        "inputs": {
+            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
+            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+            "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
+        }
+    },
+    "full-legacy": {
+        "enabled": 1,
+        "hidden": false,
+        "description": "Full set of ARTIQ packages (legacy version)",
+        "nixexprinput": "nixScripts",
+        "nixexprpath": "artiq-full.nix",
+        "checkinterval": 86400,
+        "schedulingshares": 1,
+        "enableemail": false,
+        "emailoverride": "",
+        "keepnr": 10,
         "inputs": {
             "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
             "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
             "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
             "a6p": { "type": "boolean", "value": "false" },
-            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
+            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }
         }
     },
+
     "gluelogic": {
         "enabled": 1,
         "hidden": false,
@@ -108,6 +164,7 @@
             "phaserSrc": { "type": "git", "value": "git://github.com/quartiq/phaser", "emailresponsible": false }
         }
     },
+
     "zynq": {
         "enabled": 1,
         "hidden": false,