diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-19 13:06:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 13:06:58 -0500 |
commit | b5bdc5a73a07e9dbdbb330114d18428f63002dd0 (patch) | |
tree | 3731961138246a8077ba59c07d99f7be10575499 /pkgs/tools/filesystems/irods | |
parent | a008505c65e796936b2ca976c5fb1ee46f63d4b0 (diff) | |
parent | b45f47453b8d399cb1d9c7ec93ca2bda55021380 (diff) |
Merge pull request #34464 from Gricad/irods-4.2.2-bz
irods: 4.2.1 -> 4.2.2 + server bugfixes
Diffstat (limited to 'pkgs/tools/filesystems/irods')
-rw-r--r-- | pkgs/tools/filesystems/irods/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/filesystems/irods/irods_root_path.patch | 64 |
2 files changed, 70 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 523028f5fb2e..c2066f95ef5a 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: with stdenv; let + avro-cpp=avro-cpp_llvm; +in +let common = import ./common.nix { inherit stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson @@ -13,13 +16,13 @@ in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.1"; + version = "4.2.2"; prefix = "irods"; name = "${prefix}-${version}"; src = fetchurl { url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq"; + sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7"; }; # Patches: @@ -53,11 +56,11 @@ in rec { # icommands (CLI) package, depends on the irods package irods-icommands = stdenv.mkDerivation (common // rec { - version = "4.2.1"; + version = "4.2.2"; name = "irods-icommands-${version}"; src = fetchurl { url = "http://github.com/irods/irods_client_icommands/archive/${version}.tar.gz"; - sha256 = "1kg07frv2rf32nf53a1nxscwzgr0rpgxvp5fkmh5439knby10fqw"; + sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h"; }; buildInputs = common.buildInputs ++ [ irods ]; diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch index c88169ac023f..16b6ba08cbb2 100644 --- a/pkgs/tools/filesystems/irods/irods_root_path.patch +++ b/pkgs/tools/filesystems/irods/irods_root_path.patch @@ -1,5 +1,6 @@ ---- a/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:02.955889536 +0200 -+++ b/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:43.178722157 +0200 +diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp +--- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp 2016-11-15 06:23:55.000000000 +0000 ++++ irods-4.2.0/lib/core/src/irods_default_paths.cpp 2016-12-20 18:03:17.156883399 +0000 @@ -18,7 +18,7 @@ try { boost::filesystem::path path{dl_info.dli_fname}; @@ -9,3 +10,62 @@ return path; } catch(const boost::filesystem::filesystem_error& e) { THROW(-1, e.what()); +@@ -27,8 +27,7 @@ + + boost::filesystem::path + get_irods_config_directory() { +- boost::filesystem::path path{get_irods_root_directory()}; +- path.append("etc").append("irods"); ++ boost::filesystem::path path("/etc/irods"); + return path; + } + +diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py +--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000 ++++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000 +@@ -10,7 +10,7 @@ + return os.path.join(root_directory(), 'var', 'lib', 'irods') + + def config_directory(): +- return os.path.join(root_directory(), 'etc', 'irods') ++ return os.path.join(os.path.abspath('/'), 'etc', 'irods') + + def plugins_directory(): + return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins') +@@ -37,7 +37,7 @@ + + def version_path(): + return os.path.join( +- irods_directory(), ++ home_directory(), + 'VERSION.json') + + def hosts_config_path(): +@@ -64,7 +64,7 @@ + + def log_directory(): + return os.path.join( +- irods_directory(), ++ home_directory(), + 'log') + + def control_log_path(): +@@ -110,8 +110,7 @@ + def server_bin_directory(): + return os.path.join( + root_directory(), +- 'usr', +- 'sbin') ++ 'bin') + + def server_executable(): + return os.path.join( +@@ -132,7 +131,7 @@ + return os.path.join(config_directory(), 'service_account.config') + + def genosauth_path(): +- return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth') ++ return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth') + + def irods_user_and_group_entries(): + try: |