From 555ebb077e7d8c7278e203632c5d632ce66e6d53 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 17 Nov 2021 13:56:20 +0100 Subject: [PATCH 1/2] 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 --- pkgs/servers/zookeeper/default.nix | 8 ++++++-- 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 becd765fd8de..78ee5c34007b 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 6b19e97f089b..d443f88150c0 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 { }; From 7a30dd25fcbba6af9cb0bdb47eeb65bccc80ed09 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 17 Nov 2021 16:11:08 +0100 Subject: [PATCH 2/2] zookeeper: Add tests.nixos --- pkgs/servers/zookeeper/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 78ee5c34007b..f00c749557f1 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, bash, coreutils }: +{ 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 @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + nixos = nixosTests.zookeeper; + }; + meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper";