acts: 21.1.0 -> 30.3.2, eicrecon: 1.5.1 -> 1.8.0

flake.nix

@@ -10,7 +10,7 @@
 
   # define source repositories as flake inputs to enable overrides from CLI
   inputs.acts-src = {
-    url = "github:acts-project/acts/v21.1.0";
+    url = "github:acts-project/acts/v30.3.2";
     flake = false;
   };
   inputs.algorithms-src = {
@@ -34,7 +34,7 @@
     flake = false;
   };
   inputs.eicrecon-src = {
-    url = "github:eic/EICrecon/v1.5.1";
+    url = "github:eic/EICrecon/v1.8.0";
     flake = false;
   };
   inputs.jana2-src = {

pkgs/acts/default.nix

@@ -12,10 +12,19 @@
 
 stdenv.mkDerivation (self: with self; {
   pname = "acts";
-  version = "21.1.0.${acts-src.shortRev or "dirty"}";
+  version = "30.3.2.${acts-src.shortRev or "dirty"}";
 
   src = acts-src;
 
+  postPatch = ''
+    sed -i Core/include/Acts/Seeding/SeedFinderConfig.hpp -e '1i#include <vector>'
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Core/include/Acts/Propagator/ConstrainedStep.hpp \
+      --replace "constexpr" ""
+    substituteInPlace Fatras/include/ActsFatras/EventData/Particle.hpp \
+      --replace "constexpr" ""
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
@@ -44,6 +53,7 @@ stdenv.mkDerivation (self: with self; {
     "-DACTS_USE_SYSTEM_EIGEN3=ON"
     "-DACTS_USE_SYSTEM_NLOHMANN_JSON=ON"
     "-DFETCHCONTENT_SOURCE_DIR_DFELIBS=${dfelibs}"
+    "-DPython_FIND_FRAMEWORK=NEVER" # fix for missing sandboxing on GitHub actions
   ];
 
   meta = with lib; {

pkgs/eicrecon/default.nix

@@ -34,7 +34,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "EICrecon";
-  version = "1.5.1.${eicrecon-src.shortRev or "dirty"}";
+  version = "1.8.0.${eicrecon-src.shortRev or "dirty"}";
 
   src = eicrecon-src;
 
@@ -47,6 +47,10 @@ stdenv.mkDerivation rec {
       --replace 'std::dynamic_pointer_cast' 'std::static_pointer_cast'
     substituteInPlace src/algorithms/tracking/IterativeVertexFinder.cc \
       --replace 'std::dynamic_pointer_cast' 'std::static_pointer_cast'
+
+    substituteInPlace cmake/jana_plugin.cmake \
+      --replace 'libActsExamplesFramework.so' \
+                '${"$"}{CMAKE_SHARED_LIBRARY_PREFIX}ActsExamplesFramework${"$"}{CMAKE_SHARED_LIBRARY_SUFFIX}'
   '';
 
   nativeBuildInputs = [

pkgs/fun4all/default.nix

@@ -151,6 +151,8 @@ let
         hash = "sha256-8TYw6XZfSmJ1v1WlMI2eY8t/fO5+exPwM999qziPa6Q=";
       };
 
+      postPatch = ":";
+
       buildInputs = [
         boost
         tbb
@@ -159,7 +161,6 @@ let
       ];
 
       cmakeFlags = prev.cmakeFlags ++ [
-        "-DACTS_BUILD_EXAMPLES=ON"
         "-DACTS_BUILD_PLUGIN_DD4HEP=OFF"
       ];
     });

pkgs/juggler/default.nix

@@ -16,18 +16,20 @@
 
 stdenv.mkDerivation rec {
   pname = "juggler";
-  version = "10.1.0";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "eic";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-HeLOQAsR7xgn2dfkTGBVf5EYgbfpa5yz/8K5PheKHRY=";
+    hash = "sha256-OzVRVirSVQIn9xuQTo2Gk4nqI1geBiojUow2PDJvCrs=";
   };
 
-  patches = [
-    ./podio_00_17.patch
-  ];
+  postPatch = ''
+    substituteInPlace JugTrack/CMakeLists.txt \
+      --replace 'libActsExamplesFramework.so' \
+                '${"$"}{CMAKE_SHARED_LIBRARY_PREFIX}ActsExamplesFramework${"$"}{CMAKE_SHARED_LIBRARY_SUFFIX}'
+  '';
 
   nativeBuildInputs = [
     cmake