From 26226abeed56453a397e96c495a95fc177af234d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 11:17:56 +0000 Subject: [PATCH 1/3] tryton: 7.2.4 -> 7.2.5 --- pkgs/applications/office/tryton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 55d43623bc7a..88d195af8d40 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.4"; + version = "7.2.5"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-LYebXgAvIG3pUF7GpRjeQvP6S83yPjPO/lZg9r0X+Kc="; + hash = "sha256-U6hA6TuIMDTFAZUic60A5IKr/LKxKZEgiTIhkLlTJSw="; }; nativeBuildInputs = [ From 1bc559ed431a9556fea8dc370e2eccc736c20133 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 14 Sep 2024 10:31:43 +0900 Subject: [PATCH 2/3] tryton: build with pypaBuildHook --- pkgs/applications/office/tryton/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 88d195af8d40..be1050c1973e 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -20,21 +20,22 @@ python3Packages.buildPythonApplication rec { pname = "tryton"; version = "7.2.5"; - - disabled = !python3Packages.isPy3k; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-U6hA6TuIMDTFAZUic60A5IKr/LKxKZEgiTIhkLlTJSw="; }; + build-system = [ python3Packages.setuptools ]; + nativeBuildInputs = [ pkg-config gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ python-dateutil pygobject3 goocalendar @@ -57,6 +58,8 @@ python3Packages.buildPythonApplication rec { strictDeps = false; + pythonImportsCheck = [ "tryton" ]; + doCheck = false; meta = with lib; { From 466af1a6b410dc09e2d73132af95be729fd893af Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 14 Sep 2024 10:38:08 +0900 Subject: [PATCH 3/3] tryton: avoid double wrapping --- pkgs/applications/office/tryton/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index be1050c1973e..bc66a8b458a6 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -56,6 +56,12 @@ python3Packages.buildPythonApplication rec { pango ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + strictDeps = false; pythonImportsCheck = [ "tryton" ];