From 141dbca55bad371995a3ab044dee6f5597af0d81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Apr 2024 16:40:13 +0000 Subject: [PATCH 1/3] python311Packages.apycula: 0.11.1 -> 0.12 --- pkgs/development/python-modules/apycula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 43289ba0751d..b034a5166a72 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.11.1"; + version = "0.12"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-yuDyW1JXavI6U3B3hx3kdHBuVCQd2rJJqgZ0z15ahaw="; + hash = "sha256-aF/JVm4d6c631y+RdsCk3pAVSroRBY+lW2wBRvgcQH8="; }; nativeBuildInputs = [ From c75749aa472a728bc039a6e3448ac74ed2cad2a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 20:33:13 +0200 Subject: [PATCH 2/3] python312Packages.apycula: refactor --- .../python-modules/apycula/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index b034a5166a72..98343067bf85 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage -, pythonOlder +, crc +, crcmod , fetchPypi -, setuptools-scm , numpy +, openpyxl , pandas , pillow -, crcmod -, openpyxl +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "apycula"; version = "0.12"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,16 +24,17 @@ buildPythonPackage rec { hash = "sha256-aF/JVm4d6c631y+RdsCk3pAVSroRBY+lW2wBRvgcQH8="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + crc + crcmod numpy + openpyxl pandas pillow - crcmod - openpyxl ]; # tests require a physical FPGA From 309cf7f3e44723d6f65355579fbe10c82202fe8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 20:37:18 +0200 Subject: [PATCH 3/3] python312Packages.apycula: clean-up requirements --- .../python-modules/apycula/default.nix | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 98343067bf85..c41dd8fea278 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -1,14 +1,10 @@ -{ lib -, buildPythonPackage -, crc -, crcmod -, fetchPypi -, numpy -, openpyxl -, pandas -, pillow -, pythonOlder -, setuptools-scm +{ + lib, + buildPythonPackage, + crc, + fetchPypi, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { @@ -24,25 +20,16 @@ buildPythonPackage rec { hash = "sha256-aF/JVm4d6c631y+RdsCk3pAVSroRBY+lW2wBRvgcQH8="; }; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ crc - crcmod - numpy - openpyxl - pandas - pillow ]; - # tests require a physical FPGA + # Tests require a physical FPGA doCheck = false; - pythonImportsCheck = [ - "apycula" - ]; + pythonImportsCheck = [ "apycula" ]; meta = with lib; { description = "Open Source tools for Gowin FPGAs";