Skip to content

Revert "python3Packages.dataset: use sqlalchemy_1_4" #477562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotlambda merged 6 commits into from
Jan 7, 2026
Merged

Revert "python3Packages.dataset: use sqlalchemy_1_4" #477562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fff8ec6
Revert "python3Packages.dataset: use sqlalchemy_1_4"
dotlambda Jan 6, 2026
1c5f9b9
python3Packages.dataset: only mark broken with sqlalchemy >= 2.0.0
dotlambda Jan 6, 2026
b618ef9
fdroidserver: override sqlalchemy to unbreak dataset
dotlambda Jan 6, 2026
6ffe711
diffoscope: override sqlalchemy to unbreak dataset
dotlambda Jan 6, 2026
57dae99
quark-engine: override sqlalchemy to unbreak dataset
dotlambda Jan 6, 2026
99a1d8d
androguard: override sqlalchemy to unbreak dataset
dotlambda Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pkgs/by-name/an/androguard/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
python3Packages,
}:

let
pythonPackages = python3Packages.overrideScope (
self: super: {
sqlalchemy = self.sqlalchemy_1_4;
}
);
in
pythonPackages.toPythonApplication pythonPackages.androguard
2 changes: 2 additions & 0 deletions pkgs/by-name/di/diffoscope/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
16 changes: 11 additions & 5 deletions pkgs/by-name/fd/fdroidserver/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -37,7 +43,7 @@ python3Packages.buildPythonApplication rec {
'';

preConfigure = ''
${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog
${pythonPackages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog
'';

postInstall = ''
Expand All @@ -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
Expand Down
18 changes: 14 additions & 4 deletions pkgs/by-name/qu/quark-engine/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
11 changes: 6 additions & 5 deletions pkgs/development/python-modules/dataset/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
sqlalchemy_1_4,
sqlalchemy,
}:

buildPythonPackage rec {
Expand All @@ -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
Expand All @@ -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";
Copy link
Contributor

@philiptaron philiptaron Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I guess that's fair. That is a disheartening thread.

};
}
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading