From 9d1cab843c69c7e05214cea1ad9ab100c97b3d2b Mon Sep 17 00:00:00 2001
From: Alexis Gaget <alexis.gaget@cea.fr>
Date: Wed, 14 Feb 2024 11:29:04 +0100
Subject: [PATCH] resolve conflict

---
 lib/maintainers/maintainer-list.nix    |  4 +++
 pkgs/default.nix                       |  2 ++
 pkgs/epnix/support/devlib2/default.nix | 31 +++++++++++++++++++
 pkgs/epnix/support/mrfioc2/default.nix | 41 ++++++++++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 pkgs/epnix/support/devlib2/default.nix
 create mode 100644 pkgs/epnix/support/mrfioc2/default.nix

diff --git a/lib/maintainers/maintainer-list.nix b/lib/maintainers/maintainer-list.nix
index 0061c4fb..a324399d 100644
--- a/lib/maintainers/maintainer-list.nix
+++ b/lib/maintainers/maintainer-list.nix
@@ -62,4 +62,8 @@ See `<nixpkgs/maintainers/scripts/check-maintainer-github-handles.sh>` for an ex
     email = "stephane.tzvetkov@cea.fr";
     name = "Stéphane Tzvetkov";
   };
+  agaget = {
+    email = "alexis.gaget@cea.fr";
+    name = "Alexis Gaget";
+  };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 54a8b087..adf63a10 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -28,9 +28,11 @@ in
         asyn = callPackage ./epnix/support/asyn {};
         autosave = callPackage ./epnix/support/autosave {};
         calc = callPackage ./epnix/support/calc {};
+        devlib2 = callPackage ./epnix/support/devlib2 {};
         epics-systemd = callPackage ./epnix/support/epics-systemd {};
         ipac = callPackage ./epnix/support/ipac {};
         modbus = callPackage ./epnix/support/modbus {};
+        mrfioc2 = callPackage ./epnix/support/mrfioc2 {};
         pvxs = callPackage ./epnix/support/pvxs {};
         seq = callPackage ./epnix/support/seq {};
         snmp = callPackage ./epnix/support/snmp {};
diff --git a/pkgs/epnix/support/devlib2/default.nix b/pkgs/epnix/support/devlib2/default.nix
new file mode 100644
index 00000000..08fddfde
--- /dev/null
+++ b/pkgs/epnix/support/devlib2/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  epnixLib,
+  mkEpicsPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  local_config_site ? {},
+  local_release ? {},
+}:
+mkEpicsPackage rec {
+  pname = "devlib2";
+  version = "2.12";
+  varname = "DEVLIB2";
+  doCheck = false;
+
+  inherit local_config_site local_release;
+
+  src = fetchFromGitHub {
+    owner = "epics-modules";
+    repo = "devlib2";
+    rev = version;
+    sha256 = "sha256-5rjilz+FO6ZM+Hn7AVwyFG2WWBoBUQA4WW5OHhhdXw4=";
+  };
+
+  meta = {
+    description = "devLib2 - Library for direct MMIO access to PCI and VME64x";
+    homepage = "https://github.com/epics-modules/devlib2";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with epnixLib.maintainers; [agaget];
+  };
+}
diff --git a/pkgs/epnix/support/mrfioc2/default.nix b/pkgs/epnix/support/mrfioc2/default.nix
new file mode 100644
index 00000000..941b4a59
--- /dev/null
+++ b/pkgs/epnix/support/mrfioc2/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  epnix,
+  epnixLib,
+  mkEpicsPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  local_config_site ? {},
+  local_release ? {},
+}:
+mkEpicsPackage rec {
+  pname = "mrfioc2";
+  version = "2.6.0";
+  varname = "MRFIOC2";
+  doCheck = false;
+
+  inherit local_config_site local_release;
+
+  src = fetchFromGitHub {
+    owner = "epics-modules";
+    repo = "mrfioc2";
+    rev = version;
+    sha256 = "sha256-pmuM4HrHlZ63BcZACZOlMAPic1IOQ/kLpi9lo/raP0U=";
+  };
+
+  propagatedBuildInputs = with epnix.support; [devlib2];
+
+  meta = {
+    description = "Driver EPICS for MRF cards";
+    homepage = "https://github.com/epics-modules/mrfioc2";
+    license = epnixLib.licenses.epics;
+    maintainers = with epnixLib.maintainers; [agaget];
+  };
+
+  postInstall = ''
+    if [[ -d iocBoot ]]; then
+      cp -rafv iocBoot -t "$out"
+    fi
+
+  '';
+}