python314Packages.pscript: fix build, python314Packages.timetagger: 25.12.1 -> 26.1.1 (#477264)

2 files changed, 22 insertions, 13 deletions

diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix
index e1344052d1e1..73fa29f5748d 100644
--- a/pkgs/development/python-modules/pscript/default.nix
+++ b/pkgs/development/python-modules/pscript/default.nix
@@ -5,23 +5,26 @@
   flit-core,
   pytestCheckHook,
   nodejs,
-  pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pscript";
   version = "0.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "flexxui";
     repo = "pscript";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pqjig3dFJ4zfpor6TT6fiBMS7lAtJE/bAYbzl46W/YY=";
   };
 
+  postPatch = ''
+    # https://github.com/flexxui/pscript/pull/77
+    substituteInPlace pscript/commonast.py \
+      --replace-fail "ast.Ellipsis" "ast.Constant"
+  '';
+
   build-system = [ flit-core ];
 
   nativeCheckInputs = [
@@ -44,8 +47,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python to JavaScript compiler";
     homepage = "https://pscript.readthedocs.io";
-    changelog = "https://github.com/flexxui/pscript/blob/${src.tag}/docs/releasenotes.rst";
+    changelog = "https://github.com/flexxui/pscript/blob/${finalAttrs.src.tag}/docs/releasenotes.rst";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index 83e75a5e419d..fd7c2873754c 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -12,22 +12,23 @@
   pscript,
   pyjwt,
   pytestCheckHook,
+  pythonAtLeast,
   requests,
   setuptools,
   uvicorn,
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "timetagger";
-  version = "25.12.1";
+  version = "26.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "almarklein";
     repo = "timetagger";
-    tag = "v${version}";
-    hash = "sha256-XuYxle5U5Ui8ITsCgiJjwaRdfHwEa9cF0lAMoXwJamw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BGu+L3bUBGYj18D4qUemUMEs2tk0wLu8DvO9h/7FiJo=";
   };
 
   build-system = [ setuptools ];
@@ -53,12 +54,17 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "timetagger" ];
 
+  disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
+    #  RuntimeError: There is no current event loop in thread 'MainThread'
+    "tests/test_server_apiserver.py"
+  ];
+
   meta = {
     description = "Library to interact with TimeTagger";
     homepage = "https://github.com/almarklein/timetagger";
-    changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}";
+    changelog = "https://github.com/almarklein/timetagger/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     mainProgram = "timetagger";
   };
-}
+})