epics-base: 7.0.7 -> 7.0.8

epics-extensions · Feb 1, 2024 · 1a2add3 · 1a2add3
1 parent c28af75
commit 1a2add3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -13,8 +13,8 @@ in
       # EPICS base
 
       epics-base7 = callPackage ./epnix/epics-base {
-        version = "7.0.7";
-        hash = "sha256-VMiuwTuPykoMLcIphUAsjtLQZ8HLKr3LvGpje3lsIXc=";
+        version = "7.0.8";
+        hash = "sha256-GEkUwlOkRhQ6LskxHV+eDvBe9UUzF2YWWmgiyuiHypM=";
       };
       epics-base3 = callPackage ./epnix/epics-base {
         version = "3.15.9";

diff --git a/pkgs/epnix/epics-base/default.nix b/pkgs/epnix/epics-base/default.nix
@@ -37,19 +37,11 @@ in
       inherit hash;
     };
 
-    patches =
-      (optionals (atLeast "7.0.0") [
-        # From: https://github.com/epics-base/epics-base/pull/395
-        (fetchpatch {
-          url = "https://github.com/epics-base/epics-base/commit/d87fd0db0124faf450cff93226ae6a2cc02f02bf.patch";
-          hash = "sha256-BQWFOPCfRjSowDSAbqe8ClqEWT1OtfbgRh4k5jmAjpU=";
-        })
-      ])
-      ++ (optionals (older "7.0.5") [
-        # Support "undefine MYVAR" in convertRelease.pl
-        # Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6
-        ./handle-make-undefine-variable.patch
-      ]);
+    patches = optionals (older "7.0.5") [
+      # Support "undefine MYVAR" in convertRelease.pl
+      # Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6
+      ./handle-make-undefine-variable.patch
+    ];
 
     # "build" as in Nix terminology (the build machine)
     build_config_site =