ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-04 03:27:38 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sandro 2021-11-20 20:41:31 +01:00 committed by GitHub
commit d3d3d67048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/zookeeper/default.nix
View File

@ -1,5 +1,9 @@
{ lib, stdenv, fetchurl, jre, 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
jre = jdk11_headless;
in
stdenv.mkDerivation rec {
pname = "zookeeper";
version = "3.6.3";
@ -33,6 +37,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.tests = {
nixos = nixosTests.zookeeper;
};
meta = with lib; {
homepage = "https://zookeeper.apache.org";
description = "Apache Zookeeper";

4
pkgs/top-level/all-packages.nix
View File

@ -21639,9 +21639,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 { };