Merge pull request #222 from veprbl/pr/nixpkgs_24_11

flake.lock: bump nixpkgs to 24.11

flake.nix

@@ -38,7 +38,7 @@
     flake = false;
   };
   inputs.geant4-src = {
-    url = "https://cern.ch/geant4-data/releases/geant4-v11.1.3.tar.gz";
+    url = "https://cern.ch/geant4-data/releases/geant4-v11.2.2.tar.gz";
     flake = false;
   };
   inputs.jana2-src = {

overlay.nix

@@ -46,12 +46,6 @@ final: prev: with final; {
 
   eic-smear = callPackage pkgs/eic-smear {};
 
-  fastjet = prev.fastjet.overrideAttrs (prev: {
-    configureFlags = prev.configureFlags ++ [
-      "--enable-auto-ptr=no"
-    ];
-  });
-
   # Required by a recent EICrecon
   fmt = if final.lib.versionOlder prev.fmt.version "9" then fmt_9 else prev.fmt;
   # Also update an input hardcoded in nixpkgs' spdlog (it switched to fmt
@@ -145,7 +139,8 @@ final: prev: with final; {
       # https://github.com/AIDASoft/podio/issues/367
       "-Dimt=OFF"
     ];
-    NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${./pkgs/root/version.map}";
+    env.NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${./pkgs/root/version.map}";
+    env.CXXFLAGS = lib.optionalString stdenv.isDarwin "-faligned-allocation";
     preConfigure = builtins.replaceStrings [ "rm -rf builtins/*" ] [ "" ] prev.preConfigure;
     buildInputs  = prev.buildInputs ++ [
       openssl
@@ -200,15 +195,13 @@ final: prev: with final; {
   });
 
   opencascade-occt = prev.opencascade-occt.overrideAttrs (old:
-    final.lib.optionalAttrs (final.lib.versionOlder prev.opencascade-occt.version "7.7.2") rec {
-      version = "7.7.2";
-      commit = "V${builtins.replaceStrings ["."] ["_"] version}";
-
-      src = fetchurl {
-        name = "occt-${commit}.tar.gz";
-        url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
-        hash = "sha256-M0G/pJuxsJu5gRk0rIgC173/XxI1ERpmCtWjgr/0dyY=";
-      };
+    final.lib.optionalAttrs ((final.lib.versionOlder prev.opencascade-occt.version "7.8.2") && (prev.opencascade-occt.patches or [] == [])) rec {
+      patches = [
+        (final.fetchpatch {
+          url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.diff";
+          hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
+        })
+      ];
     }
   );
 

pkgs/dd4hep/default.nix

@@ -9,7 +9,7 @@
 , edm4hep
 , geant4
 , hepmc3
-, lzma
+, xz
 , zlib
 , gnugrep
 , python3
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     edm4hep
     geant4
     hepmc3
-    lzma
+    xz
     zlib
   ];
   propagatedBuildInputs = [

pkgs/fun4all/default.nix

@@ -449,9 +449,10 @@ sphenix_packages = with extra_deps; let geant4 = extra_deps.geant4_10_6_2; in en
       # resolve include for g4main (possibly others)
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $PWD/simulation/g4simulation"
 
-      #      # resolve include for intt (possibly others)
-      #      export ROOT_INCLUDE_PATH=$ROOT_INCLUDE_PATH:$PWD/offline/packages
-      #      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $PWD/offline/packages"
+      substituteInPlace offline/packages/trackreco/PHMicromegasTpcTrackMatching.cc \
+        --replace "!isfinite" "!std::isfinite"
+      substituteInPlace offline/packages/trackreco/PHTpcTrackSeedCircleFit.cc \
+        --replace "!isfinite" "!std::isfinite"
 
       substituteInPlace offline/packages/trackreco/ActsEvaluator.cc \
         --replace "trackKeyMap = m_actsTrackKeyMap->find(trackKey)->second;" \
@@ -623,6 +624,10 @@ sphenix_packages = with extra_deps; let geant4 = extra_deps.geant4_10_6_2; in en
   simulation.g4simulation.g4eicdirc = mk_path_eicdetectors "simulation/g4simulation/g4eicdirc" {
     buildInputs = [ offline.database.PHParameter offline.framework.fun4all offline.framework.phool simulation.g4simulation.g4detectors simulation.g4simulation.g4main ];
     env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=overloaded-virtual";
+    postPatch = ''
+      substituteInPlace simulation/g4simulation/g4eicdirc/G4EicDircSteppingAction.cc \
+        --replace "!isfinite" "!std::isfinite"
+    '';
   };
   simulation.g4simulation.g4etof = mk_path_eicdetectors "simulation/g4simulation/g4etof" {
     buildInputs = [ boost offline.database.PHParameter offline.framework.fun4all offline.framework.phool offline.packages.trackbase_historic simulation.g4simulation.g4detectors simulation.g4simulation.g4main ];
@@ -659,6 +664,12 @@ sphenix_packages = with extra_deps; let geant4 = extra_deps.geant4_10_6_2; in en
 
   FastPID = mk_path_ecce-detectors "FastPID" {
     buildInputs = [ offline.framework.fun4all offline.framework.phool offline.packages.trackbase offline.packages.trackbase_historic offline.packages.trackreco reconstruction.eicpidbase simulation.g4simulation.g4detectors simulation.g4simulation.g4main ];
+    postPatch = ''
+      substituteInPlace FastPID/ECCEhpDIRCFastPIDMap.cc \
+        --replace "(isnan" "(std::isnan"
+      substituteInPlace FastPID/ECCEmRICHFastPIDMap.cc \
+        --replace "(isnan" "(std::isnan"
+    '';
   };
 
   combined = symlinkJoin {

pkgs/gaudi/default.nix

@@ -16,6 +16,7 @@
 , libuuid
 , makeWrapper
 , microsoft_gsl
+, nlohmann_json
 , pkg-config
 , python3
 , range-v3
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
     jemalloc
     libuuid
     microsoft_gsl
+    nlohmann_json
     range-v3
     tbb
     xercesc

pkgs/podio/default.nix

@@ -53,16 +53,6 @@ stdenv.mkDerivation rec {
     substituteInPlace cmake/podioBuild.cmake \
       --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "" \
       --replace 'set(CMAKE_INSTALL_RPATH "@loader_path/../lib")' ""
-
-    # AttributeError: <class cppyy.gbl.tuple_element<1,tuple<int,float,string,double> > at 0x...> has no attribute 'type'. Full details:
-    #   type object 'tuple_element<1,tuple<int,float,string,double> >' has no attribute 'type'
-    #   'tuple_element<1,tuple<int,float,string,double> >::type' is not a known C++ class
-    #   'type' is not a known C++ template
-    #   'type' is not a known C++ enum
-    substituteInPlace \
-      --replace "cpp_type = cppyy.gbl.std.tuple_element[idx, podio.SupportedGenericDataTypes].type" "" \
-      --replace 'if cppyy.typeid(cpp_type).name() == "d":' "if idx == 3:" \
-      --replace "if cppyy.typeid(cpp_type).name() == 'd':" "if idx == 3:"
   '';
 
   preConfigure = ''