mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Merge pull request #142826 from ivan/grab-site-2.2.2

Browse source
This commit is contained in:
Sandro 2021-11-20 19:08:53 +01:00 committed by GitHub
parent 389610b208 7769bdce13
commit 51d5630687
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/python-modules/ludios_wpull/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, chardet
, dnspython
, html5-parser
@ -15,15 +14,16 @@
buildPythonPackage rec {
pname = "ludios_wpull";
version = "3.0.7";
version = "3.0.9";
disabled = (!isPy3k) || (pythonAtLeast "3.8");
# https://github.com/ArchiveTeam/ludios_wpull/issues/20
disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
rev = version;
owner = "ludios";
repo = "wpull";
sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
owner = "ArchiveTeam";
repo = "ludios_wpull";
sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c";
};
propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ];
@ -33,7 +33,7 @@ buildPythonPackage rec {
meta = {
description = "Web crawler; fork of wpull used by grab-site";
homepage = "https://github.com/ludios/wpull";
homepage = "https://github.com/ArchiveTeam/ludios_wpull";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ivan ];
broken = lib.versions.major tornado.version != "4";

17
pkgs/tools/backup/grab-site/default.nix
View file

@ -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 = [