summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-17 19:45:47 +0100
committerGitHub <noreply@github.com>2021-01-17 19:45:47 +0100
commit9ecaa3ce7615184074f94e6965c6d1748bd8e0db (patch)
tree767a948dd732ed0483f40c6fb4749cccfcbc33a8
parent29238385b70f32f1b89513fa5e35a18688d5017f (diff)
parent143091fae69a0ca8391661fefdaa70f5559b31f5 (diff)
Merge pull request #107227 from vq/add/lxi-tools
lxi-tools: init at 1.21
-rw-r--r--maintainers/maintainer-list.nix4
-rw-r--r--pkgs/development/libraries/liblxi/default.nix34
-rw-r--r--pkgs/tools/networking/lxi-tools/default.nix34
-rw-r--r--pkgs/top-level/all-packages.nix4
4 files changed, 76 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d376cbecf575..3b2d7d48cfd2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9666,6 +9666,10 @@
email = "oliver.huntuk@gmail.com";
name = "Oliver Hunt";
};
+ vq = {
+ email = "vq@erq.se";
+ name = "Daniel Nilsson";
+ };
vrthra = {
email = "rahul@gopinath.org";
github = "vrthra";
diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix
new file mode 100644
index 000000000000..ebb8cbe0376c
--- /dev/null
+++ b/pkgs/development/libraries/liblxi/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub
+, pkg-config, autoreconfHook
+, libtirpc, rpcsvc-proto, avahi, libxml2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "liblxi";
+ version = "1.13";
+
+ src = fetchFromGitHub {
+ owner = "lxi-tools";
+ repo = "liblxi";
+ rev = "v${version}";
+ sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ];
+
+ buildInputs = [ libtirpc avahi libxml2 ];
+
+ meta = with stdenv.lib; {
+ description = "Library for communicating with LXI compatible instruments";
+ longDescription = ''
+ liblxi is an open source software library which offers a simple
+ API for communicating with LXI compatible instruments.
+ The API allows applications to easily discover instruments
+ on networks and communicate SCPI commands.
+ '';
+ homepage = "https://lxi-tools.github.io/";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.vq ];
+ };
+}
diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix
new file mode 100644
index 000000000000..3f3e62fb8075
--- /dev/null
+++ b/pkgs/tools/networking/lxi-tools/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkg-config
+, liblxi, readline, lua
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lxi-tools";
+ version = "1.21";
+
+ src = fetchFromGitHub {
+ owner = "lxi-tools";
+ repo = "lxi-tools";
+ rev = "v${version}";
+ sha256 = "0rkp6ywsw2zv7hpbr12kba79wkcwqin7xagxxhd968rbfkfdxlwc";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+ buildInputs = [ liblxi readline lua ];
+
+ meta = with stdenv.lib; {
+ description = "Tool for communicating with LXI compatible instruments";
+ longDescription = ''
+ lxi-tools is a collection of open source software tools
+ that enables control of LXI compatible instruments such
+ as modern oscilloscopes, power supplies,
+ spectrum analyzers etc.
+ '';
+ homepage = "https://lxi-tools.github.io/";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.vq ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182c6f904545..4ce82ea8a70a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14804,6 +14804,8 @@ in
libltc = callPackage ../development/libraries/libltc { };
+ liblxi = callPackage ../development/libraries/liblxi { };
+
libmaxminddb = callPackage ../development/libraries/libmaxminddb { };
libmcrypt = callPackage ../development/libraries/libmcrypt {};
@@ -23323,6 +23325,8 @@ in
lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { };
+ lxi-tools = callPackage ../tools/networking/lxi-tools { };
+
lynx = callPackage ../applications/networking/browsers/lynx { };
lyrebird = callPackage ../applications/audio/lyrebird { };