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

Merge pull request #296938 from bzizou/irods-4.3.1 

irods: 4.3.0 -> 4.3.1 + fix pam auth
This commit is contained in:
Peder Bergebakken Sundt 2024-04-12 22:53:59 +02:00 committed by GitHub
parent 79cb825bf8 4de36aba89
commit da09de0e5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/tools/filesystems/irods/common.nix
View File

@ -26,6 +26,7 @@
"-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0"
"-DCPACK_GENERATOR=TGZ"
"-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1"
"-DPAM_LIBRARY=${pam}/lib/libpam.so"
];
postPatch = ''

14
pkgs/tools/filesystems/irods/default.nix
View File

@ -19,14 +19,14 @@ rec {
# irods: libs and server package
irods = stdenv.mkDerivation (finalAttrs: common // {
version = "4.3.0";
version = "4.3.1";
pname = "irods";
src = fetchFromGitHub {
owner = "irods";
repo = "irods";
rev = finalAttrs.version;
sha256 = "sha256-rceDGFpfoFIByzDOtgNIo9JRoVd0syM21MjEKoZUQaE=";
sha256 = "sha256-gWgNY8+zD2lRCV5ydOTF0qAgZ1dlQSQKxtdw+U235vg=";
fetchSubmodules = true;
};
@ -35,10 +35,10 @@ rec {
postPatch = common.postPatch + ''
patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
for file in unit_tests/cmake/test_config/*.cmake
do
substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2"
substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2"
done
export cmakeFlags="$cmakeFlags
-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib
@ -46,7 +46,7 @@ rec {
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib
"
substituteInPlace server/auth/CMakeLists.txt --replace SETUID ""
substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID ""
'';
meta = common.meta // {
@ -57,14 +57,14 @@ rec {
# icommands (CLI) package, depends on the irods package
irods-icommands = stdenv.mkDerivation (finalAttrs: common // {
version = "4.3.0";
version = "4.3.1";
pname = "irods-icommands";
src = fetchFromGitHub {
owner = "irods";
repo = "irods_client_icommands";
rev = finalAttrs.version;
sha256 = "sha256-90q1GPkoEUoiQXM6cA+DWwth7g8v93V471r9jm+l9aw=";
sha256 = "sha256-BjBg13KrCGRLOtGnp23qXOLudLctvu2gJ7wxHFjM5Ug=";
};
buildInputs = common.buildInputs ++ [ irods ];