From 7301b48f7f7a085fe12834a269ff8aa8bd9fe152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:50:30 +0200 Subject: [PATCH 1/6] python311Packages.goocalendar: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/goocalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 65cf304acc24..3c542608b295 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "GooCalendar"; - version = "0.7.2"; + version = "0.8.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "318b3b7790ac9d6d98881eee3b676fc9c17fc15d21dcdaff486e3c303333b41a"; + sha256 = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; }; nativeBuildInputs = [ From c52a226159e8a8cc7a42a105fd79061f58aa39d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:51:41 +0200 Subject: [PATCH 2/6] python311Packages.goocalendar: add changelog to meta --- pkgs/development/python-modules/goocalendar/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 3c542608b295..bd26568b7047 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; + hash = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A calendar widget for GTK using PyGoocanvas."; homepage = "https://goocalendar.tryton.org/"; + changelog = "https://foss.heptapod.net/tryton/goocalendar/-/blob/${version}/CHANGELOG"; license = licenses.gpl2; maintainers = [ maintainers.udono ]; }; From 63bc7f8f35b1d8515c1913ae15d62c80035aed27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:53:39 +0200 Subject: [PATCH 3/6] python311Packages.goocalendar: specifiy license --- pkgs/development/python-modules/goocalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index bd26568b7047..9e1be50b436b 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "A calendar widget for GTK using PyGoocanvas."; homepage = "https://goocalendar.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/goocalendar/-/blob/${version}/CHANGELOG"; - license = licenses.gpl2; - maintainers = [ maintainers.udono ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ udono ]; }; } From 3f38bbf6ae2cf3bf99641e0ea585800966a3bf3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:54:28 +0200 Subject: [PATCH 4/6] python311Packages.goocalendar: add format and update disabled --- pkgs/development/python-modules/goocalendar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 9e1be50b436b..412b9dbe8969 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -6,14 +6,15 @@ , gobject-introspection , pygobject3 , goocanvas2 -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "GooCalendar"; version = "0.8.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 9bea50a421b71d36fc583ab816bd696b7d9016db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:55:21 +0200 Subject: [PATCH 5/6] python311Packages.goocalendar: normalize pname --- pkgs/development/python-modules/goocalendar/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 412b9dbe8969..2a42a775f3d6 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -10,14 +10,15 @@ }: buildPythonPackage rec { - pname = "GooCalendar"; + pname = "goocalendar"; version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "GooCalendar"; + inherit version; hash = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; }; @@ -39,7 +40,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "A calendar widget for GTK using PyGoocanvas."; + description = "A calendar widget for GTK using PyGoocanvas"; homepage = "https://goocalendar.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/goocalendar/-/blob/${version}/CHANGELOG"; license = licenses.gpl2Only; From 9549e2aa9ba87682b430ed58dad00049b7d9eaaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:57:17 +0200 Subject: [PATCH 6/6] python311Packages.goocalendar: add pythonImportsCheck --- .../python-modules/goocalendar/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 2a42a775f3d6..a9d69447c2ce 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -1,11 +1,11 @@ { lib -, fetchPypi , buildPythonPackage -, pkg-config -, gtk3 +, fetchPypi , gobject-introspection -, pygobject3 , goocanvas2 +, gtk3 +, pkg-config +, pygobject3 , pythonOlder }: @@ -39,6 +39,10 @@ buildPythonPackage rec { # No upstream tests available doCheck = false; + pythonImportsCheck = [ + "goocalendar" + ]; + meta = with lib; { description = "A calendar widget for GTK using PyGoocanvas"; homepage = "https://goocalendar.tryton.org/";