Merge pull request #212 from vivienCEA/feat-update-mrfioc2-support

support.mrfioc2: 2.6.0 -> 2.7.1
epics-extensions · Dec 10, 2024 · 7c3a41a · 7c3a41a
2 parents ab5f0e3 + 22dbd31
commit 7c3a41a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/pkgs/epnix/kernel-modules/mrf/default.nix b/pkgs/epnix/kernel-modules/mrf/default.nix
@@ -9,15 +9,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit (epnix.support.mrfioc2) version src;
 
-  patches = [
-    (fetchpatch {
-      name = "use-vm_flags_set-on-kernels-6-3.patch";
-      url = "https://github.com/epics-modules/mrfioc2/commit/64634a23a035d336de5d720b2e1ecafcc918d737.patch";
-      hash = "sha256-6/obmLfLKfhcwn12O0KKpogWCzg7Evs1kIoNm0x7Puw=";
-      stripLen = 2;
-    })
-  ];
-
   # Needed for kernel modules
   hardeningDisable = ["format" "pic"];
 

diff --git a/pkgs/epnix/support/mrfioc2/default.nix b/pkgs/epnix/support/mrfioc2/default.nix
@@ -10,7 +10,7 @@
 }:
 mkEpicsPackage rec {
   pname = "mrfioc2";
-  version = "2.6.0";
+  version = "2.7.1";
   varname = "MRFIOC2";
 
   inherit local_config_site local_release;
@@ -19,7 +19,7 @@ mkEpicsPackage rec {
     owner = "epics-modules";
     repo = "mrfioc2";
     rev = version;
-    sha256 = "sha256-pmuM4HrHlZ63BcZACZOlMAPic1IOQ/kLpi9lo/raP0U=";
+    sha256 = "sha256-zK+cCWK9oOTH+NvCO0GiWKkwmtQYXvUuONSIV55pY1Y=";
   };
 
   propagatedBuildInputs = with epnix.support; [devlib2];