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 , lib 3 , callPackage 4 , fetchurl 5 - , fetchpatch 6 , makeWrapper 7 , cmake 8 , coreutils ··· 14 , gnugrep 15 , gnused 16 , gsl 17 , lapack 18 , libX11 19 , libXpm ··· 23 , libGL 24 , libxcrypt 25 , libxml2 26 - , llvm_9 27 , lsof 28 , lz4 29 , xz ··· 55 , noSplash ? false 56 }: 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 stdenv.mkDerivation rec { 73 pname = "root"; 74 - version = "6.26.10"; 75 76 passthru = { 77 tests = import ./tests { inherit callPackage; }; ··· 79 80 src = fetchurl { 81 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 82 - hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8="; 83 }; 84 85 nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; ··· 97 lapack 98 libxcrypt 99 libxml2 100 - _llvm_9 101 lz4 102 xz 103 gsl 104 openblas 105 openssl 106 xxHash ··· 122 123 patches = [ 124 ./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 ]; 132 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 preConfigure = '' 142 rm -rf builtins/* 143 substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ 144 --replace 'set(lcgpackages ' '#set(lcgpackages ' 145 146 # Don't require textutil on macOS 147 : > cmake/modules/RootCPack.cmake ··· 167 "-DCMAKE_INSTALL_LIBDIR=lib" 168 "-DCMAKE_INSTALL_INCLUDEDIR=include" 169 "-Dbuiltin_llvm=OFF" 170 "-Dbuiltin_nlohmannjson=OFF" 171 "-Dbuiltin_openui5=OFF" 172 "-Dalien=OFF" ··· 240 # but it also need to support Bash-less POSIX shell like dash, 241 # as they are mentioned in `thisroot.sh`. 242 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 patchRcPathPosix "$out/bin/thisroot.sh" "${lib.makeBinPath [ 247 coreutils # dirname tail 248 gnugrep # grep 249 gnused # sed 250 - lsof # lsof # for ROOT (>=6.28) 251 man # manpath 252 - procps # ps # for ROOT (>=6.28) 253 which # which 254 ]}" 255 patchRcPathCsh "$out/bin/thisroot.csh" "${lib.makeBinPath [ 256 coreutils 257 gnugrep 258 gnused 259 - lsof # lsof # for ROOT (>=6.28) 260 man 261 which 262 ]}"
··· 2 , lib 3 , callPackage 4 , fetchurl 5 , makeWrapper 6 , cmake 7 , coreutils ··· 13 , gnugrep 14 , gnused 15 , gsl 16 + , gtest 17 , lapack 18 , libX11 19 , libXpm ··· 23 , libGL 24 , libxcrypt 25 , libxml2 26 + , llvm_13 27 , lsof 28 , lz4 29 , xz ··· 55 , noSplash ? false 56 }: 57 58 stdenv.mkDerivation rec { 59 pname = "root"; 60 + version = "6.28.06"; 61 62 passthru = { 63 tests = import ./tests { inherit callPackage; }; ··· 65 66 src = fetchurl { 67 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 68 + hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM="; 69 }; 70 71 nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; ··· 83 lapack 84 libxcrypt 85 libxml2 86 + llvm_13 87 lz4 88 xz 89 gsl 90 + gtest 91 openblas 92 openssl 93 xxHash ··· 109 110 patches = [ 111 ./sw_vers.patch 112 ]; 113 114 preConfigure = '' 115 rm -rf builtins/* 116 substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ 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)' "" 121 122 # Don't require textutil on macOS 123 : > cmake/modules/RootCPack.cmake ··· 143 "-DCMAKE_INSTALL_LIBDIR=lib" 144 "-DCMAKE_INSTALL_INCLUDEDIR=include" 145 "-Dbuiltin_llvm=OFF" 146 + "-Dbuiltin_freetype=OFF" 147 + "-Dbuiltin_gtest=OFF" 148 "-Dbuiltin_nlohmannjson=OFF" 149 "-Dbuiltin_openui5=OFF" 150 "-Dalien=OFF" ··· 218 # but it also need to support Bash-less POSIX shell like dash, 219 # as they are mentioned in `thisroot.sh`. 220 221 patchRcPathPosix "$out/bin/thisroot.sh" "${lib.makeBinPath [ 222 coreutils # dirname tail 223 gnugrep # grep 224 gnused # sed 225 + lsof # lsof 226 man # manpath 227 + procps # ps 228 which # which 229 ]}" 230 patchRcPathCsh "$out/bin/thisroot.csh" "${lib.makeBinPath [ 231 coreutils 232 gnugrep 233 gnused 234 + lsof # lsof 235 man 236 which 237 ]}"