From 9a87a9e1322735dee68dc0702c6cea5cba7d6e50 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Tue, 1 Apr 2025 22:09:57 +0200 Subject: [PATCH] wger: bumped to flexible routines, many changes, luckily easy update --- machines/gerd/services/wger/wgerpkg/default.nix | 8 ++++---- .../wger/wgerpkg/patches/pyproject.patch | 16 +++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/machines/gerd/services/wger/wgerpkg/default.nix b/machines/gerd/services/wger/wgerpkg/default.nix index 61460a5..8df2e4b 100644 --- a/machines/gerd/services/wger/wgerpkg/default.nix +++ b/machines/gerd/services/wger/wgerpkg/default.nix @@ -9,16 +9,16 @@ let frontend = callPackage ./frontend.nix {}; -in python3.pkgs.buildPythonPackage rec { +in python3.pkgs.buildPythonPackage { pname = "wger"; - version = "unstable-2025-02-28"; + version = "unstable-2025-04-01"; pyproject = true; src = fetchFromGitHub { owner = "wger-project"; repo = "wger"; - rev = "b01923bf0d581859e0c31a44332b8670c6e48b60"; - hash = "sha256-3l3B3UBQJ45wCHPjAsyG1/V79W03q6Fl2Mwb3R23enQ="; + rev = "5ead83583acb5faeae3fa1b9b8bcbc5b1a5fc9df"; + hash = "sha256-c+NYQiqUOAJNWgOFJFrDozeB6apOUidoA/l+cBC8IHs="; }; build-system = [ diff --git a/machines/gerd/services/wger/wgerpkg/patches/pyproject.patch b/machines/gerd/services/wger/wgerpkg/patches/pyproject.patch index b73b054..9d82349 100644 --- a/machines/gerd/services/wger/wgerpkg/patches/pyproject.patch +++ b/machines/gerd/services/wger/wgerpkg/patches/pyproject.patch @@ -1,24 +1,22 @@ diff --git a/pyproject.toml b/pyproject.toml -index f10460b1e..62377bd9c 100644 +index 354f492f6..7163c4ffe 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -35,7 +35,8 @@ Issues = "https://github.com/wger-project/wger/issues" - Changelog = "https://wger.readthedocs.io/en/latest/changelog.html" +@@ -37,6 +37,8 @@ Changelog = "https://wger.readthedocs.io/en/latest/changelog.html" [project.scripts] --wger = "wger.__main__:main" -+wger = "wger.tasks:main" + wger = "wger.__main__:main" +manage = "wger.manage:main" ++ [tool.setuptools] include-package-data = false -@@ -47,6 +48,9 @@ dependencies = { file = ["requirements.txt"] } - [tool.distutils.bdist_wheel] - universal = 1 +@@ -53,6 +55,8 @@ universal = 1 + # path = "wger/__init__.py" + # expression = "get_version()" +[tool.hatch.build.targets.wheel.force-include] +"wger/settings_global.py" = "wger/settings_global.py" -+ [tool.ruff] # Exclude a variety of commonly ignored directories.