root: 6.32.08 -> 6.34.00

Also, remove many patches and workarounds that are not necessary
anymore.

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

@@ -27,7 +27,7 @@
   libGL,
   libxcrypt,
   libxml2,
-  llvm_16,
+  llvm_18,
   lsof,
   lz4,
   xz,
@@ -56,15 +56,15 @@
 
 stdenv.mkDerivation rec {
   pname = "root";
-  version = "6.32.08";
+  version = "6.34.00";
 
   passthru = {
     tests = import ./tests { inherit callPackage; };
   };
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    hash = "sha256-Ka1JRact/xoAnDJqZbb6XuJHhJiCMlHTzvhqLL63eyc=";
+    hash = "sha256-87APPblTgpyEkCnDnXZgqVZGivJH79lG6JByEBeWqwM=";
   };
 
   clad_src = fetchgit {
@@ -81,37 +81,37 @@ stdenv.mkDerivation rec {
     pkg-config
     git
   ];
-  propagatedBuildInputs = [ nlohmann_json ];
   buildInputs =
     [
       davix
       ftgl
+      giflib
       gl2ps
       glew
-      pcre
-      zlib
-      zstd
+      gsl
+      gtest
       lapack
+      libjpeg
+      libpng
+      libtiff
       libxcrypt
       libxml2
-      llvm_16
+      llvm_18
       lz4
-      xz
-      gsl
-      gtest
+      nlohmann_json
       openblas
       openssl
-      xxHash
-      giflib
-      libjpeg
-      libtiff
-      libpng
       patchRcPathCsh
       patchRcPathFish
       patchRcPathPosix
+      pcre
       python3.pkgs.numpy
       tbb
       xrootd
+      xxHash
+      xz
+      zlib
+      zstd
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
@@ -123,8 +123,6 @@ stdenv.mkDerivation rec {
       libGL
     ];
 
-  patches = [ ./sw_vers.patch ];
-
   preConfigure =
     ''
       for path in builtins/*; do
@@ -135,29 +133,17 @@ stdenv.mkDerivation rec {
       substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
         --replace-fail 'set(lcgpackages ' '#set(lcgpackages '
 
-      # We have to bypass the connection check, because it would disable clad.
-      # This should probably be fixed upstream with a flag to disable the
-      # connectivity check!
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'if(clad AND NO_CONNECTION)' 'if(FALSE)'
       # Make sure that clad is not downloaded when building
       substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
-        --replace-fail 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
+        --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
       # Make sure that clad is finding the right llvm version
       substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
-        --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm'
+        --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}'
 
       substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
         --replace-fail 'add_clang_symlink(''${link} clang)' ""
 
-      # Don't require textutil on macOS
-      : > cmake/modules/RootCPack.cmake
-
-      # Hardcode path to fix use with cmake
-      sed -i cmake/scripts/ROOTConfig.cmake.in \
-        -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
-
-      patchShebangs build/unix/
+      patchShebangs cmake/unix/
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # Eliminate impure reference to /System/Library/PrivateFrameworks
@@ -173,9 +159,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags =
     [
+      "-DCLAD_SOURCE_DIR=${clad_src}"
       "-DCMAKE_INSTALL_BINDIR=bin"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
       "-DCMAKE_INSTALL_INCLUDEDIR=include"
+      "-DCMAKE_INSTALL_LIBDIR=lib"
       "-Dbuiltin_llvm=OFF"
       "-Dfail-on-missing=ON"
       "-Dfitsio=OFF"

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

@@ -1,13 +1,5 @@
 thisroot () {
-    # Workaround thisroot.sh dependency on man
-    if [ -z "${MANPATH-}" ]; then
-        MANPATH=:
-    fi
-    local oldOpts="-u"
-    shopt -qo nounset || oldOpts="+u"
-    set +u
     source @out@/bin/thisroot.sh
-    set "$oldOpts"
 }
 
 postHooks+=(thisroot)