commit de24042fede2b49d4e5f3882d751dc79bfc40778 · pyrox.dev/nixpkgs

+21 -34

pkgs/by-name/ro/root/package.nix

··· 27 27 libGL, 28 28 libxcrypt, 29 29 libxml2, 30 - llvm_16, 30 + llvm_18, 31 31 lsof, 32 32 lz4, 33 33 xz, ··· 56 56 57 57 stdenv.mkDerivation rec { 58 58 pname = "root"; 59 - version = "6.32.08"; 59 + version = "6.34.00"; 60 60 61 61 passthru = { 62 62 tests = import ./tests { inherit callPackage; }; ··· 64 64 65 65 src = fetchurl { 66 66 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 67 - hash = "sha256-Ka1JRact/xoAnDJqZbb6XuJHhJiCMlHTzvhqLL63eyc="; 67 + hash = "sha256-87APPblTgpyEkCnDnXZgqVZGivJH79lG6JByEBeWqwM="; 68 68 }; 69 69 70 70 clad_src = fetchgit { ··· 81 81 pkg-config 82 82 git 83 83 ]; 84 - propagatedBuildInputs = [ nlohmann_json ]; 85 84 buildInputs = 86 85 [ 87 86 davix 88 87 ftgl 88 + giflib 89 89 gl2ps 90 90 glew 91 - pcre 92 - zlib 93 - zstd 91 + gsl 92 + gtest 94 93 lapack 94 + libjpeg 95 + libpng 96 + libtiff 95 97 libxcrypt 96 98 libxml2 97 - llvm_16 99 + llvm_18 98 100 lz4 99 - xz 100 - gsl 101 - gtest 101 + nlohmann_json 102 102 openblas 103 103 openssl 104 - xxHash 105 - giflib 106 - libjpeg 107 - libtiff 108 - libpng 109 104 patchRcPathCsh 110 105 patchRcPathFish 111 106 patchRcPathPosix 107 + pcre 112 108 python3.pkgs.numpy 113 109 tbb 114 110 xrootd 111 + xxHash 112 + xz 113 + zlib 114 + zstd 115 115 ] 116 116 ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ] 117 117 ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ··· 123 123 libGL 124 124 ]; 125 125 126 - patches = [ ./sw_vers.patch ]; 127 - 128 126 preConfigure = 129 127 '' 130 128 for path in builtins/*; do ··· 135 133 substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ 136 134 --replace-fail 'set(lcgpackages ' '#set(lcgpackages ' 137 135 138 - # We have to bypass the connection check, because it would disable clad. 139 - # This should probably be fixed upstream with a flag to disable the 140 - # connectivity check! 141 - substituteInPlace CMakeLists.txt \ 142 - --replace-fail 'if(clad AND NO_CONNECTION)' 'if(FALSE)' 143 136 # Make sure that clad is not downloaded when building 144 137 substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ 145 - --replace-fail 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' 138 + --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' 146 139 # Make sure that clad is finding the right llvm version 147 140 substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ 148 - --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' 141 + --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}' 149 142 150 143 substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ 151 144 --replace-fail 'add_clang_symlink(''${link} clang)' "" 152 145 153 - # Don't require textutil on macOS 154 - : > cmake/modules/RootCPack.cmake 155 - 156 - # Hardcode path to fix use with cmake 157 - sed -i cmake/scripts/ROOTConfig.cmake.in \ 158 - -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' 159 - 160 - patchShebangs build/unix/ 146 + patchShebangs cmake/unix/ 161 147 '' 162 148 + lib.optionalString stdenv.hostPlatform.isDarwin '' 163 149 # Eliminate impure reference to /System/Library/PrivateFrameworks ··· 173 159 174 160 cmakeFlags = 175 161 [ 162 + "-DCLAD_SOURCE_DIR=${clad_src}" 176 163 "-DCMAKE_INSTALL_BINDIR=bin" 164 + "-DCMAKE_INSTALL_INCLUDEDIR=include" 177 165 "-DCMAKE_INSTALL_LIBDIR=lib" 178 - "-DCMAKE_INSTALL_INCLUDEDIR=include" 179 166 "-Dbuiltin_llvm=OFF" 180 167 "-Dfail-on-missing=ON" 181 168 "-Dfitsio=OFF"

-8

pkgs/by-name/ro/root/setup-hook.sh

··· 1 1 thisroot () { 2 - # Workaround thisroot.sh dependency on man 3 - if [ -z "${MANPATH-}" ]; then 4 - MANPATH=: 5 - fi 6 - local oldOpts="-u" 7 - shopt -qo nounset || oldOpts="+u" 8 - set +u 9 2 source @out@/bin/thisroot.sh 10 - set "$oldOpts" 11 3 } 12 4 13 5 postHooks+=(thisroot)

-86

pkgs/by-name/ro/root/sw_vers.patch

··· 1 - diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake 2 - --- a/cmake/modules/SetUpMacOS.cmake 3 - +++ b/cmake/modules/SetUpMacOS.cmake 4 - @@ -8,17 +8,10 @@ 5 - set(ROOT_PLATFORM macosx) 6 - 7 - if (CMAKE_SYSTEM_NAME MATCHES Darwin) 8 - - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" 9 - - COMMAND cut -d . -f 1-2 10 - - OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) 11 - - 12 - MESSAGE(STATUS "Found a macOS system ${MACOSX_VERSION}") 13 - 14 - - if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) 15 - set(libcxx ON CACHE BOOL "Build using libc++" FORCE) 16 - - endif() 17 - 18 - - if(MACOSX_VERSION VERSION_GREATER 10.4) 19 - #TODO: check haveconfig and rpath -> set rpath true 20 - #TODO: check Thread, define link command 21 - #TODO: more stuff check configure script 22 - @@ -37,22 +30,7 @@ 23 - SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64") 24 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") 25 - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") 26 - - else() 27 - - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") 28 - - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") 29 - - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") 30 - endif() 31 - - endif() 32 - - 33 - - if(MACOSX_VERSION VERSION_GREATER 10.6) 34 - - set(MACOSX_SSL_DEPRECATED ON) 35 - - endif() 36 - - if(MACOSX_VERSION VERSION_GREATER 10.7) 37 - - set(MACOSX_ODBC_DEPRECATED ON) 38 - - endif() 39 - - if(MACOSX_VERSION VERSION_GREATER 10.8) 40 - - set(MACOSX_GLU_DEPRECATED ON) 41 - - endif() 42 - 43 - if (CMAKE_COMPILER_IS_GNUCXX) 44 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common") 45 - @@ -96,7 +74,6 @@ 46 - endif() 47 - 48 - #---Set Linker flags---------------------------------------------------------------------- 49 - - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}") 50 - else (CMAKE_SYSTEM_NAME MATCHES Darwin) 51 - MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.") 52 - endif (CMAKE_SYSTEM_NAME MATCHES Darwin) 53 - diff a/config/root-config.in b/config/root-config.in 54 - --- a/config/root-config.in 55 - +++ b/config/root-config.in 56 - @@ -307,12 +307,6 @@ 57 - ;; 58 - macosx64|macosxarm64) 59 - # MacOS X with gcc (GNU cc v4.x) in 64 bit mode 60 - - macosx_major=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1 | sed -e 's/^[[:space:]]*//'` 61 - - macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` 62 - - # cannot find the one linked to libGraf if relocated after built 63 - - if [ $macosx_major -eq 10 -a $macosx_minor -le 4 ]; then 64 - - rootlibs="$rootlibs -lfreetype" 65 - - fi 66 - auxcflags="${cxxversionflag} -m64" 67 - auxldflags="-m64" 68 - auxlibs="-lm -ldl" 69 - @@ -387,17 +381,11 @@ 70 - done 71 - ;; 72 - macosx*) 73 - - if [ $ $macosx_major -eq 10 -a $macosx_minor -ge 5 $ -o $macosx_major -gt 10 ]; then 74 - auxcflags="-pthread $auxcflags" 75 - auxlibs="-lpthread $auxlibs" 76 - - else 77 - - auxlibs="-lpthread $auxlibs" 78 - - fi 79 - for f in $features ; do 80 - if test "x$f" = "xrpath" ; then 81 - - if [ $ $macosx_major -eq 10 -a $macosx_minor -ge 5 $ -o $macosx_major -gt 10 ]; then 82 - auxlibs="-Wl,-rpath,$libdir $auxlibs" 83 - - fi 84 - fi 85 - if test "x$f" = "xlibcxx" ; then 86 - auxcflags="-stdlib=libc++ $auxcflags"