xrootd: 5.5.0 -> 5.5.1

Base the update on r-ryantm's automatic work.
Remove the already included patch.
This commit is contained in:
R. Ryantm 2022-10-20 03:15:25 +00:00 committed by Shamrock Lee
parent 98bb201bbf
commit afe243f3c9

View file

@ -24,14 +24,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xrootd"; pname = "xrootd";
version = "5.5.0"; version = "5.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xrootd"; owner = "xrootd";
repo = "xrootd"; repo = "xrootd";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-a8qw8uHxd7OLMMq+HPMB36O0Yjctlnf8DkfEdMvc1NQ="; hash = "sha256-PaLT3+5FucPnWLStWxtBBqTKs8hvogKMrZteSNY+xXI=";
}; };
outputs = [ "bin" "out" "dev" "man" ]; outputs = [ "bin" "out" "dev" "man" ];
@ -66,11 +66,6 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
patchShebangs genversion.sh patchShebangs genversion.sh
# Manually apply part of
# https://github.com/xrootd/xrootd/pull/1619
# Remove after the above PR is merged.
sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake
''; '';
# https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675= # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=