From 557e796ab86257f0af6b216f2ef01a6f569c902a Mon Sep 17 00:00:00 2001 From: Alexis Gaget Date: Thu, 21 Dec 2023 13:04:38 +0100 Subject: [PATCH] add mrfioc2 and devlib2 support --- lib/maintainers/maintainer-list.nix | 4 +++ pkgs/default.nix | 2 ++ pkgs/epnix/support/devlib2/default.nix | 32 ++++++++++++++++++++++++ pkgs/epnix/support/mrfioc2/default.nix | 34 ++++++++++++++++++++++++++ 4 files changed, 72 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 `` 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 0d1e908c..cb41da22 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 {}; seq = callPackage ./epnix/support/seq {}; snmp = callPackage ./epnix/support/snmp {}; sscan = callPackage ./epnix/support/sscan {}; diff --git a/pkgs/epnix/support/devlib2/default.nix b/pkgs/epnix/support/devlib2/default.nix new file mode 100644 index 00000000..2ee381bc --- /dev/null +++ b/pkgs/epnix/support/devlib2/default.nix @@ -0,0 +1,32 @@ +{ + lib, + epnixLib, + mkEpicsPackage, + fetchFromGitHub, + fetchpatch, + local_config_site ? {}, + local_release ? {}, +}: +mkEpicsPackage rec { + pname = "devlib2"; + # Last tag from 2020 not compliant with mrfioc2, it's issued here : https://github.com/epics-modules/devlib2/issues/16 + version = "2023-12-11"; + varname = "DEVLIB2"; + doCheck = false; + + inherit local_config_site local_release; + + src = fetchFromGitHub { + owner = "epics-modules"; + repo = "devlib2"; + rev = "5334e184dd872f13a6d55e4092cffb16bb43f9a4"; + sha256 = "sha256-V84NpJwOIqito5+7FZUkn4NTS5riFYbbkaPRpZLHHjQ="; + }; + + 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..4639ae81 --- /dev/null +++ b/pkgs/epnix/support/mrfioc2/default.nix @@ -0,0 +1,34 @@ +{ + lib, + epnix, + epnixLib, + mkEpicsPackage, + fetchFromGitHub, + fetchpatch, + local_config_site ? {}, + local_release ? {}, +}: +mkEpicsPackage rec { + pname = "mrfioc2"; + version = "2.5.0"; + varname = "MRFIOC2"; + doCheck = false; + + inherit local_config_site local_release; + + src = fetchFromGitHub { + owner = "epics-modules"; + repo = "mrfioc2"; + rev = version; + sha256 = "sha256-Z7iTM8i5aaA98j46ouuRhgVfRayitv2O4WhFm6ENark="; + }; + + propagatedBuildInputs = with epnix.support; [devlib2]; + + meta = { + description = "Driver EPICS for MRF cards"; + homepage = "https://github.com/epics-modules/mrfioc2"; + license = lib.licenses.lgpl21Plus; + maintainers = with epnixLib.maintainers; [agaget]; + }; +}