From 0f1494af7f5d5ec076e75450f3d3e2f95b3a7549 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 12:43:05 +0100 Subject: [PATCH 01/15] teams/radicle: init --- maintainers/team-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a4dd4e619691..ef8d01cac28e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -687,6 +687,10 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + radicle = { + github = "radicle"; + }; + rocm = { github = "rocm"; }; From dcb8521ca855c047628e8ad34b8a2823e211947e Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 02/15] radicle-ci-broker: add radicle team as maintainer --- pkgs/by-name/ra/radicle-ci-broker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix index eb58afa5334a..54a86ae40314 100644 --- a/pkgs/by-name/ra/radicle-ci-broker/package.nix +++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mit asl20 ]; - maintainers = with lib.maintainers; [ defelo ]; + teams = [ lib.teams.radicle ]; mainProgram = "cib"; }; }) From b7851ae664e2a8662cd37d550c5e0b82b285e509 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 03/15] radicle-desktop: add radicle team as maintainer --- pkgs/by-name/ra/radicle-desktop/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix index ee7db4fadb68..74f145b4b6e8 100644 --- a/pkgs/by-name/ra/radicle-desktop/package.nix +++ b/pkgs/by-name/ra/radicle-desktop/package.nix @@ -129,11 +129,8 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - matthiasbeyer - defelo - faukah - ]; + teams = [ lib.teams.radicle ]; + maintainers = with lib.maintainers; [ faukah ]; mainProgram = "radicle-desktop"; }; }) From ea0487d1ec5f61c94bc0892834a6395e3175b5f4 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 04/15] radicle-explorer: add radicle team as maintainer --- pkgs/by-name/ra/radicle-explorer/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix index 3a268662b20a..f11e26d9af52 100644 --- a/pkgs/by-name/ra/radicle-explorer/package.nix +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -111,11 +111,8 @@ lib.fix ( homepage = "https://radicle.xyz"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ - tazjin - lorenzleutgeb - defelo - ]; + teams = [ lib.teams.radicle ]; + maintainers = with lib.maintainers; [ tazjin ]; }; } ) From ad7bed1c6ebce168431b6cc9ab7ae0b03b37ae19 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 05/15] radicle-httpd: add radicle team as maintainer --- pkgs/by-name/ra/radicle-httpd/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 2546734433e8..852e76731b55 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -86,11 +86,8 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - gador - lorenzleutgeb - defelo - ]; + teams = [ lib.teams.radicle ]; + maintainers = with lib.maintainers; [ gador ]; mainProgram = "radicle-httpd"; }; }) From 012acc31f96a36aca3807c61b5131833abf28296 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 06/15] radicle-job: add radicle team as maintainer --- pkgs/by-name/ra/radicle-job/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix index b688e421b6af..b84a56428ee5 100644 --- a/pkgs/by-name/ra/radicle-job/package.nix +++ b/pkgs/by-name/ra/radicle-job/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mit asl20 ]; - maintainers = with lib.maintainers; [ defelo ]; + teams = [ lib.teams.radicle ]; mainProgram = "rad-job"; }; }) From f24b2190dd9aae8bec4d0b3138d1d87916df1fb9 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 07/15] radicle-native-ci: add radicle team as maintainer --- pkgs/by-name/ra/radicle-native-ci/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix index e0e51db4d816..919ece422a9a 100644 --- a/pkgs/by-name/ra/radicle-native-ci/package.nix +++ b/pkgs/by-name/ra/radicle-native-ci/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mit asl20 ]; - maintainers = with lib.maintainers; [ defelo ]; + teams = [ lib.teams.radicle ]; mainProgram = "radicle-native-ci"; }; }) From f94361f7371c3f03a6c74baced68b82cdbf89e4f Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 08/15] radicle-node: add radicle team as maintainer --- pkgs/by-name/ra/radicle-node/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 46846fa219f5..3e281246d4b1 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -171,11 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mit ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - amesgen - lorenzleutgeb - defelo - ]; + teams = [ lib.teams.radicle ]; mainProgram = "rad"; }; }) From 1b3d212d4a8b8ee2bc4c8b65b61e7054a9bd61f9 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 09/15] radicle-tui: add radicle team as maintainer --- pkgs/by-name/ra/radicle-tui/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix index ac536ae1bc59..1e2d3564d3e1 100644 --- a/pkgs/by-name/ra/radicle-tui/package.nix +++ b/pkgs/by-name/ra/radicle-tui/package.nix @@ -72,10 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 # or mit ]; - maintainers = with lib.maintainers; [ - matthiasbeyer - defelo - ]; + teams = [ lib.teams.radicle ]; mainProgram = "rad-tui"; }; }) From 9e715a494c3d0d982f5646b5934c721236666915 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:50:58 +0100 Subject: [PATCH 10/15] nixos/radicle: add radicle team as maintainer --- nixos/modules/services/misc/radicle.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index ed404dbf4bf9..da174a6b5331 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -437,9 +437,5 @@ in ] ); - meta.maintainers = with lib.maintainers; [ - defelo - julm - lorenzleutgeb - ]; + meta.teams = [ lib.teams.radicle ]; } From a03e3a391baa7afbe61c6710af924c4b41f55fe9 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 11/15] nixos/radicle-ci-broker: add radicle team as maintainer --- .../services/continuous-integration/radicle/ci-broker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix index aab0967e5b51..6c285ea656f7 100644 --- a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix +++ b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix @@ -37,7 +37,7 @@ let in { - meta.maintainers = with lib.maintainers; [ defelo ]; + meta.teams = [ lib.teams.radicle ]; options.services.radicle.ci.broker = { enable = lib.mkEnableOption "radicle-ci-broker"; From 03b0dea5b0b9f8840d78e2adccf6a58da4d22e82 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:55:23 +0100 Subject: [PATCH 12/15] nixos/radicle-native-ci: add radicle team as maintainer --- .../services/continuous-integration/radicle/adapters/native.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix index 8e2a19f447d6..3cbc191a96d6 100644 --- a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix +++ b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix @@ -15,7 +15,7 @@ let in { - meta.maintainers = with lib.maintainers; [ defelo ]; + meta.teams = [ lib.teams.radicle ]; options.services.radicle.ci.adapters.native = { instances = lib.mkOption { From 970a3308f078bc911e6b344702be012fb0363ed0 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:46:18 +0100 Subject: [PATCH 13/15] nixos/tests/radicle: add radicle team as maintainer --- nixos/tests/radicle.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix index cfc1ddc0c2e6..17a26c85820b 100644 --- a/nixos/tests/radicle.nix +++ b/nixos/tests/radicle.nix @@ -2,7 +2,7 @@ # and verifies that an alice peer can host a repository on the seed, # and that a bob peer can send alice a patch via the seed. -{ pkgs, ... }: +{ lib, pkgs, ... }: let # The Node ID depends on nodes.seed.services.radicle.privateKeyFile @@ -63,13 +63,7 @@ in { name = "radicle"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - defelo - julm - lorenzleutgeb - ]; - }; + meta.maintainers = lib.teams.radicle.members; nodes = { seed = From 6422f90ca9ba54a4e6be1439f117a050435ab40f Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 14:48:24 +0100 Subject: [PATCH 14/15] nixos/tests/radicle-ci-broker: add radicle team as maintainer --- nixos/tests/radicle-ci-broker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/radicle-ci-broker.nix b/nixos/tests/radicle-ci-broker.nix index 28330c7784af..c65ddf8af69f 100644 --- a/nixos/tests/radicle-ci-broker.nix +++ b/nixos/tests/radicle-ci-broker.nix @@ -16,7 +16,7 @@ in { name = "radicle-ci-broker"; - meta.maintainers = with lib.maintainers; [ defelo ]; + meta.maintainers = lib.teams.radicle.members; nodes.seed = { virtualisation.credentials = { From 6d380de67b4422a9a1bb1780ff56eea6c12385de Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 24 Mar 2026 15:04:58 +0100 Subject: [PATCH 15/15] ci/OWNERS: add radicle fetchers --- ci/OWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index 695c91aa1af0..052135bf6a68 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -519,3 +519,7 @@ pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor /pkgs/build-support/build-nim-package.nix @NixOS/nim /pkgs/build-support/build-nim-sbom.nix @NixOS/nim /pkgs/top-level/nim-overrides.nix @NixOS/nim + +# Radicle +/pkgs/build-support/fetchradicle/ @NixOS/radicle +/pkgs/build-support/fetchradiclepatch/ @NixOS/radicle