Skip to content

Commit 6bbfebf

Browse files
author
Benjamin Sparks
committedMar 22, 2025
nixos/rabbitmq: use amqpcat instead of rabbitmq-java-client
rabbitmq-java-client no longer contains the PerfTest tool
1 parent c15d727 commit 6bbfebf

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed
 

‎nixos/tests/rabbitmq.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import ./make-test-python.nix (
5656
5757
# The password is the plaintext that was encrypted with rabbitmqctl encode above.
5858
machine.wait_until_succeeds(
59-
'${pkgs.rabbitmq-java-client}/bin/PerfTest --time 10 --uri amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost'
59+
'${pkgs.lib.getExe pkgs.amqpcat} --uri amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost'
6060
)
6161
'';
6262
}

‎pkgs/development/libraries/rabbitmq-java-client/default.nix ‎pkgs/by-name/ra/rabbitmq-java-client/package.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
lib,
33
maven,
44
fetchFromGitHub,
5-
linkFarm,
65
python3,
7-
...
6+
linkFarm,
87
}:
98
let
109
rabbitmq-codegen = linkFarm "deps-dir" [
@@ -41,7 +40,8 @@ maven.buildMavenPackage rec {
4140
"-Ddeps.dir=${rabbitmq-codegen}"
4241
];
4342

44-
mvnHash = "sha256-EobNz59gKlT3cC1KmwradBIzNaCuX0hIr+JtWuUz+kk=";
43+
#mvnHash = "sha256-EobNz59gKlT3cC1KmwradBIzNaCuX0hIr+JtWuUz+kk=";
44+
mvnHash = lib.fakeHash;
4545

4646
installPhase = ''
4747
install -Dm644 -t $out/lib \
@@ -51,7 +51,7 @@ maven.buildMavenPackage rec {
5151
meta = with lib; {
5252
description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
5353
homepage = "https://www.rabbitmq.com/client-libraries/java-client";
54-
changelog = "https://github.com/pytorch/torcheval/releases/tag/v${version}";
54+
changelog = "https://github.com/rabbitmq/rabbitmq-java-client/releases/tag/v${version}";
5555

5656
sourceProvenance = with sourceTypes; [
5757
fromSource

‎pkgs/top-level/all-packages.nix

-5
Original file line numberDiff line numberDiff line change
@@ -10283,11 +10283,6 @@ with pkgs;
1028310283

1028410284
qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { };
1028510285

10286-
rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {
10287-
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
10288-
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
10289-
};
10290-
1029110286
readline = readline82;
1029210287

1029310288
readline70 = callPackage ../development/libraries/readline/7.0.nix { };

0 commit comments

Comments
 (0)
Failed to load comments.