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] 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