diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2021-08-02 22:08:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-02 22:08:30 +0200 |
commit | 48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f (patch) | |
tree | 49962bdc3725110f862fcf3cd31f1319f97c31d0 /pkgs | |
parent | eff94d8bf3a17c72afadca9903334e2b44b3401f (diff) | |
parent | 4d5c2bc76e650b6fb5f58cc6c45d4aea093b2a79 (diff) | |
download | nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.tar nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.tar.gz nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.tar.bz2 nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.tar.lz nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.tar.xz nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.tar.zst nixpkgs-48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f.zip |
Merge pull request #132416 from turion/dev_rabbitmq-server_1.8_1.9
rabbitmq-server: 3.8.9 -> 3.9.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index c2d13b00aa8..3f2e595b31f 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -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). diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d88a4e89c7..f61bb8b91d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |