From b5489b75ee41e1e053e08193d3c68046b2cf574f Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Feb 2022 21:57:00 +0100
Subject: haskellPackages: Stackage LTS 18.25 -> Stackage Nightly 2022-02-07

---
 maintainers/scripts/haskell/update-stackage.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index ecf38dc4b90..f237cf6b9ac 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -11,16 +11,16 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac
 trap "rm ${tmpfile} ${tmpfile}.new" 0
 touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
 
-curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile"
-old_version=$(grep "# Stackage" $stackage_config | sed -E 's/.*([0-9]{2}\.[0-9]+)/\1/')
-version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile")
+curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"
+old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
+version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")
 
 if [[ "$old_version" == "$version" ]]; then
    echo "No new stackage version"
    exit 0 # Nothing to do
 fi
 
-echo "Updating Stackage LTS from $old_version to $version."
+echo "Updating Stackage Nightly from $old_version to $version."
 
 # Create a simple yaml version of the file.
 sed -r \
@@ -33,7 +33,7 @@ sed -r \
     < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
 
 cat > $stackage_config << EOF
-# Stackage LTS $version
+# Stackage Nightly $version
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -50,7 +50,7 @@ sed -r \
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config
 git commit -F - << EOF
-haskellPackages: stackage-lts $old_version -> $version
+haskellPackages: stackage-nightly $old_version -> $version
 
 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
 EOF
-- 
cgit 1.4.1


From f1c0cd368db7ade149a574e8ae226214645c21ff Mon Sep 17 00:00:00 2001
From: kuwii <kuwii.someone@gmail.com>
Date: Tue, 22 Feb 2022 08:09:05 +0800
Subject: maintainers: add zanculmarktum

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'maintainers')

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4725587493b..550615d2d27 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13953,4 +13953,10 @@
     github = "nigelgbanks";
     githubId = 487373;
   };
+  zanculmarktum = {
+    name = "Azure Zanculmarktum";
+    email = "zanculmarktum@gmail.com";
+    github = "zanculmarktum";
+    githubId = 16958511;
+  };
 }
-- 
cgit 1.4.1


From 0f11859679048f3c5183664a6ddba0ba42d0d7fb Mon Sep 17 00:00:00 2001
From: kuwii <kuwii.someone@gmail.com>
Date: Tue, 22 Feb 2022 08:09:53 +0800
Subject: maintainers: add kuwii

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'maintainers')

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 550615d2d27..f8b20c920f2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13959,4 +13959,10 @@
     github = "zanculmarktum";
     githubId = 16958511;
   };
+  kuwii = {
+    name = "kuwii";
+    email = "kuwii.someone@gmail.com";
+    github = "kuwii";
+    githubId = 10705175;
+  };
 }
-- 
cgit 1.4.1


From f10a7e5a3b15402669a51e1ace056463c0f81eea Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 27 Feb 2022 11:47:32 +0100
Subject: haskellPackages.cabal-install: ignore stackage bound

We have generally shipped the latest cabal-install version. Stackage has
re-added cabal-install recently which caused cabal-install to get
downgraded to 3.4 to match the Cabal version shipped by GHC 9.0.2. This
commit reverts that change.
---
 maintainers/scripts/haskell/update-stackage.sh     |  1 +
 .../configuration-hackage2nix/stackage.yaml        |  1 -
 .../haskell-modules/hackage-packages.nix           | 34 ----------------------
 3 files changed, 1 insertion(+), 35 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index f237cf6b9ac..f3a5fed12ac 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -45,6 +45,7 @@ sed -r \
     -e '/ distribution-nixpkgs /d' \
     -e '/ jailbreak-cabal /d' \
     -e '/ language-nix /d' \
+    -e '/ cabal-install /d' \
     < "${tmpfile}.new" >> $stackage_config
 
 if [[ "${1:-}" == "--do-commit" ]]; then
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 8fcad5d0b2b..cac225085bd 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -263,7 +263,6 @@ default-package-overrides:
   - cabal-file ==0.1.1
   - cabal-file-th ==0.2.7
   - cabal-flatpak ==0.1.0.3
