From 03a317d9625a7b87ddbe639d74a45f99f8105b7e Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Fri, 18 Dec 2020 22:19:21 +0100 Subject: [PATCH 1/3] maintainers: add vq --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 50efa11c97c..32c41b6bf8a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9660,6 +9660,10 @@ email = "oliver.huntuk@gmail.com"; name = "Oliver Hunt"; }; + vq = { + email = "vq@erq.se"; + name = "Daniel Nilsson"; + }; vrthra = { email = "rahul@gopinath.org"; github = "vrthra"; From 5c56cfd61b1f39f6989ac3cf163f3a5dda74ed5a Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Fri, 18 Dec 2020 21:58:28 +0100 Subject: [PATCH 2/3] liblxi: init at 1.13 Apply suggestions from code review Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/development/libraries/liblxi/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/liblxi/default.nix diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix new file mode 100644 index 00000000000..ebb8cbe0376 --- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 313cfa208d7..c617da63da6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14802,6 +14802,8 @@ in libltc = callPackage ../development/libraries/libltc { }; + liblxi = callPackage ../development/libraries/liblxi { }; + libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; libmcrypt = callPackage ../development/libraries/libmcrypt {}; From 143091fae69a0ca8391661fefdaa70f5559b31f5 Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Fri, 18 Dec 2020 21:58:43 +0100 Subject: [PATCH 3/3] lxi-tools: init at 1.21 Apply suggestions from code review Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/tools/networking/lxi-tools/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/lxi-tools/default.nix diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix new file mode 100644 index 00000000000..3f3e62fb807 --- /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 c617da63da6..7ad4f3dab5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23323,6 +23323,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 { };