3
0
Fork 0
forked from mirrors/nixpkgs

hadoop: 3.3.3 -> 3.3.4, remove outdated protobuf (#193665)

This commit is contained in:
illustris 2022-10-02 17:41:29 +05:30 committed by GitHub
parent f3ec61b6df
commit 5485f678b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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