From 4051fb8e761872855e6247965aad6632bca1355d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 23:43:57 +0200 Subject: [PATCH 1/3] python312Packages.pyftdi: 0.55.0 -> 0.55.4 Diff: https://github.com/eblot/pyftdi/compare/v0.55.0...v0.55.4 --- pkgs/development/python-modules/pyftdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index f004ac7c88c4..718d17bcb49c 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.55.0"; + version = "0.55.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "eblot"; repo = pname; rev = "v${version}"; - hash = "sha256-EEMHY5EKftci72huF5UmJyh2wJAc8uNh/QhGSSAVXIU="; + hash = "sha256-InJJnbAPYlV071EkEWECJC79HLZ6SWo2VP7PqMgOGow="; }; propagatedBuildInputs = [ From 71c63c8ca82a04b1b1c0847aa471fb9d7bf1ae6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 23:45:46 +0200 Subject: [PATCH 2/3] python312Packages.pyftdi: refactor --- pkgs/development/python-modules/pyftdi/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 718d17bcb49c..4cba27f92068 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -4,23 +4,28 @@ , pyserial , pythonOlder , pyusb +, setuptools }: buildPythonPackage rec { pname = "pyftdi"; version = "0.55.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eblot"; - repo = pname; - rev = "v${version}"; + repo = "pyftdi"; + rev = "refs/tags/v${version}"; hash = "sha256-InJJnbAPYlV071EkEWECJC79HLZ6SWo2VP7PqMgOGow="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pyserial pyusb ]; From d10683ac2429047fdcebfb079860bef6dfca157b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 23:46:13 +0200 Subject: [PATCH 3/3] python312Packages.pyftdi: format with nixfmt --- .../python-modules/pyftdi/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 4cba27f92068..009d0fab1d80 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pyserial -, pythonOlder -, pyusb -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyserial, + pythonOlder, + pyusb, + setuptools, }: buildPythonPackage rec { @@ -21,9 +22,7 @@ buildPythonPackage rec { hash = "sha256-InJJnbAPYlV071EkEWECJC79HLZ6SWo2VP7PqMgOGow="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pyserial @@ -33,9 +32,7 @@ buildPythonPackage rec { # Tests require access to the serial port doCheck = false; - pythonImportsCheck = [ - "pyftdi" - ]; + pythonImportsCheck = [ "pyftdi" ]; meta = with lib; { description = "User-space driver for modern FTDI devices";