root: 6.26.10 -> 6.28.06 (#215187)

authored by

Dmitry Kalinkin and committed by
GitHub
3c15feef 278796c7

+14 -39
+14 -39
pkgs/applications/science/misc/root/default.nix
··· 2 2 , lib 3 3 , callPackage 4 4 , fetchurl 5 - , fetchpatch 6 5 , makeWrapper 7 6 , cmake 8 7 , coreutils ··· 14 13 , gnugrep 15 14 , gnused 16 15 , gsl 16 + , gtest 17 17 , lapack 18 18 , libX11 19 19 , libXpm ··· 23 23 , libGL 24 24 , libxcrypt 25 25 , libxml2 26 - , llvm_9 26 + , llvm_13 27 27 , lsof 28 28 , lz4 29 29 , xz ··· 55 55 , noSplash ? false 56 56 }: 57 57 58 - let 59 - 60 - _llvm_9 = llvm_9.overrideAttrs (prev: { 61 - patches = (prev.patches or [ ]) ++ [ 62 - (fetchpatch { 63 - url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; 64 - stripLen = 3; 65 - hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo="; 66 - }) 67 - ]; 68 - }); 69 - 70 - in 71 - 72 58 stdenv.mkDerivation rec { 73 59 pname = "root"; 74 - version = "6.26.10"; 60 + version = "6.28.06"; 75 61 76 62 passthru = { 77 63 tests = import ./tests { inherit callPackage; }; ··· 79 65 80 66 src = fetchurl { 81 67 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 82 - hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8="; 68 + hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM="; 83 69 }; 84 70 85 71 nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; ··· 97 83 lapack 98 84 libxcrypt 99 85 libxml2 100 - _llvm_9 86 + llvm_13 101 87 lz4 102 88 xz 103 89 gsl 90 + gtest 104 91 openblas 105 92 openssl 106 93 xxHash ··· 122 109 123 110 patches = [ 124 111 ./sw_vers.patch 125 - ] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [ 126 - # Fix build against Python 3.11 127 - (fetchpatch { 128 - url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch"; 129 - hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s="; 130 - }) 131 112 ]; 132 113 133 - # Fix build against vanilla LLVM 9 134 - postPatch = '' 135 - sed \ 136 - -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \ 137 - -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \ 138 - -i interpreter/cling/lib/Interpreter/IncrementalJIT.h 139 - ''; 140 - 141 114 preConfigure = '' 142 115 rm -rf builtins/* 143 116 substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ 144 117 --replace 'set(lcgpackages ' '#set(lcgpackages ' 118 + 119 + substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \ 120 + --replace 'add_clang_symlink(''${link} clang)' "" 145 121 146 122 # Don't require textutil on macOS 147 123 : > cmake/modules/RootCPack.cmake ··· 167 143 "-DCMAKE_INSTALL_LIBDIR=lib" 168 144 "-DCMAKE_INSTALL_INCLUDEDIR=include" 169 145 "-Dbuiltin_llvm=OFF" 146 + "-Dbuiltin_freetype=OFF" 147 + "-Dbuiltin_gtest=OFF" 170 148 "-Dbuiltin_nlohmannjson=OFF" 171 149 "-Dbuiltin_openui5=OFF" 172 150 "-Dalien=OFF" ··· 240 218 # but it also need to support Bash-less POSIX shell like dash, 241 219 # as they are mentioned in `thisroot.sh`. 242 220 243 - # `thisroot.sh` would include commands `lsof` and `procps` since ROOT 6.28. 244 - # See https://github.com/root-project/root/pull/10332 245 - 246 221 patchRcPathPosix "$out/bin/thisroot.sh" "${lib.makeBinPath [ 247 222 coreutils # dirname tail 248 223 gnugrep # grep 249 224 gnused # sed 250 - lsof # lsof # for ROOT (>=6.28) 225 + lsof # lsof 251 226 man # manpath 252 - procps # ps # for ROOT (>=6.28) 227 + procps # ps 253 228 which # which 254 229 ]}" 255 230 patchRcPathCsh "$out/bin/thisroot.csh" "${lib.makeBinPath [ 256 231 coreutils 257 232 gnugrep 258 233 gnused 259 - lsof # lsof # for ROOT (>=6.28) 234 + lsof # lsof 260 235 man 261 236 which 262 237 ]}"