pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #146387 from srhb/bump-zookeeper-jre

authored by Sandro and committed by GitHub d3d3d670 6ed91579

+11 -5
unified split
+10 -2
pkgs/servers/zookeeper/default.nix
··· 1 - { lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: 2 - 1 + { lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }: 2 + let 3 + # Latest supported LTS JDK for Zookeeper 3.6: 4 + # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware 5 + jre = jdk11_headless; 6 + in 3 7 stdenv.mkDerivation rec { 4 8 pname = "zookeeper"; 5 9 version = "3.6.3"; ··· 32 36 chmod -x $out/bin/zkEnv.sh 33 37 runHook postInstall 34 38 ''; 39 + 40 + passthru.tests = { 41 + nixos = nixosTests.zookeeper; 42 + }; 35 43 36 44 meta = with lib; { 37 45 homepage = "https://zookeeper.apache.org";
+1 -3
pkgs/top-level/all-packages.nix
··· 21639 21639 21640 21640 xinetd = callPackage ../servers/xinetd { }; 21641 21641 21642 - zookeeper = callPackage ../servers/zookeeper { 21643 - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 21644 - }; 21642 + zookeeper = callPackage ../servers/zookeeper { }; 21645 21643 21646 21644 zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; 21647 21645