From b03947ac76c291a05f4ed949e5ec22774d2c98c7 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Wed, 17 Sep 2025 01:08:22 +0000 Subject: [PATCH] ant: rip out ant-contrib nixpkgs-review reveals no new failures when we remove this, so let's rip it out per the rationale at #357758. Closes #357758. --- nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++ pkgs/by-name/an/ant/package.nix | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 3e9e83e52855..3f3d08bf6da4 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -276,6 +276,8 @@ - `libvirt` now supports using `nftables` backend. - The `virtualisation.libvirtd.firewallBackend` option can be used to configure the firewall backend used by libvirtd. +- The third-party `ant-contrib` is no longer included in the `ant` package. + - `systemd.extraConfig` and `boot.initrd.systemd.extraConfig` was converted to RFC42-style `systemd.settings.Manager` and `boot.initrd.systemd.settings.Manager` respectively. - `systemd.watchdog.runtimeTime` was renamed to `systemd.settings.Manager.RuntimeWatchdogSec` - `systemd.watchdog.device` was renamed to `systemd.settings.Manager.WatchdogDevice` diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index a6b4b115d373..d008fc95e832 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs="; }; - contrib = fetchurl { - url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; - sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; - }; - installPhase = '' mkdir -p $out/bin $out/share/ant mv * $out/share/ant/ @@ -37,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir $out/share/ant/bin mv $out/bin/antRun $out/share/ant/bin/ - # Install ant-contrib. - unpackFile $contrib - cp -p ant-contrib/ant-contrib-*.jar $out/share/ant/lib/ - cat >> $out/bin/ant <