From 5eb14c27a6cb58d5985d0ec97ccde0e1588b7406 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Oct 2021 11:49:56 +0000 Subject: [PATCH 1/3] python38Packages.PyICU: 2.7.4 -> 2.8 --- pkgs/development/python-modules/pyicu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 45a24851150e..c9555f7bb65f 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.7.4"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "c0655302e2aea16f9acefe04152f74e5d7d70542e9e15c89ee8d763c8e097f56"; + sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; }; nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config From a49ccd5da64e21c9e6a6cc65345dc369619a3c4c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 11:50:00 +0000 Subject: [PATCH 2/3] python38Packages.PyICU: unpin icu icu68 was pinned in de8dbb21fbf740927ad2888bac59215a92a64ee0 for 21.05 ZHF, but it's no longer necessary. --- pkgs/development/python-modules/pyicu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index c9555f7bb65f..c24a4a08c3cf 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , six -, icu68 +, icu }: buildPythonPackage rec { @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; }; - nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config - buildInputs = [ icu68 ]; + nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config + buildInputs = [ icu ]; checkInputs = [ pytestCheckHook six ]; meta = with lib; { From 985f9deff25f1706371c8088af98842699266661 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 11:50:00 +0000 Subject: [PATCH 3/3] python38Packages.PyICU: update meta --- pkgs/development/python-modules/pyicu/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index c24a4a08c3cf..3281a7ceb873 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -19,11 +19,12 @@ buildPythonPackage rec { buildInputs = [ icu ]; checkInputs = [ pytestCheckHook six ]; - meta = with lib; { - homepage = "https://github.com/ovalhub/pyicu/"; - description = "Python extension wrapping the ICU C++ API"; - license = licenses.mit; - platforms = platforms.unix; - }; + pythonImportsCheck = [ "icu" ]; + meta = with lib; { + homepage = "https://gitlab.pyicu.org/main/pyicu"; + description = "Python extension wrapping the ICU C++ API"; + changelog = "https://gitlab.pyicu.org/main/pyicu/-/raw/v${version}/CHANGES"; + license = licenses.mit; + }; }