From 6e85417bfe63b053cbba14029379d2d51116f23e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 23:44:07 +0100 Subject: [PATCH] teams/deshaw: drop --- maintainers/team-list.nix | 10 --- nixos/tests/iscsi-multipath-root.nix | 3 - nixos/tests/iscsi-root.nix | 11 +-- pkgs/by-name/dc/dcgm/package.nix | 5 +- pkgs/by-name/ja/javacc/package.nix | 1 - .../by-name/me/memcached-exporter/package.nix | 5 +- pkgs/by-name/ms/mscp/package.nix | 1 - pkgs/by-name/pa/patroni/package.nix | 5 +- pkgs/by-name/pr/procfd/package.nix | 5 +- .../pr/prometheus-dcgm-exporter/package.nix | 5 +- .../package.nix | 5 +- pkgs/by-name/re/remctl/package.nix | 5 +- pkgs/development/libraries/tclap/1.4.nix | 1 - .../python-modules/datefinder/default.nix | 5 +- .../python-modules/jenkinsapi/default.nix | 7 +- .../python-modules/krb5/default.nix | 5 +- .../opentelemetry-api/default.nix | 1 - .../opentelemetry-instrumentation/default.nix | 1 - .../python-modules/pytest-grpc/default.nix | 1 - .../python-modules/ydiff/default.nix | 5 +- pkgs/servers/http/nginx/modules.nix | 5 +- .../monitoring/prometheus/fastly-exporter.nix | 1 - pkgs/top-level/perl-packages.nix | 77 ++++++++++++++----- 23 files changed, 110 insertions(+), 60 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 995239662b5f..f12ce735d58a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -188,16 +188,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - deshaw = { - # Verify additions to this team with at least one already existing member of the team. - members = [ - de11n - despsyched - ]; - scope = "Group registration for D. E. Shaw employees who collectively maintain packages."; - shortName = "D. E. Shaw employees"; - }; - dhall = { members = [ Gabriella439 diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix index 860faa0a32c1..ba17ac64058e 100644 --- a/nixos/tests/iscsi-multipath-root.nix +++ b/nixos/tests/iscsi-multipath-root.nix @@ -5,9 +5,6 @@ let in { name = "iscsi"; - meta = { - maintainers = pkgs.lib.teams.deshaw.members; - }; nodes = { target = diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix index d48dc55465d0..e8c98a39931c 100644 --- a/nixos/tests/iscsi-root.nix +++ b/nixos/tests/iscsi-root.nix @@ -5,13 +5,10 @@ let in { name = "iscsi"; - meta.maintainers = - with lib.maintainers; - [ - das_j - helsinki-Jo - ] - ++ lib.teams.deshaw.members; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; nodes = { target = diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 7fd5dde85ccf..de95cb179d48 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -170,7 +170,10 @@ stdenv.mkDerivation { description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs"; homepage = "https://developer.nvidia.com/dcgm"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; mainProgram = "dcgmi"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ja/javacc/package.nix b/pkgs/by-name/ja/javacc/package.nix index 7f78beec439c..50e4579a55d5 100644 --- a/pkgs/by-name/ja/javacc/package.nix +++ b/pkgs/by-name/ja/javacc/package.nix @@ -65,6 +65,5 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://javacc.github.io/javacc"; license = lib.licenses.bsd2; mainProgram = "javacc"; - teams = [ lib.teams.deshaw ]; }; }) diff --git a/pkgs/by-name/me/memcached-exporter/package.nix b/pkgs/by-name/me/memcached-exporter/package.nix index d5ba29db7a7c..508f40801b3f 100644 --- a/pkgs/by-name/me/memcached-exporter/package.nix +++ b/pkgs/by-name/me/memcached-exporter/package.nix @@ -26,6 +26,9 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/prometheus/memcached_exporter"; license = lib.licenses.asl20; mainProgram = "memcached_exporter"; - teams = with lib.teams; [ deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }) diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix index 975002979981..45cc26a8e241 100644 --- a/pkgs/by-name/ms/mscp/package.nix +++ b/pkgs/by-name/ms/mscp/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/upa/mscp"; mainProgram = "mscp"; license = lib.licenses.gpl3Only; - teams = [ lib.teams.deshaw ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index bfc0ef13296d..003004ec46a8 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -65,6 +65,9 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/patroni/patroni/blob/v${version}/docs/releases.rst"; license = lib.licenses.mit; platforms = lib.platforms.unix; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix index baf6d9131422..07984c82b89e 100644 --- a/pkgs/by-name/pr/procfd/package.nix +++ b/pkgs/by-name/pr/procfd/package.nix @@ -29,6 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.bsd3; mainProgram = "procfd"; platforms = lib.platforms.linux; - teams = with lib.teams; [ deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }) diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix index 03be768cb83c..5016e1ae3b7e 100644 --- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix @@ -46,7 +46,10 @@ buildGoModule rec { description = "NVIDIA GPU metrics exporter for Prometheus leveraging DCGM"; homepage = "https://github.com/NVIDIA/dcgm-exporter"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; mainProgram = "dcgm-exporter"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix index 79f8dca869b6..04a7d3696659 100644 --- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix @@ -21,6 +21,9 @@ buildGoModule rec { mainProgram = "elasticsearch_exporter"; homepage = "https://github.com/prometheus-community/elasticsearch_exporter"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix index de7ba2db61a4..f15acaef0905 100644 --- a/pkgs/by-name/re/remctl/package.nix +++ b/pkgs/by-name/re/remctl/package.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.eyrie.org/~eagle/software/remctl"; mainProgram = "remctl"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }) diff --git a/pkgs/development/libraries/tclap/1.4.nix b/pkgs/development/libraries/tclap/1.4.nix index d15356041523..60fbe1901849 100644 --- a/pkgs/development/libraries/tclap/1.4.nix +++ b/pkgs/development/libraries/tclap/1.4.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation { description = "Templatized C++ Command Line Parser Library (v1.4)"; homepage = "https://tclap.sourceforge.net/"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix index ddb583767de7..953bd24bb409 100644 --- a/pkgs/development/python-modules/datefinder/default.nix +++ b/pkgs/development/python-modules/datefinder/default.nix @@ -34,6 +34,9 @@ buildPythonPackage rec { description = "Extract datetime objects from strings"; homepage = "https://github.com/akoumjian/datefinder"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index f3a545f9b7b8..5ae93e9731f5 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -55,8 +55,11 @@ buildPythonPackage rec { meta = { description = "Python API for accessing resources on a Jenkins continuous-integration server"; homepage = "https://github.com/salimfadhley/jenkinsapi"; - maintainers = with lib.maintainers; [ drets ]; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + drets + ]; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index 0ade85e05e84..0d8cd32055a9 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -39,7 +39,10 @@ buildPythonPackage rec { description = "Kerberos API bindings for Python"; homepage = "https://github.com/jborean93/pykrb5"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; broken = stdenv.hostPlatform.isDarwin; # TODO: figure out how to build on Darwin }; } diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 72776449fafb..eb4afad2436f 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -65,7 +65,6 @@ let changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.natsukium ]; - teams = [ lib.teams.deshaw ]; }; }; in diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index e178836f6fc0..80c5e8536de1 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -56,6 +56,5 @@ buildPythonPackage rec { changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.natsukium ]; - teams = [ lib.teams.deshaw ]; }; } diff --git a/pkgs/development/python-modules/pytest-grpc/default.nix b/pkgs/development/python-modules/pytest-grpc/default.nix index ccb040464e93..7e0589c7a835 100644 --- a/pkgs/development/python-modules/pytest-grpc/default.nix +++ b/pkgs/development/python-modules/pytest-grpc/default.nix @@ -24,6 +24,5 @@ buildPythonPackage rec { description = "Pytest plugin for grpc"; homepage = "https://github.com/MobileDynasty/pytest-env"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; }; } diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 34a9a80e670a..3e5fc98c2614 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -55,6 +55,9 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ymattw/ydiff"; license = lib.licenses.bsd3; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 584f2793cceb..87d9c905ee51 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -800,7 +800,10 @@ let description = "SPNEGO HTTP Authentication Module"; homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module"; license = with lib.licenses; [ bsd2 ]; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 7ce2f93e0660..fee7411e6dff 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -26,7 +26,6 @@ buildGoModule rec { description = "Prometheus exporter for the Fastly Real-time Analytics API"; homepage = "https://github.com/fastly/fastly-exporter"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; mainProgram = "fastly-exporter"; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e15319aa85d9..112db2c2d0be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2724,7 +2724,10 @@ with self; meta = { description = "BSD process resource limit and priority functions"; license = with lib.licenses; [ artistic2 ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -4967,7 +4970,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; }; }; @@ -5982,7 +5984,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -13427,7 +13432,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -13458,7 +13466,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -13773,7 +13784,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -14018,7 +14032,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -14036,7 +14053,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -14742,7 +14762,10 @@ with self; meta = { description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git"; license = with lib.licenses; [ gpl2Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -15271,7 +15294,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -18917,7 +18943,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -20409,7 +20438,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -26712,8 +26744,11 @@ with self; description = "Perl extension for Apache ZooKeeper"; homepage = "https://github.com/mark-5/p5-net-zookeeper"; license = with lib.licenses; [ asl20 ]; - maintainers = [ maintainers.ztzg ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ztzg + ]; }; }; @@ -27084,7 +27119,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; }; }; @@ -27272,7 +27306,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -27964,7 +28001,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; }; }; @@ -28037,7 +28073,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; mainProgram = "ppkg-config"; }; }; @@ -28457,7 +28492,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -28475,7 +28513,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; mainProgram = "poe-gen-tests"; }; };