Unverified Commit da09de0e authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #296938 from bzizou/irods-4.3.1 

irods: 4.3.0 -> 4.3.1 + fix pam auth
parents 79cb825b 4de36aba

pkgs/tools/filesystems/irods/common.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/tools/filesystems/irods/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -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 ];