From 7273800f1e796e98a34a417d621f7ecae09c218a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Feb 2021 11:13:00 +0000
Subject: [PATCH 1/2] python37Packages.ftfy: 5.8 -> 5.9
---
pkgs/development/python-modules/ftfy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index dbc363172288..42152240800f 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "ftfy";
- version = "5.8";
+ version = "5.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "081p5z20dirrf1i3nshylc31qd5mbxibjc7gzj8x4isbiizpdisi";
+ sha256 = "8c4fb2863c0b82eae2ab3cf353d9ade268dfbde863d322f78d6a9fd5cefb31e9";
};
propagatedBuildInputs = [
From cc4e9f3835758a4005cd7edb59e3923f356d43d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 11 Mar 2021 14:24:16 +0100
Subject: [PATCH 2/2] python3Packages.ftfy: use pytestCheckHook
---
pkgs/development/python-modules/ftfy/default.nix | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index 42152240800f..403ca5247923 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -2,10 +2,8 @@
, buildPythonPackage
, isPy3k
, fetchPypi
-, html5lib
, wcwidth
-, setuptools
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -20,18 +18,15 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- html5lib
wcwidth
- setuptools
];
checkInputs = [
- pytest
+ pytestCheckHook
];
- # We suffix PATH like this because the tests want the ftfy executable
- checkPhase = ''
- PATH=$out/bin:$PATH pytest
+ preCheck = ''
+ export PATH=$out/bin:$PATH
'';
meta = with lib; {