Merge pull request #295992 from LeSuisse/zookeeper-3.9.2
zookeeper: 3.7.2 -> 3.9.2
This commit is contained in:
commit
f45c6f3217
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
|
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
|
||||||
hash = "sha512-V1SFPtSytFZMyiR/cgwLA9zPUK5xuarP3leQCQiSfelUHnYMB+R6ZQfSHMHD9t+URvLc+KRFSriLTzethspkpA==";
|
hash = "sha512-G6Yw9HBF43QCw8FTLnJ7boCjUYwaQVQAT4wXqUowSlzox1cUPH5+8ZYMBxToJCbr0ppmz22t0uKsHRUI/IDAPQ==";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
|
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }:
|
{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }:
|
||||||
let
|
let
|
||||||
# Latest supported LTS JDK for Zookeeper 3.7:
|
# Latest supported LTS JDK for Zookeeper 3.9:
|
||||||
# https://zookeeper.apache.org/doc/r3.7.2/zookeeperAdmin.html#sc_requiredSoftware
|
# https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_requiredSoftware
|
||||||
jre = jdk11_headless;
|
jre = jdk11_headless;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "zookeeper";
|
pname = "zookeeper";
|
||||||
version = "3.7.2";
|
version = "3.9.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
|
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
|
||||||
hash = "sha512-avv8GvyLk3AoG9mGLzfbscuV7FS7LtQ3GDGqXA8Iz+53UFC9V85fwINuYa8n7tnwB29UuYmX3Q4VFZGWBW5S6g==";
|
hash = "sha512-K1rgLWGKJ8qM1UkkhV1TRCY7fZ3udgGB+dZrr6kjAyTSrTF4aJXwZUyWncONSj0Ad/dMw3a1i1+i+5S+satEXw==";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -20,14 +20,11 @@ stdenv.mkDerivation rec {
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -R conf docs lib $out
|
cp -R conf docs lib $out
|
||||||
# Without this, zkCli.sh tries creating a log file in the Nix store.
|
|
||||||
substituteInPlace $out/conf/log4j.properties \
|
|
||||||
--replace 'INFO, RFAAUDIT' 'INFO, CONSOLE'
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin
|
cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin
|
||||||
patchShebangs $out/bin
|
patchShebangs $out/bin
|
||||||
substituteInPlace $out/bin/zkServer.sh \
|
substituteInPlace $out/bin/zkServer.sh \
|
||||||
--replace /bin/echo ${coreutils}/bin/echo
|
--replace-fail /bin/echo ${coreutils}/bin/echo
|
||||||
for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do
|
for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do
|
||||||
wrapProgram $i \
|
wrapProgram $i \
|
||||||
--set JAVA_HOME "${jre}" \
|
--set JAVA_HOME "${jre}" \
|
||||||
|
@ -47,8 +44,10 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://zookeeper.apache.org";
|
homepage = "https://zookeeper.apache.org";
|
||||||
description = "Apache Zookeeper";
|
description = "Apache Zookeeper";
|
||||||
|
changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ nathan-gs pradeepchhetri ztzg ];
|
maintainers = with maintainers; [ nathan-gs pradeepchhetri ztzg ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user