From 743d9f835d5bddf6d2bbb3dbfa31e648a11fd0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 12 Jun 2024 10:11:01 +0200 Subject: [PATCH] maintainers: remove one year inactive maintainer kiwi --- maintainers/maintainer-list.nix | 7 ------- nixos/tests/matomo.nix | 6 +++--- pkgs/applications/misc/librecad/default.nix | 2 +- .../cluster/nixops/plugins/nixops-digitalocean.nix | 2 +- .../instant-messengers/wire-desktop/default.nix | 1 - pkgs/applications/networking/znc/modules.nix | 6 +++--- pkgs/applications/office/scribus/default.nix | 1 - pkgs/applications/video/mlv-app/default.nix | 4 +--- pkgs/by-name/bi/bitwarden-desktop/package.nix | 2 +- .../haskell-modules/configuration-hackage2nix/main.yaml | 9 --------- pkgs/development/haskell-modules/hackage-packages.nix | 8 -------- pkgs/development/python-modules/hocr-tools/default.nix | 2 +- pkgs/development/python-modules/ocrmypdf/default.nix | 1 - pkgs/development/python-modules/pikepdf/default.nix | 5 +---- .../python-modules/pytest-helpers-namespace/default.nix | 2 +- .../python-modules/python-digitalocean/default.nix | 5 +---- .../python-modules/python-xmp-toolkit/default.nix | 2 +- pkgs/development/python-modules/ruffus/default.nix | 2 +- pkgs/servers/web-apps/matomo/default.nix | 2 +- 19 files changed, 17 insertions(+), 52 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 02e73e157ae6..cbafefd34c08 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10594,13 +10594,6 @@ name = "Kat Inskip"; keys = [ { fingerprint = "9CC6 44B5 69CD A59B C874 C4C9 E8DD E3ED 1C90 F3A0"; } ]; }; - kiwi = { - email = "envy1988@gmail.com"; - github = "Kiwi"; - githubId = 35715; - name = "Robert Djubek"; - keys = [ { fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; } ]; - }; kjeremy = { email = "kjeremy@gmail.com"; name = "Jeremy Kolb"; diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 130f3dd8485a..cf54f71b738f 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -41,14 +41,14 @@ let in { matomo = matomoTest pkgs.matomo // { name = "matomo"; - meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ]; + meta.maintainers = with maintainers; [ florianjacob mmilata twey boozedog ]; }; matomo-beta = matomoTest pkgs.matomo-beta // { name = "matomo-beta"; - meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ]; + meta.maintainers = with maintainers; [ florianjacob mmilata twey boozedog ]; }; matomo_5 = matomoTest pkgs.matomo_5 // { name = "matomo-5"; - meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ] ++ lib.teams.flyingcircus.members; + meta.maintainers = with maintainers; [ florianjacob mmilata twey boozedog ] ++ lib.teams.flyingcircus.members; }; } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index eb2e3c136cf4..3ce387c410d9 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -72,7 +72,7 @@ mkDerivation rec { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; license = licenses.gpl2Only; - maintainers = with maintainers; [ kiwi viric ]; + maintainers = with maintainers; [ viric ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index 094f493dbb72..8a0d2d4c4933 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -48,6 +48,6 @@ buildPythonPackage { description = "NixOps Digitalocean plugin"; homepage = "https://github.com/nix-community/nixops-digitalocean"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ kiwi ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index a9f29029b069..8dda89f776b4 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -60,7 +60,6 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp - kiwi toonn ]; platforms = platforms.darwin ++ [ diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 91c2ec526d1c..747846194729 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -77,7 +77,7 @@ in description = "ZNC clientaway module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; - maintainers = with maintainers; [ kiwi ]; + maintainers = with maintainers; [ ]; }; }; @@ -117,7 +117,7 @@ in description = "ZNC ignore module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; - maintainers = with maintainers; [ kiwi ]; + maintainers = with maintainers; [ ]; }; }; @@ -137,7 +137,7 @@ in description = "Palaver ZNC module"; homepage = "https://github.com/cocodelabs/znc-palaver"; license = licenses.mit; - maintainers = with maintainers; [ kiwi szlend ]; + maintainers = with maintainers; [ szlend ]; }; }; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 941f34231ca9..85c0afe9db66 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -70,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { maintainers = with maintainers; [ - kiwi arthsmn ]; description = "Desktop Publishing (DTP) and Layout program"; diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index 72e53090d33c..05c6799e4213 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -54,9 +54,7 @@ mkDerivation rec { description = "All in one MLV processing app that is pretty great"; homepage = "https://mlv.app"; license = licenses.gpl3; - maintainers = with maintainers; [ - kiwi - ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "mlvapp"; }; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index f10ef5d4178b..ca6c93cac7b5 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -192,7 +192,7 @@ in buildNpmPackage rec { inherit description; homepage = "https://bitwarden.com"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ amarshall kiwi ]; + maintainers = with lib.maintainers; [ amarshall ]; platforms = [ "x86_64-linux" ]; mainProgram = "bitwarden"; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 03dd4e728f4e..bc102cb88861 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -306,15 +306,6 @@ package-maintainers: - elm-export-persistent # - pipes-mongodb - streaming-wai - kiwi: - - config-schema - - config-value - - glirc - - irc-core - - matterhorn - - mattermost-api - - mattermost-api-qc - - Unique libjared: - sensei malo: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d05b86212b64..2e81440fca77 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21834,7 +21834,6 @@ self: { ]; description = "It provides the functionality like unix \"uniq\" utility"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "Unixutils" = callPackage @@ -73682,7 +73681,6 @@ self: { testHaskellDepends = [ base config-value text ]; description = "Schema definitions for the config-value package"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "config-select" = callPackage @@ -73716,7 +73714,6 @@ self: { testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "config-value-getopt" = callPackage @@ -125275,7 +125272,6 @@ self: { license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; mainProgram = "glirc"; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "gll" = callPackage @@ -175544,7 +175540,6 @@ self: { description = "IRC core library for glirc"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.kiwi ]; broken = true; }) {}; @@ -201019,7 +201014,6 @@ self: { description = "Terminal client for the Mattermost chat system"; license = lib.licenses.bsd3; mainProgram = "matterhorn"; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "mattermost-api" = callPackage @@ -201048,7 +201042,6 @@ self: { ]; description = "Client API for Mattermost chat system"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "mattermost-api-qc" = callPackage @@ -201064,7 +201057,6 @@ self: { ]; description = "QuickCheck instances for the Mattermost client API library"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.kiwi ]; }) {}; "maude" = callPackage diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index 609590b48623..40d2653d6c0d 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; homepage = "https://github.com/tmbdev/hocr-tools"; license = licenses.asl20; - maintainers = [ maintainers.kiwi ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index da509f319fab..b9b961e6c9c4 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -100,7 +100,6 @@ buildPythonPackage rec { mit ]; maintainers = with maintainers; [ - kiwi dotlambda ]; changelog = "https://github.com/ocrmypdf/OCRmyPDF/blob/${src.rev}/docs/release_notes.rst"; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c327e2e6df34..5bd009c93438 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -87,10 +87,7 @@ buildPythonPackage rec { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; license = licenses.mpl20; - maintainers = with maintainers; [ - kiwi - dotlambda - ]; + maintainers = with maintainers; [ dotlambda ]; changelog = "https://github.com/pikepdf/pikepdf/blob/${src.rev}/docs/releasenotes/version${lib.versions.major version}.rst"; }; } diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 45bf7c67c5ca..ced0389f2887 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/saltstack/pytest-helpers-namespace"; description = "PyTest Helpers Namespace"; license = licenses.asl20; - maintainers = [ maintainers.kiwi ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix index c0ab09542d95..4597db497fb9 100644 --- a/pkgs/development/python-modules/python-digitalocean/default.nix +++ b/pkgs/development/python-modules/python-digitalocean/default.nix @@ -50,9 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/koalalorenzo/python-digitalocean"; changelog = "https://github.com/koalalorenzo/python-digitalocean/releases/tag/v${version}"; license = with licenses; [ lgpl3Only ]; - maintainers = with maintainers; [ - kiwi - teh - ]; + maintainers = with maintainers; [ teh ]; }; } diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index e9541adb6a5d..612194ae7536 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -46,6 +46,6 @@ buildPythonPackage { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; license = licenses.bsd3; - maintainers = [ maintainers.kiwi ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 37ff8340634a..44a1b8939795 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Light-weight Python Computational Pipeline Management"; homepage = "http://www.ruffus.org.uk"; license = licenses.mit; - maintainers = [ maintainers.kiwi ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 627c64e67b3e..529deabd48bc 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -118,7 +118,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ] ++ teams.flyingcircus.members; + maintainers = with maintainers; [ florianjacob sebbel twey boozedog ] ++ teams.flyingcircus.members; }; }; in