-  - cabal-install ==3.4.1.0
   - cabal-plan ==0.7.2.1
   - cabal-rpm ==2.0.10
   - Cabal-syntax ==3.6.0.0
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 343b486e6f3..773dbf6e2a0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -49753,39 +49753,6 @@ self: {
      }) {};
 
   "cabal-install" = callPackage
-    ({ mkDerivation, array, async, base, base16-bytestring, binary
-     , bytestring, Cabal, containers, cryptohash-sha256, deepseq
-     , directory, echo, edit-distance, filepath, hackage-security
-     , hashable, HTTP, lukko, mtl, network-uri, parsec, pretty, process
-     , random, regex-base, regex-posix, resolv, stm, tar, text, time
-     , transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "cabal-install";
-       version = "3.4.1.0";
-       sha256 = "121az3z76b9696bxm235jdlria9rr61f6117s4d26p17ipy8pbb1";
-       revision = "2";
-       editedCabalFile = "11ik469w43dq36aavaiph90ri2i58qpi5ajqm76sq0wkh1fdmk57";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array async base base16-bytestring binary bytestring Cabal
-         containers cryptohash-sha256 deepseq directory echo edit-distance
-         filepath hackage-security hashable HTTP lukko mtl network-uri
-         parsec pretty process random regex-base regex-posix resolv stm tar
-         text time transformers unix zlib
-       ];
-       doCheck = false;
-       postInstall = ''
-         mkdir -p $out/share/bash-completion
-         mv bash-completion $out/share/bash-completion/completions
-       '';
-       description = "The command-line interface for Cabal and Hackage";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ peti ];
-     }) {};
-
-  "cabal-install_3_6_2_0" = callPackage
     ({ mkDerivation, array, async, base, base16-bytestring, binary
      , bytestring, Cabal, containers, cryptohash-sha256, deepseq
      , directory, echo, edit-distance, filepath, hackage-security
@@ -49815,7 +49782,6 @@ self: {
        '';
        description = "The command-line interface for Cabal and Hackage";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ peti ];
      }) {};
 
-- 
cgit 1.4.1


From 22ced213c00d26d3337815221ee5ab1e38f15bff Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Mar 2022 10:58:00 +0100
Subject: maintainers/haskell/update-stackage.sh: make solver configurable

Accept either Nightly or LTS as the solver configuration variable in the
script. The Stackage version is now considered a tuple of solver and
version, allowing the script to handle updates and switches between
solvers gracefully.

Tested updating Nightly and updating from Nightly to LTS.
---
 maintainers/scripts/haskell/update-stackage.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index f3a5fed12ac..c5f9f19c6fd 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -3,6 +3,15 @@
 
 set -eu -o pipefail
 
+# Stackage solver to use, LTS or Nightly
+# (should be capitalized like the display name)
+SOLVER=Nightly
+readonly SOLVER
+
+toLower() {
+    printf "%s" "$1" | tr '[:upper:]' '[:lower:]'
+}
+
 tmpfile=$(mktemp "update-stackage.XXXXXXX")
 # shellcheck disable=SC2064
 
@@ -11,16 +20,16 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac
 trap "rm ${tmpfile} ${tmpfile}.new" 0
 touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
 
-curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"
-old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
-version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")
+curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile"
+old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g')
+version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")"
 
 if [[ "$old_version" == "$version" ]]; then
    echo "No new stackage version"
    exit 0 # Nothing to do
 fi
 
-echo "Updating Stackage Nightly from $old_version to $version."
+echo "Updating Stackage from $old_version to $version."
 
 # Create a simple yaml version of the file.
 sed -r \
@@ -33,7 +42,7 @@ sed -r \
     < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
 
 cat > $stackage_config << EOF
-# Stackage Nightly $version
+# Stackage $version
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -51,7 +60,7 @@ sed -r \
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config
 git commit -F - << EOF
-haskellPackages: stackage-nightly $old_version -> $version
+haskellPackages: stackage $old_version -> $version
 
 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
 EOF
-- 
cgit 1.4.1


From cd0ddefb4382e26c8f8f7bd0acd2c18b2fae94c3 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Mar 2022 11:05:56 +0100
Subject: maintainers/haskell/update-stackage.sh: make shellcheck happy

