From 24f34c60b110f8e8350a6ac82c1c9152a59ae73d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 09:43:33 +0000 Subject: [PATCH 1/2] rednotebook: 2.34 -> 2.35 --- pkgs/applications/editors/rednotebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 2fb1ca4d1333..93dde1f02297 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.34"; + version = "2.35"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2Z9zYfMAJPcKN5eakooIv4lQ140yjgQuUVlaWcsEu28="; + sha256 = "sha256-sGwdZZ3YGm3sXJoxnYwj6HQcYMnC1pEzba3N9KLfRHM="; }; # We have not packaged tests. From 8db65504e6d09c3026008a68d334ca94ac995ae0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 6 Oct 2024 17:05:00 +0900 Subject: [PATCH 2/2] rednotebook: switch to pypa builder --- pkgs/applications/editors/rednotebook/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 93dde1f02297..679cde8b5037 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonApplication, fetchFromGitHub , gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk -, pygobject3, pyyaml +, pygobject3, pyyaml, setuptools }: buildPythonApplication rec { pname = "rednotebook"; version = "2.35"; + pyproject = true; src = fetchFromGitHub { owner = "jendrikseipp"; @@ -19,6 +20,8 @@ buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection ]; + build-system = [ setuptools ]; + propagatedBuildInputs = [ gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk pygobject3 pyyaml @@ -30,6 +33,8 @@ buildPythonApplication rec { "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ]; + pythonImportsCheck = [ "rednotebook" ]; + meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";