diff --git a/pkgs/by-name/an/androguard/package.nix b/pkgs/by-name/an/androguard/package.nix new file mode 100644 index 0000000000000..a9e9965f5dfdc --- /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/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index c3b3324d098b8..3fe649e98b419 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 ( diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index 2a77b79e1d5bc..068f4699e8c0e 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 diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix index 9896b7bae9fb1..ddea8d5b50338 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 diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 361457eb66e9c..2f1f2cb105cfb 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 = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 235eee08a479d..7d71bd16c2e62 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