diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index abaefac66e3c..22b1fe885cc3 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -99,6 +99,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Calling `makeSetupHook` without passing a `name` argument is deprecated. +- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. + - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. - The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/development/tools/cosmoc/default.nix deleted file mode 100644 index e64cf02e9f7e..000000000000 --- a/pkgs/development/tools/cosmoc/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, cosmopolitan }: - -stdenv.mkDerivation { - pname = "cosmoc"; - inherit (cosmopolitan) version; - - doInstallCheck = true; - dontUnpack = true; - dontBuild = true; - - # compiler arguments based on upstream README.md - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cat <$out/bin/cosmoc - #!${stdenv.shell} - exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \ - -Os -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ - -fno-omit-frame-pointer -pg -mnop-mcount -mno-tls-direct-seg-refs \ - "\$@" \ - -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds -Wl,--gc-sections \ - -include ${cosmopolitan}/include/cosmopolitan.h \ - ${cosmopolitan}/lib/{crt.o,ape-no-modify-self.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 = teams.cosmopolitan.members; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91450b149754..9bf74f533f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19293,8 +19293,6 @@ with pkgs; cog = callPackage ../development/web/cog { }; - cosmoc = callPackage ../development/tools/cosmoc { }; - cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { };