python3Packages.dataset: 1.6.2 -> 2.0.0
https://github.com/pudo/dataset/releases/tag/2.0.0 Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
This commit is contained in:
@@ -2,11 +2,4 @@
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages.overrideScope (
|
||||
self: super: {
|
||||
sqlalchemy = self.sqlalchemy_1_4;
|
||||
}
|
||||
);
|
||||
in
|
||||
pythonPackages.toPythonApplication pythonPackages.androguard
|
||||
python3Packages.toPythonApplication python3Packages.androguard
|
||||
|
||||
@@ -85,8 +85,6 @@ 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 (
|
||||
|
||||
@@ -7,14 +7,7 @@
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages.overrideScope (
|
||||
self: super: {
|
||||
sqlalchemy = self.sqlalchemy_1_4;
|
||||
}
|
||||
);
|
||||
in
|
||||
pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "fdroidserver";
|
||||
version = "2.4.3";
|
||||
|
||||
@@ -43,7 +36,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
${pythonPackages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog
|
||||
${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@@ -55,12 +48,12 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
build-system = with pythonPackages; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
babel
|
||||
];
|
||||
|
||||
dependencies = with pythonPackages; [
|
||||
dependencies = with python3Packages; [
|
||||
androguard
|
||||
biplist
|
||||
clint
|
||||
|
||||
@@ -11,7 +11,6 @@ let
|
||||
pytest-randomly = super.pytest-randomly.overridePythonAttrs {
|
||||
doCheck = false;
|
||||
};
|
||||
sqlalchemy = self.sqlalchemy_1_4;
|
||||
}
|
||||
);
|
||||
in
|
||||
|
||||
@@ -1,47 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
setuptools,
|
||||
hatchling,
|
||||
alembic,
|
||||
banal,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
sqlalchemy,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataset";
|
||||
version = "1.6.2";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pudo";
|
||||
repo = "dataset";
|
||||
tag = version;
|
||||
hash = "sha256-hu1Qa5r3eT+xHFrCuYyJ9ZWvyoJBsisO34zvkch65Tc=";
|
||||
hash = "sha256-A8X1Gv+b+K90LAZ5YDjeUbl3Y1fiaFwGj6urapLN3AQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
alembic
|
||||
banal
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
# checks attempt to import nonexistent module 'test.test' and fail
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "dataset" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Toolkit for Python-based database access";
|
||||
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";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user