From 79d98706cdfa9be24526a9b00cc5fd3698242ed6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Oct 2020 19:59:52 +0000 Subject: [PATCH 1/2] python27Packages.pytest-twisted: 1.12 -> 1.13.2 --- pkgs/development/python-modules/pytest-twisted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index 6bdf1089d5d..19e1091c8c7 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.12"; + version = "1.13.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bb9af117c5c6063d9ef20ffdf2fa297caaf57de5a687e4d3607db7b0a6f74fea"; + sha256 = "cee2320becc5625050ab221b8f38533e636651a24644612f4726891fdf1f1847"; }; propagatedBuildInputs = [ greenlet pytest decorator ]; From 71e7f74ca669e6ed16833a63201d98f70462219d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 4 Oct 2020 04:20:00 +0000 Subject: [PATCH 2/2] python38Packages.scrapy-fake-useragent: fix build --- .../scrapy-fake-useragent/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index d3bf05b0965..a9199614f46 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }: +{ stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; version = "1.4.4"; - src = fetchPypi { - inherit pname version; - sha256 = "3b17e982e646918dc25080da0672812d07bfb7a92a58377c014c74e0182c665e"; + # PyPi tarball is corrupted + src = fetchFromGitHub { + owner = "alecxe"; + repo = pname; + rev = "59c20d38c58c76618164760d546aa5b989a79b8b"; # no tags + sha256 = "0yb7d51jws665rdfqkmi077w0pjxmb2ni7ysphj7lx7b18whq54j"; }; - propagatedBuildInputs = [ fake-useragent ]; + propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytest scrapy ]; + checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; meta = with stdenv.lib; { description = "Random User-Agent middleware based on fake-useragent";