diff options
| author | Ivan Kozik <ivan@ludios.org> | 2021-08-29 20:00:59 +0000 |
|---|---|---|
| committer | Ivan Kozik <ivan@ludios.org> | 2021-11-20 04:54:58 +0000 |
| commit | b5e87f5f2e40ab84dd1977348e0ea44f36a749df (patch) | |
| tree | c1ea5c12f0a183bcdcd205d36cf12877e8feb47d /pkgs/tools | |
| parent | 38d21595b8fb0a744aa31c5794013bf42cf98fa9 (diff) | |
grab-site: 2.2.0 -> 2.2.2; pythonPackages.ludios_wpull: 3.0.7 -> 3.0.9
Use SQLAlchemy 1.3 because ludios_wpull is incompatible with SQLAlchemy 1.4.
Use Python 3.8 instead of Python 3.7, as namedlist 1.8 fixed compatibility
with Python 3.8. We cannot use Python 3.9 until
https://github.com/ArchiveTeam/ludios_wpull/issues/20 is fixed.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/backup/grab-site/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 2f2f01356b47..fe6496bf212b 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,8 +1,15 @@ -{ lib, python37, fetchFromGitHub }: +{ lib, python38, fetchFromGitHub }: let - python = python37.override { + python = python38.override { self = python; packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); tornado = super.tornado_4; }; }; @@ -10,18 +17,18 @@ let in with python.pkgs; buildPythonApplication rec { pname = "grab-site"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8"; + sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4"; }; postPatch = '' substituteInPlace setup.py \ - --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.7"' '"wpull"' + --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"' ''; propagatedBuildInputs = [ |