From abf376b749af92c9e9b6924bc6913c01914f2e8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 May 2023 06:10:48 +0000 Subject: [PATCH 1/4] python310Packages.icnsutil: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/icnsutil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix index d01f1591f829..087aeafbd083 100644 --- a/pkgs/development/python-modules/icnsutil/default.nix +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "icnsutil"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "relikd"; repo = pname; - rev = "v${version}"; - hash = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; + rev = "refs/tags/v${version}"; + hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s="; }; doCheck = true; From 277b020a895ab5f0f3e17fb241e34e421f137788 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:26:47 +0200 Subject: [PATCH 2/4] python310Packages.icnsutil: : clean-up meta - add changelog to meta --- pkgs/development/python-modules/icnsutil/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix index 087aeafbd083..2365bab42e65 100644 --- a/pkgs/development/python-modules/icnsutil/default.nix +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -22,10 +22,11 @@ buildPythonPackage rec { ${python.interpreter} tests/test_cli.py ''; - meta = { + meta = with lib; { + description = "Create and extract .icns files"; homepage = "https://github.com/relikd/icnsutil"; - description = "Create and extract .icns files."; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.reckenrode ]; + changelog = "https://github.com/relikd/icnsutil/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ reckenrode ]; }; } From 09a892f832d081c39b30f3a8da4e496f4906bd97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:33:25 +0200 Subject: [PATCH 3/4] python310Packages.icnsutil: disable on unsupported Python releases - add format --- pkgs/development/python-modules/icnsutil/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix index 2365bab42e65..cb5aa5c0e363 100644 --- a/pkgs/development/python-modules/icnsutil/default.nix +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -2,11 +2,15 @@ , python , fetchFromGitHub , buildPythonPackage +, pythonOlder }: buildPythonPackage rec { pname = "icnsutil"; version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "relikd"; From 8340587cfd7069eb78ed05629634f8a7dea5cbc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:38:57 +0200 Subject: [PATCH 4/4] python310Packages.icnsutil: add pythonImportsCheck --- pkgs/development/python-modules/icnsutil/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix index cb5aa5c0e363..46c1fcae3fac 100644 --- a/pkgs/development/python-modules/icnsutil/default.nix +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -1,7 +1,7 @@ { lib -, python -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, python , pythonOlder }: @@ -19,13 +19,15 @@ buildPythonPackage rec { hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s="; }; - doCheck = true; - checkPhase = '' ${python.interpreter} tests/test_icnsutil.py ${python.interpreter} tests/test_cli.py ''; + pythonImportsCheck = [ + "icnsutil" + ]; + meta = with lib; { description = "Create and extract .icns files"; homepage = "https://github.com/relikd/icnsutil";