Merge pull request #197 from veprbl/pr/dd4hep_01_30

dd4hep: 01-29 -> 01-30
veprbl · Sep 12, 2024 · 99a43c3 · 99a43c3
2 parents 7108dc7 + ece8510
commit 99a43c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -18,7 +18,7 @@
     flake = false;
   };
   inputs.dd4hep-src = {
-    url = "github:AIDASoft/DD4hep/v01-29";
+    url = "github:AIDASoft/DD4hep/v01-30";
     flake = false;
   };
   inputs.edm4eic-src = {

diff --git a/pkgs/dd4hep/default.nix b/pkgs/dd4hep/default.nix
@@ -20,18 +20,10 @@
 
 stdenv.mkDerivation rec {
   pname = "DD4hep";
-  version = "01-29.${dd4hep-src.shortRev or "dirty"}";
+  version = "01-30.${dd4hep-src.shortRev or "dirty"}";
 
   src = dd4hep-src;
 
-  patches = [
-    # add support for CylindricalGridPhiZ
-    (fetchpatch {
-      url = "https://github.com/AIDASoft/DD4hep/pull/1294.diff";
-      hash = "sha256-NKiibvVdSuMlB3ELA5ll7xT+avzQ0+hRvkPxV8wJGbs=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs --host .