* Annotate shell type
* Make trap expansion safer
---
 maintainers/scripts/haskell/update-stackage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index c5f9f19c6fd..0c41b4eec58 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -1,5 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.
+# shellcheck shell=bash
 
 set -eu -o pipefail
 
@@ -13,11 +14,10 @@ toLower() {
 }
 
 tmpfile=$(mktemp "update-stackage.XXXXXXX")
-# shellcheck disable=SC2064
 
 stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"
 
-trap "rm ${tmpfile} ${tmpfile}.new" 0
+trap 'rm "${tmpfile}" "${tmpfile}.new"' 0
 touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
 
 curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile"
-- 
cgit 1.4.1


From 57b1c86e746152c7ec0a9660b0eb9a4d18a486f9 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Mar 2022 11:08:20 +0100
Subject: maintainers/haskell/update-stackage.sh: always mktemp for tmp files

In theory, another program would be free to create "$tmpfile.new".
---
 maintainers/scripts/haskell/update-stackage.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 0c41b4eec58..e6980333f8e 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -7,18 +7,21 @@ set -eu -o pipefail
 # Stackage solver to use, LTS or Nightly
 # (should be capitalized like the display name)
 SOLVER=Nightly
+TMP_TEMPLATE=update-stackage.XXXXXXX
 readonly SOLVER
+readonly TMP_TEMPLATE
 
 toLower() {
     printf "%s" "$1" | tr '[:upper:]' '[:lower:]'
 }
 
-tmpfile=$(mktemp "update-stackage.XXXXXXX")
+tmpfile=$(mktemp "$TMP_TEMPLATE")
+tmpfile_new=$(mktemp "$TMP_TEMPLATE")
 
 stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"
 
-trap 'rm "${tmpfile}" "${tmpfile}.new"' 0
-touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
+trap 'rm "${tmpfile}" "${tmpfile_new}"' 0
+touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors.
 
 curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile"
 old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g')
@@ -39,7 +42,7 @@ sed -r \
     -e 's|,$||' \
     -e '/installed$/d' \
     -e '/^$/d' \
-    < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
+    < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}"
 
 cat > $stackage_config << EOF
 # Stackage $version
@@ -55,7 +58,7 @@ sed -r \
     -e '/ jailbreak-cabal /d' \
     -e '/ language-nix /d' \
     -e '/ cabal-install /d' \
-    < "${tmpfile}.new" >> $stackage_config
+    < "${tmpfile_new}" >> $stackage_config
 
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config
-- 
cgit 1.4.1


From 9b8dfcd9bf449d0b8dd9a3e788df33340dc909c8 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Mar 2022 11:11:04 +0100
Subject: haskellPackages: stackage Nightly 2022-03-17 -> LTS 19.0

This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
---
 maintainers/scripts/haskell/update-stackage.sh                         | 2 +-
 .../haskell-modules/configuration-hackage2nix/stackage.yaml            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index e6980333f8e..4da9f6d28c2 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -6,7 +6,7 @@ set -eu -o pipefail
 
 # Stackage solver to use, LTS or Nightly
 # (should be capitalized like the display name)
-SOLVER=Nightly
+SOLVER=LTS
 TMP_TEMPLATE=update-stackage.XXXXXXX
 readonly SOLVER
 readonly TMP_TEMPLATE
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 5393c0f926d..2f4b75ef813 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage Nightly 2022-03-17
+# Stackage LTS 19.0
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -2237,7 +2237,6 @@ default-package-overrides:
   - singletons-presburger ==0.6.1.0
   - singletons-th ==3.0
   - siphash ==1.0.3
-  - Sit ==0.2021.1.18
   - sitemap-gen ==0.1.0.0
   - sized ==1.0.0.0
   - skein ==1.0.9.4
-- 
cgit 1.4.1


From fa552e76e681b3b84b9917a09c40201799ded4f0 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 23 Mar 2022 13:03:31 +0100
Subject: maintainers/scripts/haskell: add script to find broken maintained
 packages

---
 .../scripts/haskell/maintained-broken-pkgs.nix     | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 maintainers/scripts/haskell/maintained-broken-pkgs.nix

(limited to 'maintainers')

