Merge pull request #253632 from bzizou/irods-4.3.0

+6 -10

pkgs/tools/filesystems/irods/common.nix

··· 1 1 { lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive 2 - , avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt 3 - , nlohmann_json, spdlog }: 2 + , avro-cpp, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt 3 + , nlohmann_json, spdlog, curl }: 4 4 5 5 # Common attributes of irods packages 6 6 7 7 { 8 8 nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ]; 9 - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost 10 - libcxx catch2 nanodbc fmt nlohmann_json spdlog ]; 9 + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp zeromq openssl pam libiodbc libkrb5 boost 10 + libcxx catch2 nanodbc fmt nlohmann_json spdlog curl ]; 11 11 12 12 cmakeFlags = [ 13 13 "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" ··· 15 15 "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=${libarchive.lib}" 16 16 "-DIRODS_EXTERNALS_FULLPATH_AVRO=${avro-cpp}" 17 17 "-DIRODS_EXTERNALS_FULLPATH_BOOST=${boost}" 18 - "-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}" 19 18 "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" 20 19 "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" 21 20 "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" ··· 31 30 32 31 postPatch = '' 33 32 patchShebangs ./packaging ./scripts 34 - substituteInPlace CMakeLists.txt \ 35 - --replace "DESTINATION usr/bin" "DESTINATION bin" \ 36 - --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" \ 37 - --replace "DESTINATION usr/lib/" "DESTINATION lib/" \ 38 - --replace "{IRODS_EXTERNALS_FULLPATH_JSON}/include" "{IRODS_EXTERNALS_FULLPATH_JSON}/include/nlohmann" 39 33 export cmakeFlags="$cmakeFlags 40 34 -DCMAKE_INSTALL_PREFIX=$out 35 + -DIRODS_HOME_DIRECTORY=$out 36 + -DCMAKE_INSTALL_SBINDIR=$out/sbin 41 37 " 42 38 ''; 43 39

+13 -25

pkgs/tools/filesystems/irods/default.nix

