Merge pull request #262034 from ztzg/x-16104-zookeeper-update

zookeeper: 3.7.1 -> 3.7.2
This commit is contained in:
Sarah Brofeldt 2023-10-19 15:26:35 +02:00 committed by GitHub
commit 852472f9f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
hash = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg==";
hash = "sha512-V1SFPtSytFZMyiR/cgwLA9zPUK5xuarP3leQCQiSfelUHnYMB+R6ZQfSHMHD9t+URvLc+KRFSriLTzethspkpA==";
};
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";

View file

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }:
let
# Latest supported LTS JDK for Zookeeper 3.6:
# https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware
# Latest supported LTS JDK for Zookeeper 3.7:
# https://zookeeper.apache.org/doc/r3.7.2/zookeeperAdmin.html#sc_requiredSoftware
jre = jdk11_headless;
in
stdenv.mkDerivation rec {
pname = "zookeeper";
version = "3.7.1";
version = "3.7.2";
src = fetchurl {
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
hash = "sha512-kQNiilB0X6GiibymZv2kqcCOwXxVzxPmaIfnunbpPbrmCh8f/WwQeYvjoWBpNE7LwAzrspvwPZzXCWzNCY7QEQ==";
hash = "sha512-avv8GvyLk3AoG9mGLzfbscuV7FS7LtQ3GDGqXA8Iz+53UFC9V85fwINuYa8n7tnwB29UuYmX3Q4VFZGWBW5S6g==";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -27478,9 +27478,7 @@ with pkgs;
zookeeper = callPackage ../servers/zookeeper { };
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt {
openssl = openssl_1_1;
};
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; };