From e5a63c6e2931ea688c615cfe29b88b8574c9edbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Apr 2024 09:49:10 +0000 Subject: [PATCH 1/3] python311Packages.pylibftdi: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/pylibftdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 32f20e278754..6a7845f9f477 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pylibftdi"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-634vUFKFJUf0xsRgIqFmX510U0OWORcereVv3ICliDI="; + hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8="; }; propagatedBuildInputs = [ From 08cc441cf7d09115d2994a834ef1354b218ec206 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Apr 2024 13:00:31 +0200 Subject: [PATCH 2/3] python311Packages.pylibftdi: refactor --- .../python-modules/pylibftdi/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 6a7845f9f477..90275914a68c 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -4,12 +4,13 @@ , libftdi1 , libusb1 , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "pylibftdi"; version = "0.22.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,15 +19,19 @@ buildPythonPackage rec { hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8="; }; - propagatedBuildInputs = [ + build-system = [ + poetry-core + ]; + + dependencies = [ libftdi1 libusb1 ]; postPatch = '' substituteInPlace src/pylibftdi/driver.py \ - --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ - --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" + --replace-fail 'self._load_library("libusb")' 'cdll.LoadLibrary("${libusb1.out}/lib/libusb-1.0.so")' \ + --replace-fail 'self._load_library("libftdi")' 'cdll.LoadLibrary("${libftdi1.out}/lib/libftdi1.so")' ''; pythonImportsCheck = [ @@ -36,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wrapper to Intra2net's libftdi driver for FTDI's USB devices"; homepage = "https://pylibftdi.readthedocs.io/"; - changelog = "https://github.com/codedstructure/pylibftdi/blob/${version}0/CHANGES.txt"; + changelog = "https://github.com/codedstructure/pylibftdi/blob/${version}/CHANGES.txt"; license = licenses.mit; maintainers = with maintainers; [ matthuszagh ]; }; From 1c696df1050a6213c5d296cd8840a355a12d321e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Apr 2024 13:01:01 +0200 Subject: [PATCH 3/3] python312Packages.pylibftdi: format with nixfmt --- .../python-modules/pylibftdi/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 90275914a68c..f6c317cc924a 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, libftdi1 -, libusb1 -, pythonOlder -, poetry-core +{ + lib, + buildPythonPackage, + fetchPypi, + libftdi1, + libusb1, + pythonOlder, + poetry-core, }: buildPythonPackage rec { @@ -19,9 +20,7 @@ buildPythonPackage rec { hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ libftdi1 @@ -34,9 +33,7 @@ buildPythonPackage rec { --replace-fail 'self._load_library("libftdi")' 'cdll.LoadLibrary("${libftdi1.out}/lib/libftdi1.so")' ''; - pythonImportsCheck = [ - "pylibftdi" - ]; + pythonImportsCheck = [ "pylibftdi" ]; meta = with lib; { description = "Wrapper to Intra2net's libftdi driver for FTDI's USB devices";