··· 1 1 { lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq 2 - , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 3 - , nanodbc_llvm, fmt, nlohmann_json, spdlog }: 2 + , libarchive, avro-cpp_llvm, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 3 + , nanodbc_llvm, fmt, nlohmann_json, spdlog, curl }: 4 4 5 5 let 6 6 avro-cpp = avro-cpp_llvm; ··· 9 9 let 10 10 common = import ./common.nix { 11 11 inherit lib stdenv bzip2 zlib autoconf automake cmake 12 - help2man texinfo libtool cppzmq libarchive jansson 12 + help2man texinfo libtool cppzmq libarchive 13 13 zeromq openssl pam libiodbc libkrb5 gcc libcxx 14 14 boost avro-cpp which catch2 nanodbc fmt nlohmann_json 15 - spdlog; 15 + spdlog curl; 16 16 }; 17 17 in 18 18 rec { 19 19 20 20 # irods: libs and server package 21 - irods = stdenv.mkDerivation (common // rec { 22 - version = "4.2.11"; 21 + irods = stdenv.mkDerivation (finalAttrs: common // { 22 + version = "4.3.0"; 23 23 pname = "irods"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "irods"; 27 27 repo = "irods"; 28 - rev = version; 29 - sha256 = "0prcsiddk8n3h515jjapgfz1d6hjqywhrkcf6giqd7xc7b0slz44"; 28 + rev = finalAttrs.version; 29 + sha256 = "sha256-rceDGFpfoFIByzDOtgNIo9JRoVd0syM21MjEKoZUQaE="; 30 30 fetchSubmodules = true; 31 31 }; 32 32 33 - # Patches: 34 - # irods_root_path.patch : the root path is obtained by stripping 3 items of the path, 35 - # but we don't use /usr with nix, so remove only 2 items. 36 - patches = [ ./irods_root_path.patch ]; 37 - 38 33 # fix build with recent llvm versions 39 34 env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; 40 35 41 36 postPatch = common.postPatch + '' 42 37 patchShebangs ./test 43 38 substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" 44 - substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin" 45 - substituteInPlace cmake/server.cmake --replace "IRODS_DOC_DIR usr/share" "IRODS_DOC_DIR share" 46 - substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" 47 - substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" 48 - substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include" 49 39 for file in unit_tests/cmake/test_config/*.cmake 50 40 do 51 41 substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2" ··· 56 46 -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib 57 47 " 58 48 59 - substituteInPlace cmake/server.cmake --replace SETUID "" 49 + substituteInPlace server/auth/CMakeLists.txt --replace SETUID "" 60 50 ''; 61 51 62 52 meta = common.meta // { ··· 66 56 67 57 68 58 # icommands (CLI) package, depends on the irods package 69 - irods-icommands = stdenv.mkDerivation (common // rec { 70 - version = "4.2.11"; 59 + irods-icommands = stdenv.mkDerivation (finalAttrs: common // { 60 + version = "4.3.0"; 71 61 pname = "irods-icommands"; 72 62 73 63 src = fetchFromGitHub { 74 64 owner = "irods"; 75 65 repo = "irods_client_icommands"; 76 - rev = version; 77 - sha256 = "0wgs585j2lp820py2pbizsk54xgz5id96fhxwwk9lqhbzxhfjhcg"; 66 + rev = finalAttrs.version; 67 + sha256 = "sha256-90q1GPkoEUoiQXM6cA+DWwth7g8v93V471r9jm+l9aw="; 78 68 }; 79 - 80 - patches = [ ./zmqcpp-deprecated-send_recv.patch ]; 81 69 82 70 buildInputs = common.buildInputs ++ [ irods ]; 83 71

-49

pkgs/tools/filesystems/irods/irods_root_path.patch

··· 1 - diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py 2 - --- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000 3 - +++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000 4 - @@ -10,7 +10,7 @@ 5 - return os.path.join(root_directory(), 'var', 'lib', 'irods') 6 - 7 - def config_directory(): 8 - - return os.path.join(root_directory(), 'etc', 'irods') 9 - + return os.path.join(os.path.abspath('/'), 'etc', 'irods') 10 - 11 - def plugins_directory(): 12 - return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins') 13 - @@ -37,7 +37,7 @@ 14 - 15 - def version_path(): 16 - return os.path.join( 17 - - irods_directory(), 18 - + home_directory(), 19 - 'VERSION.json') 20 - 21 - def hosts_config_path(): 22 - @@ -64,7 +64,7 @@ 23 - 24 - def log_directory(): 25 - return os.path.join( 26 - - irods_directory(), 27 - + home_directory(), 28 - 'log') 29 - 30 - def control_log_path(): 31 - @@ -110,8 +110,7 @@ 32 - def server_bin_directory(): 33 - return os.path.join( 34 - root_directory(), 35 - - 'usr', 36 - - 'sbin') 37 - + 'bin') 38 - 39 - def server_executable(): 40 - return os.path.join( 41 - @@ -132,7 +131,7 @@ 42 - return os.path.join(config_directory(), 'service_account.config') 43 - 44 - def genosauth_path(): 45 - - return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth') 46 - + return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth') 47 - 48 - def irods_user_and_group_entries(): 49 - try:

-21

pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch

··· 1 - diff -r -u source/src/irods-grid.cpp source.new/src/irods-grid.cpp 2 - --- source/src/irods-grid.cpp 1970-01-01 01:00:01.000000000 +0100 3 - +++ source.new/src/irods-grid.cpp 2020-05-05 16:34:35.566464346 +0200 4 - @@ -412,7 +412,7 @@ 5 - data_to_send.data(), 6 - data_to_send.size() ); 7 - try { 8 - - if (!zmq_skt.send(req)) { 9 - + if (!zmq_skt.send( req, zmq::send_flags::dontwait )) { 10 - std::cerr << "ZeroMQ encountered an error sending a message.\n"; 11 - return errno; 12 - } 13 - @@ -426,7 +426,7 @@ 14 - zmq::message_t rep; 15 - // wait for the server reponse 16 - try { 17 - - if (!zmq_skt.recv( &rep )) { 18 - + if (!zmq_skt.recv( rep, zmq::recv_flags::dontwait )) { 19 - std::cerr << "ZeroMQ encountered an error receiving a message.\n"; 20 - return errno; 21 - }

+3 -3

pkgs/top-level/all-packages.nix

··· 9310 9310 idevicerestore = callPackage ../tools/misc/idevicerestore { }; 9311 9311 9312 9312 inherit (callPackages ../tools/filesystems/irods rec { 9313 - stdenv = llvmPackages.libcxxStdenv; 9314 - libcxx = llvmPackages.libcxx; 9315 - boost = boost179.override { inherit stdenv; }; 9313 + stdenv = llvmPackages_13.libcxxStdenv; 9314 + libcxx = llvmPackages_13.libcxx; 9315 + boost = boost178.override { inherit stdenv; }; 9316 9316 fmt = fmt_8.override { inherit stdenv; }; 9317 9317 nanodbc_llvm = nanodbc.override { inherit stdenv; }; 9318 9318 avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };