From 906093d5e73498f82c8ddc7c3ee79ea4fb22ef29 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 14 Feb 2022 15:28:48 +0800 Subject: [PATCH] hydra: use legacy sinara-systems repos new systems should use AFWS --- artiq-board-generated/default.nix | 2 +- artiq-full.nix | 4 ++-- hydra/artiq.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artiq-board-generated/default.nix b/artiq-board-generated/default.nix index 467c7b3..eccfcf0 100644 --- a/artiq-board-generated/default.nix +++ b/artiq-board-generated/default.nix @@ -27,7 +27,7 @@ let let sinaraSystemsSrc = pkgs.fetchgit { - url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; + url = "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git"; rev = "$REV"; sha256 = "$HASH"; }; diff --git a/artiq-full.nix b/artiq-full.nix index 69f4fbd..4690151 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -8,7 +8,7 @@ let sinaraSystemsSrc = if use-generated then pkgs.fetchgit { - url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; + url = "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git"; rev = sinaraSystemsRev; sha256 = sinaraSystemsHash; } @@ -112,7 +112,7 @@ let ''}; conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; }; src = pkgs.fetchgit { - url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; + url = "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git"; rev = "$REV"; sha256 = "$HASH"; }; diff --git a/hydra/artiq.json b/hydra/artiq.json index 0797043..f77d5f3 100644 --- a/hydra/artiq.json +++ b/hydra/artiq.json @@ -80,7 +80,7 @@ "inputs": { "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 }, - "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false }, + "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git master 1", "emailresponsible": false }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false } } }, @@ -156,7 +156,7 @@ "inputs": { "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 }, - "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false }, + "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git master 1", "emailresponsible": false }, "use-generated": { "type": "boolean", "value": "false" }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false } }