From 13b508e96868e385c480ac5fc2f8c247ba3e4601 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 09:53:02 +0100 Subject: [PATCH 1/3] =?UTF-8?q?rabbitmq-server:=204.0.2=20=E2=86=92=204.0.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/rabbitmq/rabbitmq-server/compare/v4.0.2...v4.0.4 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 2e1483deeb053..9491989448724 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -42,12 +42,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "4.0.2"; + version = "4.0.4"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE="; + hash = "sha256-7ff/BFXH0MiMEV+GsfCnBPGGlgPht6gM0K43V2ogtHc="; }; nativeBuildInputs = [ From ec7e61744071273adc8f3c6bcfe1c56c9320b9bd Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 10:15:16 +0100 Subject: [PATCH 2/3] rabbitmq-server: use the latest compatible Erlang version --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38982497a655d..ffccc8a2dcf24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12177,8 +12177,9 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; - rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { - erlang = erlang_26; + rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server rec { + erlang = erlang_27; + elixir = pkgs.elixir.override { inherit erlang; }; }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; From d1761537ac54922496276856531bf1921f0f59bf Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 10:16:17 +0100 Subject: [PATCH 3/3] rabbitmq-server: move to by-name hierarchy --- .../default.nix => by-name/ra/rabbitmq-server/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/amqp/rabbitmq-server/default.nix => by-name/ra/rabbitmq-server/package.nix} (100%) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix similarity index 100% rename from pkgs/servers/amqp/rabbitmq-server/default.nix rename to pkgs/by-name/ra/rabbitmq-server/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffccc8a2dcf24..4f0306e00e5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12177,7 +12177,7 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; - rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server rec { + rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix rec { erlang = erlang_27; elixir = pkgs.elixir.override { inherit erlang; }; };