From 3a08f8d91c5c3f81fadc3a8a2ff8361e0966d27b Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 10:40:40 +0200 Subject: [PATCH 01/11] cosmopolitan: don't extend include path The intended idiom according to upstream is to have no `#includes` for the libc. This works because the combined header `cosmopolitan.h` has always been on the command line. --- pkgs/development/libraries/cosmopolitan/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index ca303fdeaea3..16a14875d9c8 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \ -fuse-ld=bfd -Wl,-T,$out/lib/ape.lds \ -include $out/include/cosmopolitan.h \ - -I $out/include \ $out/lib/{crt.o,ape.o,cosmopolitan.a} EOF chmod +x $out/bin/cosmoc @@ -53,18 +52,17 @@ stdenv.mkDerivation rec { passthru.tests = lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) { hello = runCommand "hello-world" { } '' - printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c + printf 'main() { printf("hello world\\n"); }\n' >hello.c ${stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ -include ${cosmopolitan}/include/cosmopolitan.h \ - -I ${cosmopolitan}/include \ ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} ${stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com ./hello.com printf "test successful" > $out ''; cosmoc = runCommand "cosmoc-hello" { } '' - printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c + printf 'main() { printf("hello world\\n"); }\n' >hello.c ${cosmopolitan}/bin/cosmoc hello.c ./a.out printf "test successful" > $out From 961472b74a1c1873b548075973b4fa592b06ffe8 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 10:45:33 +0200 Subject: [PATCH 02/11] cosmopolitan: only build libc --- pkgs/development/libraries/cosmopolitan/default.nix | 7 +++---- pkgs/development/libraries/cosmopolitan/ioctl.patch | 12 ------------ 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/cosmopolitan/ioctl.patch diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 16a14875d9c8..7e157728a24a 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA="; }; - patches = [ - ./ioctl.patch # required /dev/tty - ]; - postPatch = '' patchShebangs build/ ''; @@ -24,6 +20,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bintools-unwrapped unzip ]; + # slashes are significant because upstream uses o/$(MODE)/foo.o + buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds"; + installPhase = '' runHook preInstall mkdir -p $out/{bin,include,lib} diff --git a/pkgs/development/libraries/cosmopolitan/ioctl.patch b/pkgs/development/libraries/cosmopolitan/ioctl.patch deleted file mode 100644 index e6e7eb4fc7b0..000000000000 --- a/pkgs/development/libraries/cosmopolitan/ioctl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/third_party/python/python.mk b/third_party/python/python.mk -index f18c15060..b17455bca 100644 ---- a/third_party/python/python.mk -+++ b/third_party/python/python.mk -@@ -1818,7 +1818,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \ - third_party/python/Lib/test/test_int_literal.py \ - third_party/python/Lib/test/test_bisect.py \ - third_party/python/Lib/test/test_pyexpat.py \ -- third_party/python/Lib/test/test_ioctl.py \ - third_party/python/Lib/test/test_getopt.py \ - third_party/python/Lib/test/test_sort.py \ - third_party/python/Lib/test/test_slice.py \ From 6443507c122a6b17397c8efecfea23c25024dc01 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 10:49:11 +0200 Subject: [PATCH 03/11] cosmopolitan: add checkPhase --- pkgs/development/libraries/cosmopolitan/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 7e157728a24a..2af675ccad68 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + checkTarget = "o//test"; + doCheck = true; + passthru.tests = lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) { hello = runCommand "hello-world" { } '' printf 'main() { printf("hello world\\n"); }\n' >hello.c From 0d5810ede00b98e6e0cf01bc9e5da8fea4611201 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 14:07:44 +0200 Subject: [PATCH 04/11] cosmoc: init --- .../libraries/cosmopolitan/default.nix | 20 +--------- pkgs/development/tools/cosmoc/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/tools/cosmoc/default.nix diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 2af675ccad68..915ee427ef58 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -25,22 +25,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,include,lib} + mkdir -p $out/{include,lib} install o/cosmopolitan.h $out/include install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib - cat > $out/bin/cosmoc < $out ''; - cosmoc = runCommand "cosmoc-hello" { } '' - printf 'main() { printf("hello world\\n"); }\n' >hello.c - ${cosmopolitan}/bin/cosmoc hello.c - ./a.out - printf "test successful" > $out - ''; }; meta = with lib; { diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/development/tools/cosmoc/default.nix new file mode 100644 index 000000000000..25c4ce52b876 --- /dev/null +++ b/pkgs/development/tools/cosmoc/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, cosmopolitan }: + +stdenv.mkDerivation { + pname = "cosmoc"; + inherit (cosmopolitan) version; + + doInstallCheck = true; + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cat <$out/bin/cosmoc + #!${stdenv.shell} + exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \ + -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ + "\$@" \ + -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \ + -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ + -include ${cosmopolitan}/include/cosmopolitan.h \ + ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} + EOF + chmod +x $out/bin/cosmoc + runHook postInstall + ''; + + installCheckPhase = '' + printf 'main() { printf("hello world\\n"); }\n' >hello.c + $out/bin/cosmoc hello.c + ./a.out + ''; + + meta = with lib; { + homepage = "https://justine.lol/cosmopolitan/"; + description = "compiler for Cosmopolitan C programs"; + license = licenses.mit; + maintainers = with maintainers; [ lourkeur tomberek ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8576f032457e..a2a0fa1d3574 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16516,6 +16516,8 @@ with pkgs; cog = callPackage ../development/web/cog { }; + cosmoc = callPackage ../development/tools/cosmoc { }; + cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; ctl = callPackage ../development/libraries/ctl { }; From f92cfbce3aab64699bbb73199611ab6144c71cf4 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 14:10:20 +0200 Subject: [PATCH 05/11] cosmopolitan: remove redundant test It seems like both the checkPhase and cosmoc's installCheckPhase run plenty of executables, I don't see what this test could catch. --- .../libraries/cosmopolitan/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 915ee427ef58..1412f3dd6164 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, runCommand, unzip, cosmopolitan,bintools-unwrapped }: +{ lib, stdenv, fetchFromGitHub, unzip, cosmopolitan, bintools-unwrapped }: stdenv.mkDerivation rec { pname = "cosmopolitan"; @@ -40,19 +40,6 @@ stdenv.mkDerivation rec { checkTarget = "o//test"; doCheck = true; - passthru.tests = lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) { - hello = runCommand "hello-world" { } '' - printf 'main() { printf("hello world\\n"); }\n' >hello.c - ${stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ - -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ - -include ${cosmopolitan}/include/cosmopolitan.h \ - ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} - ${stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com - ./hello.com - printf "test successful" > $out - ''; - }; - meta = with lib; { homepage = "https://justine.lol/cosmopolitan/"; description = "Your build-once run-anywhere c library"; From 89604525d7aafa64f66769d7d05990dc5b31a56a Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 14:14:51 +0200 Subject: [PATCH 06/11] cosmopolitan: unclutter output --- pkgs/development/libraries/cosmopolitan/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 1412f3dd6164..f902f3cfcd9e 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { mkdir -p $out/{include,lib} install o/cosmopolitan.h $out/include install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib - - pushd o - find -iname "*.com" -type f -exec install -D {} $out/{} \; - popd - find -iname "*.h" -type f -exec install -m644 -D {} $out/include/{} \; - find -iname "*.inc" -type f -exec install -m644 -D {} $out/include/{} \; runHook postInstall ''; From 96d31267813b8ed32e480ad7c9bbc9a7e4e9a86c Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 14:22:39 +0200 Subject: [PATCH 07/11] cosmopolitan: lint --- .../libraries/cosmopolitan/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index f902f3cfcd9e..39443a77d9fb 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cosmopolitan, bintools-unwrapped }: +{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped }: stdenv.mkDerivation rec { pname = "cosmopolitan"; @@ -11,17 +11,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA="; }; - postPatch = '' - patchShebangs build/ - ''; - - dontConfigure = true; - dontFixup = true; - enableParallelBuilding = true; nativeBuildInputs = [ bintools-unwrapped unzip ]; # slashes are significant because upstream uses o/$(MODE)/foo.o buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds"; + checkTarget = "o//test"; + enableParallelBuilding = true; + + doCheck = true; + dontConfigure = true; + dontFixup = true; + + postPatch = '' + patchShebangs build/ + ''; installPhase = '' runHook preInstall @@ -31,9 +34,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - checkTarget = "o//test"; - doCheck = true; - meta = with lib; { homepage = "https://justine.lol/cosmopolitan/"; description = "Your build-once run-anywhere c library"; From d1eb392e95c2ec286162bd567c5e15d8fdc1a855 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 14:32:59 +0200 Subject: [PATCH 08/11] cosmopolitan: remove redundant fix the shebangs issue has been fixed upstream in https://github.com/jart/cosmopolitan/commit/f721d61b54f9b5dab6743edc289f185869363255 --- pkgs/development/libraries/cosmopolitan/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 39443a77d9fb..6e3140fa5f0f 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { dontConfigure = true; dontFixup = true; - postPatch = '' - patchShebangs build/ - ''; - installPhase = '' runHook preInstall mkdir -p $out/{include,lib} From f760f24de31ba7f01d3eecc017b499e738eefaec Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 14:38:18 +0200 Subject: [PATCH 09/11] doc/release-notes: document cosmoc removal --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 830b0c2efcd3..2095e99fd792 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1190,6 +1190,13 @@ example. + + + pkgs.cosmopolitan no longer provides the + cosmoc command. It has been moved to + pkgs.cosmoc. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 91ca2882ef12..abef4a167512 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -429,6 +429,8 @@ In addition to numerous new and upgraded packages, this release has the followin See the `vscode` package for a more detailed example. +- `pkgs.cosmopolitan` no longer provides the `cosmoc` command. It has been moved to `pkgs.cosmoc`. + ## Other Notable Changes {#sec-release-22.05-notable-changes} From bd84351def15c0fe7a8a387347a6f10b4805f6ca Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 18:00:16 +0200 Subject: [PATCH 10/11] python-cosmopolitan: init at 3.6.14 --- .../python-cosmopolitan/default.nix | 39 +++++++++++++++++++ .../python-cosmopolitan/ioctl.patch | 12 ++++++ .../libraries/cosmopolitan/default.nix | 4 ++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 57 insertions(+) create mode 100644 pkgs/development/interpreters/python-cosmopolitan/default.nix create mode 100644 pkgs/development/interpreters/python-cosmopolitan/ioctl.patch diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/development/interpreters/python-cosmopolitan/default.nix new file mode 100644 index 000000000000..07de40356d21 --- /dev/null +++ b/pkgs/development/interpreters/python-cosmopolitan/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, cosmopolitan, unzip, bintools-unwrapped }: + +stdenv.mkDerivation rec { + pname = "python-cosmopolitan"; + version = "3.6.14"; + + src = cosmopolitan.dist; + + patches = [ + ./ioctl.patch # required /dev/tty + ]; + + nativeBuildInputs = [ bintools-unwrapped unzip ]; + + # slashes are significant because upstream uses o/$(MODE)/foo.o + buildFlags = "o//third_party/python"; + checkTarget = "o//third_party/python/test"; + enableParallelBuilding = true; + + doCheck = true; + dontConfigure = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + install o/third_party/python/*.com -Dt $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://justine.lol/cosmopolitan/"; + description = "Actually Portable Python using Cosmopolitan"; + platforms = platforms.x86_64; + badPlatforms = platforms.darwin; + license = licenses.isc; + maintainers = with maintainers; [ lourkeur tomberek ]; + mainProgram = "python.com"; + }; +} diff --git a/pkgs/development/interpreters/python-cosmopolitan/ioctl.patch b/pkgs/development/interpreters/python-cosmopolitan/ioctl.patch new file mode 100644 index 000000000000..e6e7eb4fc7b0 --- /dev/null +++ b/pkgs/development/interpreters/python-cosmopolitan/ioctl.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/python/python.mk b/third_party/python/python.mk +index f18c15060..b17455bca 100644 +--- a/third_party/python/python.mk ++++ b/third_party/python/python.mk +@@ -1818,7 +1818,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \ + third_party/python/Lib/test/test_int_literal.py \ + third_party/python/Lib/test/test_bisect.py \ + third_party/python/Lib/test/test_pyexpat.py \ +- third_party/python/Lib/test/test_ioctl.py \ + third_party/python/Lib/test/test_getopt.py \ + third_party/python/Lib/test/test_sort.py \ + third_party/python/Lib/test/test_slice.py \ diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 6e3140fa5f0f..6a2374a97dc4 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bintools-unwrapped unzip ]; + outputs = [ "out" "dist" ]; + # slashes are significant because upstream uses o/$(MODE)/foo.o buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds"; checkTarget = "o//test"; @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { mkdir -p $out/{include,lib} install o/cosmopolitan.h $out/include install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib + + cp -RT . "$dist" runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a0fa1d3574..e93f871b3fff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16520,6 +16520,8 @@ with pkgs; cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; + python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { }; + ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { }; From 9f4b404b5cb159b6630485326e8dcebabad222f5 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 29 Mar 2022 21:22:06 +0200 Subject: [PATCH 11/11] maintainers/teams: add cosmopolitan team --- maintainers/team-list.nix | 8 ++++++++ .../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(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bf4fcc6a4a7d..3cac59179d95 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 07de40356d21..14459a24aac2 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 6a2374a97dc4..f58e654cbfe3 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 25c4ce52b876..f1e80d91df55 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; }; }