diff options
author | Bruno Bzeznik <Bruno.Bzeznik@univ-grenoble-alpes.fr> | 2018-01-31 18:16:30 +0100 |
---|---|---|
committer | Bruno Bzeznik <Bruno.Bzeznik@univ-grenoble-alpes.fr> | 2018-01-31 18:16:30 +0100 |
commit | b45f47453b8d399cb1d9c7ec93ca2bda55021380 (patch) | |
tree | d252b918a91912bee6f3af49d405defaca6cccf7 /pkgs/tools/filesystems/irods/default.nix | |
parent | 8343a6c7a534a7ac537cf35923ddd0a7e78936e2 (diff) | |
download | nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.tar nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.tar.gz nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.tar.bz2 nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.tar.lz nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.tar.xz nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.tar.zst nixlib-b45f47453b8d399cb1d9c7ec93ca2bda55021380.zip |
irods: 4.2.1 -> 4.2.2 + server bugfixes
Diffstat (limited to 'pkgs/tools/filesystems/irods/default.nix')
-rw-r--r-- | pkgs/tools/filesystems/irods/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 0714f2901046..20e5607a9595 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 ]; |