diff options
| author | Sarah Brofeldt <sarah@qtr.dk> | 2021-11-17 13:56:20 +0100 |
|---|---|---|
| committer | Sarah Brofeldt <sarah@qtr.dk> | 2021-11-17 14:00:53 +0100 |
| commit | 555ebb077e7d8c7278e203632c5d632ce66e6d53 (patch) | |
| tree | aca2370e8a569e66c9356156ee9148c9a3c6a220 | |
| parent | 6b68d74f036def3d48a23969edfd0fa47f34af3e (diff) | |
| download | nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.tar nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.tar.gz nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.tar.bz2 nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.tar.lz nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.tar.xz nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.tar.zst nixpkgs-555ebb077e7d8c7278e203632c5d632ce66e6d53.zip | |
zookeeper: jdk8 -> jdk11_headless
Put the specific version in the zookeeper derivation to try and stay in line with requisite versions as per zookeeper admin docs
| -rw-r--r-- | pkgs/servers/zookeeper/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index becd765fd8d..78ee5c34007 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: - +{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, bash, coreutils }: +let + # Latest supported LTS JDK for Zookeeper 3.6: + # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware + jre = jdk11_headless; +in stdenv.mkDerivation rec { pname = "zookeeper"; version = "3.6.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b19e97f089..d443f88150c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21578,9 +21578,7 @@ with pkgs; xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + zookeeper = callPackage ../servers/zookeeper { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; |