From afe243f3c9efe77ced675986875d547425a4a8f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 03:15:25 +0000 Subject: [PATCH] xrootd: 5.5.0 -> 5.5.1 Base the update on r-ryantm's automatic work. Remove the already included patch. --- pkgs/tools/networking/xrootd/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 454ee0944620..93683bc6f7fa 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-a8qw8uHxd7OLMMq+HPMB36O0Yjctlnf8DkfEdMvc1NQ="; + hash = "sha256-PaLT3+5FucPnWLStWxtBBqTKs8hvogKMrZteSNY+xXI="; }; outputs = [ "bin" "out" "dev" "man" ]; @@ -66,11 +66,6 @@ stdenv.mkDerivation rec { preConfigure = '' 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=