public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irods: 4.2.2 -> 4.2.7 + fixed + use fetchFromGitHub

Browse Source
This commit is contained in:
Bruno Bzeznik
2020-05-09 09:09:35 +02:00
committed by Frederik Rietdijk
parent ccfe14cb3b
commit afe6e1c4ea
3 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/irods/default.nix
+24 -14
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }:
with stdenv;
@@ -10,19 +10,21 @@ let
inherit stdenv bzip2 zlib autoconf automake cmake gnumake
help2man texinfo libtool cppzmq libarchive jansson
zeromq openssl pam libiodbc kerberos gcc libcxx
boost avro-cpp which;
boost avro-cpp which catch2;
};
in rec {
# irods: libs and server package
irods = stdenv.mkDerivation (common // rec {
version = "4.2.2";
prefix = "irods";
name = "${prefix}-${version}";
version = "4.2.7";
pname = "irods";
src = fetchurl {
url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz";
sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7";
src = fetchFromGitHub {
owner = "irods";
repo = "irods";
rev = version;
sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s";
fetchSubmodules = true;
};
# Patches:
@@ -41,6 +43,10 @@ in rec {
substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib"
substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib"
substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include"
for file in unit_tests/cmake/test_config/*.cmake
do
substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2"
done
export cmakeFlags="$cmakeFlags
-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib
-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib
@@ -59,13 +65,18 @@ in rec {
# icommands (CLI) package, depends on the irods package
irods-icommands = stdenv.mkDerivation (common // rec {
version = "4.2.2";
name = "irods-icommands-${version}";
src = fetchurl {
url = "https://github.com/irods/irods_client_icommands/archive/${version}.tar.gz";
sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h";
version = "4.2.7";
pname = "irods-icommands";
src = fetchFromGitHub {
owner = "irods";
repo = "irods_client_icommands";
rev = version;
sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli";
};
patches = [ ./zmqcpp-deprecated-send_recv.patch ];
buildInputs = common.buildInputs ++ [ irods ];
preConfigure = common.preConfigure + ''
@@ -84,7 +95,6 @@ in rec {
description = common.meta.description + " CLI clients";
longDescription = common.meta.longDescription + ''
This package provides the CLI clients, called 'icommands'.'';
broken = true;
};
});
}