From d02892d7920bd169e821c202ad06552701b8e5f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 04:05:08 +0000 Subject: [PATCH 1/2] python311Packages.pyorthanc: 1.16.1 -> 1.18.0 --- pkgs/development/python-modules/pyorthanc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 0c33fc231974..70776e72ab82 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.16.1"; + version = "1.18.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6l3L0YUAqedyRjlQ6K3SaAMdGK2C0AeKpJj6MyXi4RA="; + hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE="; }; nativeBuildInputs = [ From a7769ad48247dc6989dc23307fb31bd470c377b7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 18 Jun 2024 21:15:33 +0900 Subject: [PATCH 2/2] python311Packages.pyorthanc: refactor --- .../development/python-modules/pyorthanc/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 70776e72ab82..a65d8d6b983b 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, poetry-core, httpx, pydicom, @@ -14,7 +13,7 @@ buildPythonPackage rec { version = "1.18.0"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "gacou54"; @@ -23,18 +22,13 @@ buildPythonPackage rec { hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx pydicom ]; - pythonRelaxDeps = [ "httpx" ]; - doCheck = false; # requires orthanc server (not in Nixpkgs) pythonImportsCheck = [ "pyorthanc" ];