diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 627ade13a6ad..5192f7a7d48b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -231,6 +231,8 @@ - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream. +- `rabbitmq-server` has been updated from 4.0.9 to 4.1.4. The 4.1.0 release includes breaking changes. For more information read the [changelog of 4.1.0](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v4.1.0) + - `lxde` scope has been removed, and its packages have been moved the top-level. - `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0). diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index 660d517bfe62..4c242a6ed253 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -6,6 +6,7 @@ python3, libxml2, libxslt, + git, xmlto, docbook_xml_dtd_45, docbook_xsl, @@ -21,6 +22,7 @@ glibcLocales, nixosTests, which, + p7zip, }: let @@ -39,14 +41,14 @@ let ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rabbitmq-server"; - version = "4.0.9"; + version = "4.1.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-imBxBn8RQS0jBGfT5KLLLt+fKvyybzLzPZu9DpFOos8="; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + hash = "sha256-dqNdrbXSysYUMN+6gMMb9GXKER/mOGXgW6j3iOLHNks="; }; nativeBuildInputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation rec { rsync python3 which + p7zip ]; buildInputs = [ @@ -68,6 +71,15 @@ stdenv.mkDerivation rec { glibcLocales ]; + prePatch = '' + # erlang.mk assumes that the elixir lib directory is at the same level as the bin of the elixir binary, + # this is not for the Nixpkgs packaging, so patch this + substituteInPlace erlang.mk \ + --replace-fail \ + "ELIXIR_LIBS ?= $(abspath $(dir $(ELIXIR_BIN))/../lib)" \ + "ELIXIR_LIBS ?= ${beamPackages.elixir}/lib/elixir/lib" + ''; + outputs = [ "out" "man" @@ -129,9 +141,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "Implementation of the AMQP messaging protocol"; - changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}"; + changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ samueltardieu ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d85806a7e511..e5d3897c1ca4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9693,7 +9693,7 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix { - beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_17; }); + beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; }); }; rethinkdb = callPackage ../servers/nosql/rethinkdb {