@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "zookeeper";
5− version = "3.4.13";
5+ version = "3.6.2";
66
77 src = fetchurl {
8− url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz";
9− sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw";
8+ url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
9+ sha512 = "caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199";
1010 };
1111
1212 buildInputs = [ makeWrapper jre ];
@@ -15,40 +15,28 @@ stdenv.mkDerivation rec {
1515
1616 installPhase = ''
1717 mkdir -p $out
18− cp -R conf docs lib ${pname}-${version}.jar $out
18+ cp -R conf docs lib $out
19+ # Without this, zkCli.sh tries creating a log file in the Nix store.
20+ substituteInPlace $out/conf/log4j.properties \
21+ --replace 'INFO, RFAAUDIT' 'INFO, CONSOLE'
1922 mkdir -p $out/bin
20− cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
23+ cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin
2124 patchShebangs $out/bin
2225 substituteInPlace $out/bin/zkServer.sh \
2326 --replace /bin/echo ${coreutils}/bin/echo
24− for i in $out/bin/{zkCli,zkCleanup,zkServer}.sh; do
27+ for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do
2528 wrapProgram $i \
2629 --set JAVA_HOME "${jre}" \
2730 --prefix PATH : "${bash}/bin"
2831 done
2932 chmod -x $out/bin/zkEnv.sh
30−
31− mkdir -p $out/share/zooinspector
32− cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
33−
34− classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar"
35− for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
36− classpath="$classpath:$jar"
37− done
38−
39− cat << EOF > $out/bin/zooInspector.sh
40− #!${runtimeShell}
41− cd $out/share/zooinspector
42− exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector
43− EOF
44− chmod +x $out/bin/zooInspector.sh
4533 '';
4634
4735 meta = with stdenv.lib; {
48− homepage = "http://zookeeper.apache.org";
36+ homepage = "https://zookeeper.apache.org";
4937 description = "Apache Zookeeper";
5038 license = licenses.asl20;
51− maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
39+ maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ztzg ];
5240 platforms = platforms.unix;
5341 };
5442}