From 7354bda2081a43cfe13f7df67b09af90b309615a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:25:31 -0300 Subject: [PATCH] maintainers: remove superherointj --- maintainers/maintainer-list.nix | 7 ------- maintainers/team-list.nix | 2 -- pkgs/applications/editors/vscode/extensions/default.nix | 6 +++--- pkgs/applications/networking/cluster/cilium/default.nix | 2 +- .../networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md | 2 +- pkgs/by-name/fl/fluxcd/package.nix | 1 - pkgs/by-name/go/godot_4/package.nix | 1 - pkgs/by-name/vc/vcluster/package.nix | 1 - pkgs/servers/etcd/3.5/default.nix | 2 +- 9 files changed, 6 insertions(+), 18 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f756e9314f62..c0a4e295ecad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19946,13 +19946,6 @@ githubId = 36031171; name = "Supa"; }; - superherointj = { - email = "sergiomarcelo@yandex.com"; - github = "superherointj"; - githubId = 5861043; - matrix = "@superherointj:matrix.org"; - name = "Sérgio Marcelo"; - }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index dc0d104ffce2..1daee20ff7cc 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -507,7 +507,6 @@ with lib.maintainers; marcusramberg mic92 rorosen - superherointj wrmilling yajo ]; @@ -951,7 +950,6 @@ with lib.maintainers; stridtech = { # Verify additions by approval of an already existing member of the team members = [ - superherointj ulrikstrid ]; scope = "Group registration for Strid Tech AB team members who collectively maintain packages"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dbee7be768d2..710a342307a2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -771,7 +771,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap"; homepage = "https://github.com/bgashler1/vscode-htmltagwrap"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -2600,7 +2600,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax"; homepage = "https://github.com/jeff-hykin/better-nix-syntax"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -4301,7 +4301,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops"; homepage = "https://github.com/signageos/vscode-sops"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index ac77afd7b537..fb097191cb58 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = lib.licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly superherointj ]; + maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md index 9c2365d6f2dd..1b43e4d5712a 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md +++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md @@ -26,7 +26,7 @@ If you cause a regression (we've all been there), you are responsible for fixing To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs. -K3s's committers currently are: superherointj, marcusramberg, Mic92. +K3s's committers currently are: marcusramberg, Mic92. @euank is often silent but still active and has always handled anything dreadful, internal parts of K3s/Kubernetes or architecture things, he initially packaged K3s for nixpkgs, think of him as a last resort, when we fail to accomplish a fix, he comes to rescue us from ourselves. diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 8d691f58b5a5..782fcb50bf74 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -81,7 +81,6 @@ buildGoModule rec { maintainers = with lib.maintainers; [ bryanasdev000 jlesquembre - superherointj ]; mainProgram = "flux"; }; diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 1296da9e48d0..25c36e07a1b3 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -192,7 +192,6 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ shiryel - superherointj ]; mainProgram = "godot4"; }; diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index bee814c8a0ca..9af18805a12c 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -68,7 +68,6 @@ buildGoModule rec { berryp peterromfeldhk qjoly - superherointj ]; }; } diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index b293d5f45ade..914dc777156d 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -20,7 +20,7 @@ let description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline superherointj ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.darwin ++ platforms.linux; };