From 76768afcd3833f61fc515dd84457536eccf3af57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 11:41:56 +0000 Subject: [PATCH 1/5] python3Packages.cogapp: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/cogapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index c6f669c8ad56..befccc220486 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.4.1"; + version = "3.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; + hash = "sha256-8ZDEoPBLs4kyCmaLxxsTsLiGwKoc+o56lb1++RLg47E="; }; nativeBuildInputs = [ setuptools ]; From 53e69b1fee2541648eed3c78efec89969b9a7fb5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 14 Jun 2025 20:32:39 +0900 Subject: [PATCH 2/5] python3Packages.cogapp: refactor --- pkgs/development/python-modules/cogapp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index befccc220486..85df789bd9e5 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { hash = "sha256-8ZDEoPBLs4kyCmaLxxsTsLiGwKoc+o56lb1++RLg47E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # there are no tests doCheck = false; - meta = with lib; { + meta = { description = "Code generator for executing Python snippets in source files"; homepage = "https://nedbatchelder.com/code/cog"; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lovek323 ]; }; } From 0b731b4df092709d4b7f958e3caf2fc73808b7b5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 14 Jun 2025 20:32:54 +0900 Subject: [PATCH 3/5] python3Packages.cogapp: enable pythonImportsCheck --- pkgs/development/python-modules/cogapp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 85df789bd9e5..275db00dea5c 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonImportsCheck = [ "cogapp" ]; + # there are no tests doCheck = false; From 0d127814137924dfaa47a3631c2c0afb47bf747c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 14 Jun 2025 20:33:44 +0900 Subject: [PATCH 4/5] python3Packages.cogapp: add meta.changelog --- pkgs/development/python-modules/cogapp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 275db00dea5c..6824e486355d 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = { description = "Code generator for executing Python snippets in source files"; homepage = "https://nedbatchelder.com/code/cog"; + changelog = "https://github.com/nedbat/cog/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovek323 ]; }; From fb66f87e49bde6cb859f7b49351e627571282230 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 14 Jun 2025 20:37:38 +0900 Subject: [PATCH 5/5] python3Packages.cogapp: enable tests --- pkgs/development/python-modules/cogapp/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 6824e486355d..3f9d7ae238c5 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, + pytestCheckHook, }: buildPythonPackage rec { @@ -10,17 +11,18 @@ buildPythonPackage rec { version = "3.5.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-8ZDEoPBLs4kyCmaLxxsTsLiGwKoc+o56lb1++RLg47E="; + src = fetchFromGitHub { + owner = "nedbat"; + repo = "cog"; + tag = "v${version}"; + hash = "sha256-jmHAHBzUw8VLCudT8slisCJ7yOUTVrrLiUbEiiTcfew="; }; build-system = [ setuptools ]; pythonImportsCheck = [ "cogapp" ]; - # there are no tests - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Code generator for executing Python snippets in source files";