pyrox.dev
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.
+4
-4
pkgs/development/python-modules/ludios_wpull/default.nix
+4
-4
pkgs/development/python-modules/ludios_wpull/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
3
, fetchFromGitHub
4
-
, isPy3k
5
4
, chardet
6
5
, dnspython
7
6
, html5-parser
···
15
14
16
15
buildPythonPackage rec {
17
16
pname = "ludios_wpull";
18
-
version = "3.0.7";
17
+
version = "3.0.9";
19
18
20
-
disabled = (!isPy3k) || (pythonAtLeast "3.8");
19
+
# https://github.com/ArchiveTeam/ludios_wpull/issues/20
20
+
disabled = pythonAtLeast "3.9";
21
21
22
22
src = fetchFromGitHub {
23
23
rev = version;
24
24
owner = "ludios";
25
25
repo = "wpull";
26
-
sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
26
+
sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c";
27
27
};
28
28
29
29
propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ];
+12
-5
pkgs/tools/backup/grab-site/default.nix
+12
-5
pkgs/tools/backup/grab-site/default.nix
···
1
-
{ lib, python37, fetchFromGitHub }:
1
+
{ lib, python38, fetchFromGitHub }:
2
2
let
3
-
python = python37.override {
3
+
python = python38.override {
4
4
self = python;
5
5
packageOverrides = self: super: {
6
+
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
7
+
version = "1.3.24";
8
+
src = oldAttrs.src.override {
9
+
inherit version;
10
+
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
11
+
};
12
+
});
6
13
tornado = super.tornado_4;
7
14
};
8
15
};
···
10
17
in
11
18
with python.pkgs; buildPythonApplication rec {
12
19
pname = "grab-site";
13
-
version = "2.2.0";
20
+
version = "2.2.2";
14
21
15
22
src = fetchFromGitHub {
16
23
rev = version;
17
24
owner = "ArchiveTeam";
18
25
repo = "grab-site";
19
-
sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8";
26
+
sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4";
20
27
};
21
28
22
29
postPatch = ''
23
30
substituteInPlace setup.py \
24
-
--replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.7"' '"wpull"'
31
+
--replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"'
25
32
'';
26
33
27
34
propagatedBuildInputs = [