From 688f61b018faf7daa508db63cb166404512a4c28 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 1 May 2019 23:29:34 +0200
Subject: [PATCH 1/3] pythonPackages.tld: init at 0.9.3

---
 .../python-modules/tld/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/tld/default.nix

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
new file mode 100644
index 000000000000..85991af4ba13
--- /dev/null
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname   = "tld";
+  version = "0.9.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp";
+  };
+
+  doCheck = false;
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/barseghyanartur/tld;
+    description = "Extracts the top level domain (TLD) from the URL given";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ genesis ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85c961a40e94..049d1c85335c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5396,6 +5396,8 @@ in {
 
   textacy = callPackage ../development/python-modules/textacy { };
 
+  tld = callPackage ../development/python-modules/tld { };
+
   tldextract = callPackage ../development/python-modules/tldextract { };
 
   pyemd  = callPackage ../development/python-modules/pyemd { };

From 3a1792e7a14a1a74615c19c7fcf262e39b715a26 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 1 May 2019 23:31:04 +0200
Subject: [PATCH 2/3] photon: 1.0.7 -> 1.3.0

---
 pkgs/tools/networking/photon/default.nix | 28 ++++++++++--------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index aa5a3e9f6f11..5b923748c673 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, pythonPackages, fetchurl, makeWrapper }:
+{ stdenv, python3Packages, fetchFromGitHub, makeWrapper }:
 
-with pythonPackages;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "photon";
-  version = "1.0.7";
+  version = "1.3.0";
 
-  src = fetchurl {
-    url = "https://github.com/s0md3v/Photon/archive/v${version}.tar.gz";
-    sha256 = "0c5l1sbkkagfxmh8v7yvi6z58mhqbwjyr7fczb5qwxm7la42ah9y";
+  src = fetchFromGitHub {
+    owner = "s0md3v";
+    repo = "Photon";
+    rev = "v${version}";
+    sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy";
   };
 
-  patches = [ ./destdir.patch ];
-  postPatch = ''
-       substituteInPlace photon.py --replace DESTDIR $out/share/photon 
-  '';
-
   dontBuild = true;
   doCheck = false;
-  propagatedBuildInputs = [
-    requests
-    urllib3
-  ];
+
+  propagatedBuildInputs = with python3Packages; [ requests urllib3 tld ];
 
   installPhase = ''
     mkdir -p "$out"/{bin,share/photon}
     cp -R photon.py core plugins $out/share/photon
  
-    makeWrapper ${python.interpreter} $out/bin/photon \
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
       --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
       --add-flags "-O $out/share/photon/photon.py"
   '';

From 7a22dc48156a8db600240cdfd617f1ca1667a1b6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 1 May 2019 23:56:49 +0200
Subject: [PATCH 3/3] pythonPackages.tld: enable tests

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

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index 85991af4ba13..3a21ce57fe7a 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, buildPythonPackage, six }:
+{ stdenv, fetchPypi, python }:
 
-buildPythonPackage rec {
+python.pkgs.buildPythonPackage rec {
   pname   = "tld";
   version = "0.9.3";
 
@@ -9,8 +9,20 @@ buildPythonPackage rec {
     sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp";
   };
 
-  doCheck = false;
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = with python.pkgs; [ six ];
+  checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ];
+
+  # https://github.com/barseghyanartur/tld/issues/54
+  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+    "test_1_update_tld_names"
+    "test_1_update_tld_names_command"
+    "test_2_update_tld_names_module"
+  ]);
+
+  checkPhase = ''
+      export PATH="$PATH:$out/bin"
+      py.test -k '${disabledTests}'
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/barseghyanartur/tld;