From 6c3d27d2bb42432462ece622a7accb5e6e26f232 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 17 Sep 2024 16:59:43 +0200 Subject: [PATCH 1/2] python312Packages.python-calamine: clean --- .../python-calamine/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-calamine/default.nix b/pkgs/development/python-modules/python-calamine/default.nix index cd1b405ecba2..86b49cb39921 100644 --- a/pkgs/development/python-modules/python-calamine/default.nix +++ b/pkgs/development/python-modules/python-calamine/default.nix @@ -1,14 +1,19 @@ { lib, buildPythonPackage, - cargo, fetchFromGitHub, - poetry-core, - pytestCheckHook, - pythonOlder, - rustc, - packaging, rustPlatform, + + # build-system + cargo, + poetry-core, + rustc, + + # dependencies + packaging, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -16,8 +21,6 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dimastbk"; repo = "python-calamine"; From e1dbddf2bbb6a902790cc1bbf519454abf5c467a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 17 Sep 2024 17:04:32 +0200 Subject: [PATCH 2/2] python312Packages.python-calamine: add missing dependency libiconv --- pkgs/development/python-modules/python-calamine/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python-calamine/default.nix b/pkgs/development/python-modules/python-calamine/default.nix index 86b49cb39921..ba4eb23badbd 100644 --- a/pkgs/development/python-modules/python-calamine/default.nix +++ b/pkgs/development/python-modules/python-calamine/default.nix @@ -4,6 +4,9 @@ fetchFromGitHub, rustPlatform, + # buildInputs + libiconv, + # build-system cargo, poetry-core, @@ -39,6 +42,8 @@ buildPythonPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; + buildInputs = [ libiconv ]; + build-system = [ cargo poetry-core