From a5cc8e9be589dba6cddd80bc16591352a868c5f5 Mon Sep 17 00:00:00 2001 From: Alberto Barradas Date: Mon, 21 Oct 2024 18:52:30 +0200 Subject: [PATCH 1/2] liblsl: init at 1.16.2 Add abcsds as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/li/liblsl/package.nix | 32 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/by-name/li/liblsl/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba6458af23e0e..6d355e68f2ea7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -414,6 +414,12 @@ githubId = 1174810; name = "Nikolay Amiantov"; }; + abcsds = { + email = "abcsds@gmail.com"; + github = "abcsds"; + githubId = 2694381; + name = "Alberto Barradas"; + }; abdiramen = { email = "abdirahman.osmanthus@gmail.com"; github = "Abdiramen"; diff --git a/pkgs/by-name/li/liblsl/package.nix b/pkgs/by-name/li/liblsl/package.nix new file mode 100644 index 0000000000000..36519bd2b40fc --- /dev/null +++ b/pkgs/by-name/li/liblsl/package.nix @@ -0,0 +1,32 @@ +{ + cmake, + stdenv, + lib, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "liblsl"; + version = "1.16.2"; + + src = fetchFromGitHub { + owner = "sccn"; + repo = "liblsl"; + rev = "v${version}"; + sha256 = "sha256-nmu7Kxk4U5sGO8Od9JR4id4V4mjeibj4AHjUYhpGPeo="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DLSL_UNIXFOLDERS=ON" ]; + + meta = { + description = "C++ lsl library for multi-modal time-synched data transmission over the local network"; + homepage = "https://github.com/sccn/liblsl"; + changelog = "https://github.com/sccn/liblsl/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ abcsds ]; + mainProgram = "liblsl"; + platforms = lib.platforms.all; + }; +} From 8cf373b6805860a91fea934699a9204fb362a09d Mon Sep 17 00:00:00 2001 From: Alberto Barradas Date: Mon, 21 Oct 2024 18:53:12 +0200 Subject: [PATCH 2/2] python3.pkgs.pylsl: init at 1.16.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update pkgs/development/python-modules/pylsl/default.nix Co-authored-by: Maciej Krüger --- .../python-modules/pylsl/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/pylsl/default.nix diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix new file mode 100644 index 0000000000000..f58a67956e36a --- /dev/null +++ b/pkgs/development/python-modules/pylsl/default.nix @@ -0,0 +1,43 @@ +{ + lib, + liblsl, + fetchFromGitHub, + buildPythonPackage, + setuptools, + wheel, +}: + +buildPythonPackage rec { + pname = "pylsl"; + version = "1.16.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "labstreaminglayer"; + repo = "pylsl"; + rev = "v${version}"; + hash = "sha256-rReoPirf1rdQppKEBfHMk3J2htdsnFfIdlNQIprOoUg="; + }; + + postPatch = '' + substituteInPlace pylsl/pylsl.py \ + --replace "def find_liblsl_libraries(verbose=False):" "$(echo -e "def find_liblsl_libraries(verbose=False):\n yield '${liblsl}/lib/liblsl.so'")" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + buildImputs = [ liblsl ]; + + pythonImportsCheck = [ "pylsl" ]; + + meta = with lib; { + description = "Python bindings (pylsl) for liblsl"; + homepage = "https://github.com/labstreaminglayer/pylsl"; + license = licenses.mit; + maintainers = with maintainers; [ abcsds ]; + mainProgram = "pylsl"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edde228999dde..e62b76bd072f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10264,6 +10264,8 @@ self: super: with self; { pyloadapi = callPackage ../development/python-modules/pyloadapi { }; + pylsl = callPackage ../development/python-modules/pylsl { }; + pyngo = callPackage ../development/python-modules/pyngo { }; pyngrok = callPackage ../development/python-modules/pyngrok { };