diff --git a/maintainers/scripts/haskell/maintained-broken-pkgs.nix b/maintainers/scripts/haskell/maintained-broken-pkgs.nix
new file mode 100644
index 00000000000..7416bfa46ee
--- /dev/null
+++ b/maintainers/scripts/haskell/maintained-broken-pkgs.nix
@@ -0,0 +1,22 @@
+let
+  nixpkgs = import ../../..;
+  inherit (nixpkgs {}) haskellPackages lib;
+  maintainedPkgs = lib.filterAttrs (
+    _: v: builtins.length (v.meta.maintainers or []) > 0
+  ) haskellPackages;
+  brokenPkgs = lib.filterAttrs (_: v: v.meta.broken) maintainedPkgs;
+  transitiveBrokenPkgs = lib.filterAttrs
+    (_: v: !(builtins.tryEval (v.outPath or null)).success && !v.meta.broken)
+    maintainedPkgs;
+  infoList = pkgs: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: drv: "${name} ${(builtins.elemAt drv.meta.maintainers 0).github}") pkgs);
+in {
+  report = ''
+    BROKEN:
+    ${infoList brokenPkgs}
+
+    TRANSITIVE BROKEN:
+    ${infoList transitiveBrokenPkgs}
+  '';
+  transitiveErrors =
+    builtins.attrValues transitiveBrokenPkgs;
+}
-- 
cgit 1.4.1


From 066634e509988232b435cf2e64c778ec4508a4b4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 29 Mar 2022 21:45:34 +0800
Subject: maintainers: add myself (bobby285271) to the GNOME team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'maintainers')

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index bf4fcc6a4a7..66cba166f2c 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -117,6 +117,7 @@ with lib.maintainers; {
 
   gnome = {
     members = [
+      bobby285271
       hedning
       jtojnar
       dasj19
-- 
cgit 1.4.1


From 9f4b404b5cb159b6630485326e8dcebabad222f5 Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Tue, 29 Mar 2022 21:22:06 +0200
Subject: maintainers/teams: add cosmopolitan team

---
 maintainers/team-list.nix                                     | 8 ++++++++
 pkgs/development/interpreters/python-cosmopolitan/default.nix | 2 +-
 pkgs/development/libraries/cosmopolitan/default.nix           | 2 +-
 pkgs/development/tools/cosmoc/default.nix                     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'maintainers')

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index bf4fcc6a4a7..3cac59179d9 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -70,6 +70,14 @@ with lib.maintainers; {
     scope = "Maintain the Chia blockchain and its dependencies";
   };
 
+  cosmopolitan = {
+    members = [
+      lourkeur
+      tomberek
+    ];
+    scope = "Maintain the Cosmopolitan LibC and related programs.";
+  };
+
   deshaw = {
     # Verify additions to this team with at least one already existing member of the team.
     members = [
diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/development/interpreters/python-cosmopolitan/default.nix
index 07de40356d2..14459a24aac 100644
--- a/pkgs/development/interpreters/python-cosmopolitan/default.nix
+++ b/pkgs/development/interpreters/python-cosmopolitan/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.x86_64;
     badPlatforms = platforms.darwin;
     license = licenses.isc;
-    maintainers = with maintainers; [ lourkeur tomberek ];
+    maintainers = teams.cosmopolitan.members;
     mainProgram = "python.com";
   };
 }
diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix
index 6a2374a97dc..f58e654cbfe 100644
--- a/pkgs/development/libraries/cosmopolitan/default.nix
+++ b/pkgs/development/libraries/cosmopolitan/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.x86_64;
     badPlatforms = platforms.darwin;
     license = licenses.isc;
-    maintainers = with maintainers; [ lourkeur tomberek ];
+    maintainers = teams.cosmopolitan.members;
   };
 }
diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/development/tools/cosmoc/default.nix
index 25c4ce52b87..f1e80d91df5 100644
--- a/pkgs/development/tools/cosmoc/default.nix
+++ b/pkgs/development/tools/cosmoc/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
     homepage = "https://justine.lol/cosmopolitan/";
     description = "compiler for Cosmopolitan C programs";
     license = licenses.mit;
-    maintainers = with maintainers; [ lourkeur tomberek ];
+    maintainers = teams.cosmopolitan.members;
   };
 }
-- 
cgit 1.4.1