nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

xrootd: 5.9.1 -> 6.0.2

Browse Source
This commit is contained in:
kyehn
2026-05-20 09:37:32 +00:00
parent 7c27203aa5
commit 025c17476f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/by-name/xr/xrootd/package.nix
View File

@@ -3,7 +3,6 @@
stdenv,
callPackage,
fetchFromGitHub,
davix,
cmake,
gtest,
makeWrapper,
@@ -15,6 +14,7 @@
libuuid,
libxcrypt,
libxml2,
libzip,
openssl,
readline,
scitokens-cpp,
@@ -30,14 +30,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xrootd";
version = "5.9.1";
version = "6.0.2";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "xrootd";
repo = "xrootd";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-XClMtQfCGWpLtILGQyYCsKMcOlhLHC5i7UabzXH/imc=";
hash = "sha256-RSODctDfDkdY1YnxFINGwbpNxEkNCYjW1QEDk9VAYFw=";
};
postPatch = ''
@@ -65,12 +68,12 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
davix
curl
libkrb5
libuuid
libxcrypt
libxml2
libzip
openssl
readline
scitokens-cpp
@@ -86,17 +89,15 @@ stdenv.mkDerivation (finalAttrs: {
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=
# https://github.com/xrootd/xrootd/blob/v6.0.2/config/
postInstall = ''
mkdir -p "$out/lib/tmpfiles.d"
install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
mkdir -p "$out/etc/xrootd"
install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
install -m 644 -t "$out/etc/xrootd" ../config/*.cfg
install -m 644 -t "$out/etc/xrootd" ../config/client.conf
mkdir -p "$out/etc/xrootd/client.plugins.d"
install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../config/client-plugin.conf.example
mkdir -p "$out/etc/logrotate.d"
install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
install -m 644 -T ../config/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
''
# Leaving those in bin/ leads to a cyclic reference between $dev and $bin
# This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788
@@ -107,13 +108,12 @@ stdenv.mkDerivation (finalAttrs: {
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p "$out/lib/systemd/system"
install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
install -m 644 -t "$out/lib/systemd/system" ../systemd/*.service ../systemd/*.socket
'';
cmakeFlags = [
(lib.cmakeFeature "XRootD_VERSION_STRING" finalAttrs.version)
(lib.cmakeBool "FORCE_ENABLED" true)
(lib.cmakeBool "ENABLE_DAVIX" true)
(lib.cmakeBool "ENABLE_FUSE" (!stdenv.hostPlatform.isDarwin)) # XRootD doesn't support MacFUSE
(lib.cmakeBool "ENABLE_MACAROONS" false)
(lib.cmakeBool "ENABLE_PYTHON" false) # built separately