From fff8ec6003a7f5c59a9d9d899f05d23f11624e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Jan 2026 13:40:54 -0800 Subject: [PATCH 1/6] Revert "python3Packages.dataset: use sqlalchemy_1_4" This reverts commit 3ef0b7d54955bc40dbdb249f31d29db3c5ed427f because only unversioned attributes may be included in dependencies. --- pkgs/development/python-modules/dataset/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 361457eb66e9..3ea9f4ab61d8 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -6,7 +6,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - sqlalchemy_1_4, + sqlalchemy, }: buildPythonPackage rec { @@ -28,11 +28,9 @@ buildPythonPackage rec { ]; dependencies = [ - (alembic.override { sqlalchemy = sqlalchemy_1_4; }) + alembic banal - # SQLAlchemy >= 2.0.0 is unsupported - # https://github.com/pudo/dataset/issues/411 - sqlalchemy_1_4 + sqlalchemy ]; # checks attempt to import nonexistent module 'test.test' and fail @@ -45,5 +43,8 @@ buildPythonPackage rec { homepage = "https://dataset.readthedocs.io"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xfnw ]; + # SQLAlchemy >= 2.0.0 is unsupported + # https://github.com/pudo/dataset/issues/411 + broken = true; }; } From 1c5f9b969d6ee4c8df1589f66fa43883cd5c22ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Jan 2026 13:43:57 -0800 Subject: [PATCH 2/6] python3Packages.dataset: only mark broken with sqlalchemy >= 2.0.0 --- pkgs/development/python-modules/dataset/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 3ea9f4ab61d8..2f1f2cb105cf 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ xfnw ]; # SQLAlchemy >= 2.0.0 is unsupported # https://github.com/pudo/dataset/issues/411 - broken = true; + broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; } From b618ef91d2cf8721af2b6ddad86df18614ca2316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Jan 2026 13:46:55 -0800 Subject: [PATCH 3/6] fdroidserver: override sqlalchemy to unbreak dataset --- pkgs/by-name/fd/fdroidserver/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index 2a77b79e1d5b..068f4699e8c0 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -2,13 +2,19 @@ lib, fetchFromGitLab, python3Packages, - python3, fetchPypi, apksigner, installShellFiles, }: -python3Packages.buildPythonApplication rec { +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + sqlalchemy = self.sqlalchemy_1_4; + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "fdroidserver"; version = "2.4.3"; @@ -37,7 +43,7 @@ python3Packages.buildPythonApplication rec { ''; preConfigure = '' - ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog + ${pythonPackages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog ''; postInstall = '' @@ -49,12 +55,12 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - build-system = with python3Packages; [ + build-system = with pythonPackages; [ setuptools babel ]; - dependencies = with python3Packages; [ + dependencies = with pythonPackages; [ androguard biplist clint From 6ffe711a135bdc9f65d18560958cf1d002051a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Jan 2026 14:10:36 -0800 Subject: [PATCH 4/6] diffoscope: override sqlalchemy to unbreak dataset --- pkgs/by-name/di/diffoscope/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index c3b3324d098b..3fe649e98b41 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -84,6 +84,8 @@ let python = python3.override { self = python; packageOverrides = final: prev: { + # version 2 breaks dataset and thus androguard + sqlalchemy = prev.sqlalchemy_1_4; # version 4 or newer would log the following error but tests currently don't fail because radare2 is disabled # ValueError: argument TNULL is not a TLSH hex string tlsh = prev.tlsh.overridePythonAttrs ( From 57dae9946d39deca8a446f45ecfa29330fa92523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Jan 2026 13:50:53 -0800 Subject: [PATCH 5/6] quark-engine: override sqlalchemy to unbreak dataset --- pkgs/by-name/qu/quark-engine/package.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix index 9896b7bae9fb..ddea8d5b5033 100644 --- a/pkgs/by-name/qu/quark-engine/package.nix +++ b/pkgs/by-name/qu/quark-engine/package.nix @@ -2,10 +2,20 @@ lib, fetchFromGitHub, gitMinimal, - python3, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + pytest-randomly = super.pytest-randomly.overridePythonAttrs { + doCheck = false; + }; + sqlalchemy = self.sqlalchemy_1_4; + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "quark-engine"; version = "25.6.1"; pyproject = true; @@ -17,9 +27,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-DAD37fzswY3c0d+ubOCYImxs4qyD4fhC3m2l0iD977A="; }; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with pythonPackages; [ setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with pythonPackages; [ androguard click colorama From 99a1d8d30942fc679856035eff56bd2f78c6da22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Jan 2026 07:58:49 -0800 Subject: [PATCH 6/6] androguard: override sqlalchemy to unbreak dataset --- pkgs/by-name/an/androguard/package.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/an/androguard/package.nix diff --git a/pkgs/by-name/an/androguard/package.nix b/pkgs/by-name/an/androguard/package.nix new file mode 100644 index 000000000000..a9e9965f5dfd --- /dev/null +++ b/pkgs/by-name/an/androguard/package.nix @@ -0,0 +1,12 @@ +{ + python3Packages, +}: + +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + sqlalchemy = self.sqlalchemy_1_4; + } + ); +in +pythonPackages.toPythonApplication pythonPackages.androguard diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 235eee08a479..7d71bd16c2e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10048,8 +10048,6 @@ with pkgs; useQt6 = true; }; - androguard = with python3.pkgs; toPythonApplication androguard; - dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); # solve collision for nix-env before https://github.com/NixOS/nix/pull/815