From 5eea3a82675dacd0a55571d030e9e48ae4a561e6 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 17 Feb 2021 16:01:19 +0800
Subject: [PATCH] beta -> a6p

---
 artiq-full.nix   | 18 +++++++++---------
 hydra/artiq.json |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/artiq-full.nix b/artiq-full.nix
index aa0f1fe..57b44cf 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -1,12 +1,12 @@
 { pkgs ? import <nixpkgs> {}
-, beta ? <beta>
+, a6p ? <a6p>
 }:
 
 let
   sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>;
   sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>;
   sinaraSystemsSrc =
-    if beta
+    if a6p
     then pkgs.fetchgit {
       url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
       rev = sinaraSystemsRev;
@@ -14,7 +14,7 @@ let
     }
     else <sinaraSystemsSrc>;
   artiq-fast =
-    if beta
+    if a6p
     then <artiq-board-generated/fast>
     else <artiq-fast>;
   artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
@@ -47,7 +47,7 @@ let
     ''
     mkdir $out
 
-    ${if beta
+    ${if a6p
       then ''
         cp -a ${<artiq-board-generated>} $out/board-generated
         ln -s board-generated/fast $out/fast
@@ -59,7 +59,7 @@ let
     cp ${./artiq-full}/extras.nix $out
     cp ${./artiq-full}/*.patch $out
 
-    ${if beta
+    ${if a6p
       then ''
         REV=${sinaraSystemsRev}
         HASH=${sinaraSystemsHash}
@@ -77,7 +77,7 @@ let
     { pkgs ? import <nixpkgs> {}}:
 
     let
-      artiq-fast = import ${if beta then "./board-generated" else "."}/fast { inherit pkgs; };
+      artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; };
       ddbDeps = [
         artiq-fast.artiq
         (pkgs.python3.withPackages (ps: [ ps.jsonschema ]))
@@ -90,11 +90,11 @@ let
         builtins.map (variant: "\"${variant}\"") standaloneVariants
       )}];
 
-      vivado = import ${if beta then "./board-generated" else "."}/fast/vivado.nix {
+      vivado = import ${if a6p then "./board-generated" else "."}/fast/vivado.nix {
         inherit pkgs;
       };
       artiq-board =
-        ${if beta
+        ${if a6p
         then ''
           import ./artiq-board-vivado.nix {
             inherit pkgs vivado;
@@ -147,7 +147,7 @@ let
           })
       ) {} ${serializedTargets};
       drtio-systems = {
-        ${pkgs.lib.optionalString beta ''
+        ${pkgs.lib.optionalString a6p ''
           berkeley3 = {
             master = "berkeley3master";
             satellites = {
diff --git a/hydra/artiq.json b/hydra/artiq.json
index a314f87..cb12b6c 100644
--- a/hydra/artiq.json
+++ b/hydra/artiq.json
@@ -48,7 +48,7 @@
         "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 },
-            "beta": { "type": "boolean", "value": "true" },
+            "a6p": { "type": "boolean", "value": "true" },
             "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false }
         }
     },
@@ -84,7 +84,7 @@
             "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 },
-            "beta": { "type": "boolean", "value": "false" },
+            "a6p": { "type": "boolean", "value": "false" },
             "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
         }
     },