From 60acdc429f3fee2628377233e38c045277c255a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 29 Aug 2025 22:23:15 +0200
Subject: [PATCH 1/3] python313Packages.questionary: 2.1.0 -> 2.1.1

Diff: https://github.com/tmbo/questionary/compare/2.1.0...2.1.1

Changelog: https://github.com/tmbo/questionary/blob/refs/tags/2.1.1/docs/pages/changelog.rst
---
 pkgs/development/python-modules/questionary/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix
index 52aab0d5004e..cf43a4234314 100644
--- a/pkgs/development/python-modules/questionary/default.nix
+++ b/pkgs/development/python-modules/questionary/default.nix
@@ -6,21 +6,18 @@
   poetry-core,
   prompt-toolkit,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "questionary";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "tmbo";
     repo = "questionary";
     tag = version;
-    hash = "sha256-HiQsOkG3oK+hnyeFjebnVASxpZhUPGBGz69JvPO43fM=";
+    hash = "sha256-r7F5y6KD6zonQGtO/9OuCTMTWdkCdd9aqTgKg6eWp08=";
   };
 
   pythonRelaxDeps = [ "prompt_toolkit" ];

From 1f270079cfcd4672c6e23ec4c19201fd757ea455 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Sep 2025 11:57:39 +0200
Subject: [PATCH 2/3] python313Packages.pynng: override version

---
 pkgs/development/python-modules/pynng/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pynng/default.nix b/pkgs/development/python-modules/pynng/default.nix
index e3eb55ec0967..40834e556e0f 100644
--- a/pkgs/development/python-modules/pynng/default.nix
+++ b/pkgs/development/python-modules/pynng/default.nix
@@ -18,29 +18,31 @@ let
     owner = "nanomsg";
     repo = "nng";
     tag = "v1.6.0";
-    sha256 = "sha256-Kq8QxPU6SiTk0Ev2IJoktSPjVOlAS4/e1PQvw2+e8UA=";
+    hash = "sha256-Kq8QxPU6SiTk0Ev2IJoktSPjVOlAS4/e1PQvw2+e8UA=";
   };
 
   mbedtls = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     tag = "v3.5.1";
-    sha256 = "sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw=";
+    hash = "sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw=";
   };
 
 in
 buildPythonPackage {
   pname = "pynng";
   version = "0.8.1-unstable-2025-05-14";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "codypiersall";
     repo = "pynng";
     rev = "2179328f8a858bbb3e177f66ac132bde4a5aa859";
-    sha256 = "sha256-TxIVcqc+4bro+krc1AWgLdZKGGuQ2D6kybHnv5z1oHg=";
+    hash = "sha256-TxIVcqc+4bro+krc1AWgLdZKGGuQ2D6kybHnv5z1oHg=";
   };
 
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.8.1";
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -69,9 +71,7 @@ buildPythonPackage {
     pytest-asyncio
   ];
 
-  pythonImportsCheck = [
-    "pynng"
-  ];
+  pythonImportsCheck = [ "pynng" ];
 
   meta = {
     description = "Python bindings for Nanomsg Next Generation";

From a4ebe2ee6fc371e287b4a198b4a6bec011eb581d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Sep 2025 12:02:32 +0200
Subject: [PATCH 3/3] python313Packages.python-fx: disable failing tests

---
 pkgs/development/python-modules/python-fx/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix
index 2f63ca723426..7934e0c15312 100644
--- a/pkgs/development/python-modules/python-fx/default.nix
+++ b/pkgs/development/python-modules/python-fx/default.nix
@@ -45,6 +45,10 @@ buildPythonPackage rec {
     rm src/pyfx/model/common/jsonpath/*.py # upstream checks in generated files, remove to ensure they were regenerated
     antlr -Dlanguage=Python3 -visitor src/pyfx/model/common/jsonpath/*.g4
     rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens} # no need to install
+
+    # https://github.com/cielong/pyfx/pull/148
+    substituteInPlace src/pyfx/view/common/frame.py \
+      --replace-fail "self.__super.__init__()" "super().__init__()"
   '';
 
   pythonRelaxDeps = true;