diff options
author | illustris <rharikrishnan95@gmail.com> | 2022-10-02 17:41:29 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-02 14:11:29 +0200 |
commit | 5485f678b97ffc1ffb8cc6090e8eb4eb4bfa6218 (patch) | |
tree | b1080b03b4c7ad07ecaff780b95ccf2abc7533df /pkgs/applications/networking/cluster/hadoop | |
parent | f3ec61b6dfe2f23caaa52b2f9d420dc1bd376b5c (diff) |
hadoop: 3.3.3 -> 3.3.4, remove outdated protobuf (#193665)
Diffstat (limited to 'pkgs/applications/networking/cluster/hadoop')
-rw-r--r-- | pkgs/applications/networking/cluster/hadoop/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 1d9b10bfc39b3..365cac59f41ad 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -10,7 +10,7 @@ , which , bzip2 , cyrus_sasl -, protobuf3_7 +, protobuf , snappy , zlib , zstd @@ -92,8 +92,8 @@ in pname = "hadoop"; platformAttrs = rec { x86_64-linux = { - version = "3.3.3"; - hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; + version = "3.3.4"; + hash = "sha256-akg9GgsSNJDr2N8/cbZOs58zP3i5XwkK61jkM8vCQW0="; }; x86_64-darwin = x86_64-linux; aarch64-linux = { @@ -107,7 +107,7 @@ in jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library - nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ]; + nativeLibs = [ stdenv.cc.cc.lib protobuf zlib snappy ]; libPatches = '' ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ @@ -119,14 +119,17 @@ in patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 # Java 8 has libjvm.so at a different path patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 + # NixOS/nixpkgs#193370 + # This workaround is needed to use protobuf 3.19 + patchelf --replace-needed libprotobuf.so.18 libprotobuf.so $out/lib/${untarDir}/lib/native/libhdfspp.so ''; tests = nixosTests.hadoop; }; hadoop_3_2 = common rec { pname = "hadoop"; platformAttrs.x86_64-linux = { - version = "3.2.3"; - hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + version = "3.2.4"; + hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw="; }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency |