diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 6814caa1bad28..bcaedf95b3cd2 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -50,6 +50,8 @@ - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL. +- The third-party `ant-contrib` is no longer included in the `ant` package. + - `kanata` was updated to v1.7.0, which introduces several breaking changes. See the release notes of [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index 073c14a0b57e3..f189ba586c7df 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 <