From b9900f0f0fd8c76c639dd55708208b5efd009ca1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 20:35:21 +0100 Subject: [PATCH 1/2] treewide: remove flyfloh as maintainer from packages Inactive as a package maintainer since 2021. Removing as maintainer from the packages according to the maintainer guidelines. Keeping the maintainer handle, because it is also referenced in the marketing team in which flyfloh is still active. --- pkgs/development/python-modules/localzone/default.nix | 1 - pkgs/development/python-modules/pymetno/default.nix | 1 - pkgs/development/python-modules/python-miio/default.nix | 1 - pkgs/development/python-modules/rxv/default.nix | 1 - 4 files changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 7bf9973cfdd9..7dc5851f836c 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { homepage = "https://localzone.iomaestro.com"; changelog = "https://github.com/ags-slc/localzone/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ flyfloh ]; }; } diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 886d62c6b4f9..ed2da81a1f8c 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://github.com/Danielhiversen/pyMetno/"; changelog = "https://github.com/Danielhiversen/pyMetno/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ flyfloh ]; }; } diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index cc43decbb3bc..12b8e76d37a9 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -82,6 +82,5 @@ buildPythonPackage rec { description = "Python library for interfacing with Xiaomi smart appliances"; homepage = "https://github.com/rytilahti/python-miio"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ flyfloh ]; }; } diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index dc99e198525d..da84c5561716 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { description = "Python library for communicate with Yamaha RX-Vxxx receivers"; homepage = "https://github.com/wuub/rxv"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ flyfloh ]; }; } From 2967d4ffe0716ce7c74a45d64014c26d7b3a5767 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 20:37:13 +0100 Subject: [PATCH 2/2] teams/ctrl-os: drop --- maintainers/team-list.nix | 12 ------------ pkgs/by-name/cy/cyclonedx-cli/package.nix | 6 ++++-- pkgs/by-name/cy/cyclonedx-python/package.nix | 4 +++- pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix | 4 ++-- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 28a2189c5d2b..baa945e20841 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -177,18 +177,6 @@ with lib.maintainers; shortName = "Cosmopolitan"; }; - ctrl-os = { - # Existing members may approve additions. - members = [ - blitz - messemar - flyfloh - ]; - - scope = "Team of Cyberus Technology employees that maintain packages relevant to CTRL-OS"; - shortName = "CTRL-OS"; - }; - cuda = { github = "cuda-maintainers"; }; diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix index 857cfd9976ee..448f1c7c5506 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/package.nix +++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix @@ -33,8 +33,10 @@ buildDotnetModule rec { description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions"; homepage = "https://github.com/CycloneDX/cyclonedx-cli"; changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}"; - maintainers = with lib.maintainers; [ thillux ]; - teams = [ lib.teams.ctrl-os ]; + maintainers = with lib.maintainers; [ + blitz + thillux + ]; license = lib.licenses.asl20; platforms = with lib.platforms; (linux ++ darwin); mainProgram = "cyclonedx"; diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index 7001e6e3ade6..436dcd275583 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -37,7 +37,9 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/CycloneDX/cyclonedx-python"; changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/${src.tag}"; license = lib.licenses.asl20; - teams = [ lib.teams.ctrl-os ]; + maintainers = with lib.maintainers; [ + blitz + ]; mainProgram = "cyclonedx-py"; }; } diff --git a/pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix b/pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix index 3606d87418f8..035fa814b072 100644 --- a/pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix +++ b/pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix @@ -140,8 +140,8 @@ edk2.mkDerivation projectDscPath (finalAttrs: { description = "Sample UEFI firmware for Cloud Hypervisor and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; - teams = with lib.teams; [ - ctrl-os + maintainers = with lib.maintainers; [ + messemar ]; broken = stdenv.hostPlatform.isDarwin; };