Commit 31f260e2 authored by Gaetan Lepage's avatar Gaetan Lepage
Browse files

python312Packages.xrootd: 5.6.6 -> 5.7.1

parent 685c8307

pkgs/by-name/xr/xrootd/package.nix

+7 −6
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
  systemd,

  voms,

  zlib,

  # If not null, the builder will

  # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.

  # If not null, move the default configuration files to "$etc/etc" and look for the configuration

  # directory at externalEtc.

  # Otherwise, the program will look for the configuration files under $out/etc."

  externalEtc ? "/etc",

  removeReferencesTo,

}:
@@ -81,9 +82,9 @@ stdenv.mkDerivation (finalAttrs: { 
      # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58

      fuse

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      systemd

      voms

    ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [

      systemd # only available on specific non-static Linux platforms

      voms # only available on Linux due to gsoap failing to build on Darwin

    ];



  # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
@@ -119,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeBool "ENABLE_MACAROONS" false)

    (lib.cmakeBool "ENABLE_PYTHON" false) # built separately

    (lib.cmakeBool "ENABLE_SCITOKENS" true)

    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.doCheck)

    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)

    (lib.cmakeBool "ENABLE_VOMS" stdenv.hostPlatform.isLinux)

  ];

pkgs/development/python-modules/xrootd/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  buildPythonPackage,

  cmake,

  setuptools,

  wheel,

  xrootd,

}:
@@ -15,10 +14,9 @@ buildPythonPackage rec { 


  sourceRoot = "${src.name}/bindings/python";



  nativeBuildInputs = [

  build-system = [

    cmake

    setuptools

    wheel

  ];



  buildInputs = [ xrootd ];
@@ -30,11 +28,11 @@ buildPythonPackage rec { 
  # Tests are only compatible with Python 2

  doCheck = false;



  meta = with lib; {

  meta = {

    description = "XRootD central repository";

    homepage = "https://github.com/xrootd/xrootd";

    changelog = "https://github.com/xrootd/xrootd/releases/tag/v${version}";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ GaetanLepage ];

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ GaetanLepage ];

  };

}