diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 52513b424bb4a..cb6dba27a64c3 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -56,7 +56,7 @@ import ./make-test-python.nix ( # The password is the plaintext that was encrypted with rabbitmqctl encode above. machine.wait_until_succeeds( - '${pkgs.rabbitmq-java-client}/bin/PerfTest --time 10 --uri amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost' + 'echo Hello World | ${pkgs.lib.getExe pkgs.amqpcat} --producer --uri=amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost --queue test' ) ''; } diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix deleted file mode 100644 index ad21dff6609bc..0000000000000 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - ant, - jdk, - jre, - python2, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "rabbitmq-java-client"; - version = "3.3.4"; - - src = fetchurl { - url = "https://www.rabbitmq.com/releases/rabbitmq-java-client/v${version}/rabbitmq-java-client-${version}.tar.gz"; - sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - ant - jdk - python2 - ]; - - buildPhase = "ant dist"; - - installPhase = '' - mkdir -p $out/bin $out/share/java - cp build/lib/*.jar lib/*.jar $out/share/java - - # There is a script in the source archive, but ours is cleaner - makeWrapper ${jre}/bin/java $out/bin/PerfTest \ - --add-flags "-Djava.awt.headless=true -cp $out/share/java/\* com.rabbitmq.examples.PerfTest" - ''; - - meta = with lib; { - description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; - homepage = "https://www.rabbitmq.com/java-client.html"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - ]; - license = with licenses; [ - mpl11 - gpl2 - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index abceacfc1ba53..56892aa2bb798 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1485,6 +1485,7 @@ mapAliases { ### R ### + rabbitmq-java-client = throw "rabbitmq-java-client has been removed due to its dependency on Python2 and a lack of maintenance within the nixpkgs tree"; # Added 2025-03-29 rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36103fab41ce1..7fd4feddd8c24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11086,11 +11086,6 @@ with pkgs; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { }; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - readline = readline82; readline70 = callPackage ../development/libraries/readline/7.0.nix { };