git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #142826 from ivan/grab-site-2.2.2
commit51d563068782d1cc039e012fca92fc813c242158 authorSandro <sandro.jaeckel@gmail.com> dateSat 20 Nov 2021, 19:08 (5 years ago) parent389610b7769bdc
2 files changed+19−12
compare with master
unifiedsplit
pkgs/development/python-modules/ludios_wpull/default.nix+7−7 pkgs/tools/backup/grab-site/default.nix+12−5
pkgs/development/python-modules/ludios_wpull/default.nix+7−7
@@ -1,7 +1,6 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4−, isPy3k
54, chardet
65, dnspython
76, html5-parser
@@ -15,15 +14,16 @@
1514
1615buildPythonPackage rec {
1716 pname = "ludios_wpull";
18− version = "3.0.7";
17+ version = "3.0.9";
1918
20− disabled = (!isPy3k) || (pythonAtLeast "3.8");
19+ # https://github.com/ArchiveTeam/ludios_wpull/issues/20
20+ disabled = pythonAtLeast "3.9";
2121
2222 src = fetchFromGitHub {
2323 rev = version;
24− owner = "ludios";
25− repo = "wpull";
26− sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
24+ owner = "ArchiveTeam";
25+ repo = "ludios_wpull";
26+ sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c";
2727 };
2828
2929 propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
3333
3434 meta = {
3535 description = "Web crawler; fork of wpull used by grab-site";
36− homepage = "https://github.com/ludios/wpull";
36+ homepage = "https://github.com/ArchiveTeam/ludios_wpull";
3737 license = lib.licenses.gpl3;
3838 maintainers = with lib.maintainers; [ ivan ];
3939 broken = lib.versions.major tornado.version != "4";
pkgs/tools/backup/grab-site/default.nix+12−5
@@ -1,8 +1,15 @@
1−{ lib, python37, fetchFromGitHub }:
1+{ lib, python38, fetchFromGitHub }:
22let
3− python = python37.override {
3+ python = python38.override {
44 self = python;
55 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+ });
613 tornado = super.tornado_4;
714 };
815 };
@@ -10,18 +17,18 @@ let
1017in
1118with python.pkgs; buildPythonApplication rec {
1219 pname = "grab-site";
13− version = "2.2.0";
20+ version = "2.2.2";
1421
1522 src = fetchFromGitHub {
1623 rev = version;
1724 owner = "ArchiveTeam";
1825 repo = "grab-site";
19− sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8";
26+ sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4";
2027 };
2128
2229 postPatch = ''
2330 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"'
2532 '';
2633
2734 propagatedBuildInputs = [