jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #132416 from turion/dev_rabbitmq-server_1.8_1.9

Browse Source 
rabbitmq-server: 3.8.9 -> 3.9.1
This commit is contained in:
Robert Hensing 2021-08-02 22:08:30 +02:00 committed by GitHub
commit 48ea8eb813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/rabbitmq.nix
View File

@ -8,6 +8,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine = {
services.rabbitmq.enable = true;
# Ensure there is sufficient extra disk space for rabbitmq to be happy
virtualisation.diskSize = 1024;
};
testScript = ''

15
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -8,17 +8,17 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.8.9";
version = "3.9.1";
# 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";
sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
};
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
buildInputs =
[ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
[ erlang elixir python libxml2 libxslt glibcLocales ]
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
outputs = [ "out" "man" "doc" ];
@ -40,13 +40,6 @@ stdenv.mkDerivation rec {
# rabbitmq-env calls to sed/coreutils, so provide everything early
sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
# rabbitmq-server script uses `dirname` to get hold of a
# rabbitmq-env, so let's provide this file directly. After that
# point everything is OK - the PATH above will kick in
substituteInPlace $out/sbin/rabbitmq-server \
--replace '`dirname $0`/rabbitmq-env' \
"$out/sbin/rabbitmq-env"
# We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
# By doing it early we make sure that auto-detection for this will
# never be executed (somewhere below in the script).

2
pkgs/top-level/all-packages.nix
View File

@ -20274,8 +20274,6 @@ in
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
elixir = beam_nox.interpreters.elixir_1_8;
erlang = beam_nox.interpreters.erlangR23;
};
radicale1 = callPackage ../servers/radicale/1.x.nix { };