From 9852c79bca5864406af80cc6b6a21dbbe1575963 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 13 Jan 2021 08:55:21 +0100
Subject: [PATCH 1/3] python3Packages.tld: 0.12.4 -> 0.12.5

---
 pkgs/development/python-modules/tld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index 01aa6a29005..bae33c6c132 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -2,11 +2,11 @@
 
 python.pkgs.buildPythonPackage rec {
   pname   = "tld";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0976g7jcpi3jv7snawmfis5ybb6737cv2xw7wlanlfkyqljip24x";
+    sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv";
   };
 
   propagatedBuildInputs = with python.pkgs; [ six ];

From b5556fe6b45fd6840122fd8cc4229daa3082d48e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 13 Jan 2021 09:08:47 +0100
Subject: [PATCH 2/3] python3Packages.tld: update check part

---
 .../python-modules/tld/default.nix            | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index bae33c6c132..374edc4cec5 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -1,7 +1,16 @@
-{ lib, stdenv, fetchPypi, python }:
+{ lib
+, buildPythonPackage
+, factory_boy
+, faker
+, fetchPypi
+, pytest-cov
+, pytestCheckHook
+, six
+, tox
+}:
 
-python.pkgs.buildPythonPackage rec {
-  pname   = "tld";
+buildPythonPackage rec {
+  pname = "tld";
   version = "0.12.5";
 
   src = fetchPypi {
@@ -9,25 +18,15 @@ python.pkgs.buildPythonPackage rec {
     sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv";
   };
 
-  propagatedBuildInputs = with python.pkgs; [ six ];
-  checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook];
-
-  # https://github.com/barseghyanartur/tld/issues/54
-  disabledTests = [
-    "test_1_update_tld_names"
-    "test_1_update_tld_names_command"
-    "test_2_update_tld_names_module"
+  checkInputs = [
+    factory_boy
+    faker
+    pytest-cov
+    pytestCheckHook
+    tox
   ];
 
-  preCheck = ''
-    export PATH="$PATH:$out/bin"
-  '';
-
-  dontUseSetuptoolsCheck = true;
-
-  pythonImportsCheck = [
-    "tld"
-  ];
+  pythonImportsCheck = [ "tld" ];
 
   meta = with lib; {
     homepage = "https://github.com/barseghyanartur/tld";

From d155274fb2726f31953f0a8cc8cf7ac6227007dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 13 Jan 2021 09:12:46 +0100
Subject: [PATCH 3/3] python3Packages.tld: update meta, especially license

---
 pkgs/development/python-modules/tld/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index 374edc4cec5..13f23edaad1 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -31,8 +31,9 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/barseghyanartur/tld";
     description = "Extracts the top level domain (TLD) from the URL given";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    # https://github.com/barseghyanartur/tld/blob/master/README.rst#license
+    # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
+    license = with licenses; [ lgpl21Plus mpl11 gpl2Only ];
+    maintainers = with maintainers; [ fab ];
   };
-
 }