From 4dd16d3aa85d7c316dbdcd85d53761434df6d55e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 8 Oct 2020 09:15:50 +0800 Subject: [PATCH] replace deprecated nixpkgs-channels repository --- hydra/artiq.json | 2 +- hydra/artiq.nix | 12 ++++++------ hydra/fpga.json | 2 +- hydra/fpga.nix | 2 +- hydra/stm32.json | 2 +- hydra/stm32.nix | 2 +- hydra/web.json | 2 +- hydra/web.nix | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hydra/artiq.json b/hydra/artiq.json index 85a1aef..921174d 100644 --- a/hydra/artiq.json +++ b/hydra/artiq.json @@ -10,7 +10,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 } } } diff --git a/hydra/artiq.nix b/hydra/artiq.nix index 0add869..91a0e54 100644 --- a/hydra/artiq.nix +++ b/hydra/artiq.nix @@ -16,7 +16,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.09", "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 master 1", "emailresponsible": false } } @@ -33,7 +33,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.09", "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 }, "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-beta:generated-nix", "emailresponsible": false } @@ -51,7 +51,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 } } @@ -68,7 +68,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false } @@ -86,7 +86,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.09", "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 }, "urukulSrc": { "type": "git", "value": "git://github.com/quartiq/urukul", "emailresponsible": false }, "mirnySrc": { "type": "git", "value": "git://github.com/quartiq/mirny", "emailresponsible": false }, @@ -105,7 +105,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }, "zynq-rs": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zynq-rs.git", "emailresponsible": false }, diff --git a/hydra/fpga.json b/hydra/fpga.json index fe49410..cdf76ee 100644 --- a/hydra/fpga.json +++ b/hydra/fpga.json @@ -10,7 +10,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false }, + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-19.03", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false } } } diff --git a/hydra/fpga.nix b/hydra/fpga.nix index 2f8ae1d..5edeba2 100644 --- a/hydra/fpga.nix +++ b/hydra/fpga.nix @@ -16,7 +16,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false }, + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-19.03", "emailresponsible": false }, "heavyx": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/HeavyX.git", "emailresponsible": false } } } diff --git a/hydra/stm32.json b/hydra/stm32.json index 2d5f5fe..0c99562 100644 --- a/hydra/stm32.json +++ b/hydra/stm32.json @@ -10,7 +10,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 } } } diff --git a/hydra/stm32.nix b/hydra/stm32.nix index 1cf759e..4f36e48 100644 --- a/hydra/stm32.nix +++ b/hydra/stm32.nix @@ -16,7 +16,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "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 }, diff --git a/hydra/web.json b/hydra/web.json index 49e834d..884cb0a 100644 --- a/hydra/web.json +++ b/hydra/web.json @@ -10,7 +10,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 } } } diff --git a/hydra/web.nix b/hydra/web.nix index 6e521de..30fec8d 100644 --- a/hydra/web.nix +++ b/hydra/web.nix @@ -16,7 +16,7 @@ "emailoverride": "", "keepnr": 10, "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, + "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 }, "webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false } }