From 063f110e179c778dfcbfbd8a3008c17e67066d3a Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Tue, 4 Jul 2017 08:31:36 +0100
Subject: [PATCH] urlscan: 0.8.3 -> 0.8.6 (#27102)

* urlscan: 0.8.3 -> 0.8.6

Moved from python-packages.nix to all-packages.nix because this is not
a Python library but just a Python application.

* Update default.nix

* Update all-packages.nix

* Update default.nix

* Update all-packages.nix
---
 pkgs/applications/misc/urlscan/default.nix | 16 ++++++----------
 pkgs/top-level/all-packages.nix            |  2 ++
 pkgs/top-level/python-packages.nix         |  2 --
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index dc9cb3189d5b..7c4def952104 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, urwid, pythonOlder }:
+{ stdenv, python3Packages, fetchFromGitHub }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "urlscan-${version}";
-  version = "0.8.3";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "urlscan";
     rev = version;
-    # (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5")
-    sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y";
+    sha256 = "1v26fni64n0lbv37m35plh2bsrvhpb4ibgmg2mv05qfc3df721s5";
   };
 
-  propagatedBuildInputs = [ urwid ];
-
-  # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
-  disabled = !pythonOlder "3.5";
+  propagatedBuildInputs = [ python3Packages.urwid ];
 
   meta = with stdenv.lib; {
     description = "Mutt and terminal url selector (similar to urlview)";
     license = licenses.gpl2;
-    maintainers = [ maintainers.dpaetzel ];
+    maintainers = with maintainers; [ dpaetzel jfrankenau ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 361b299e5f6b..fd1bc9bf7de8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4532,6 +4532,8 @@ with pkgs;
 
   uriparser = callPackage ../development/libraries/uriparser {};
 
+  urlscan = callPackage ../applications/misc/urlscan { };
+
   urlview = callPackage ../applications/misc/urlview {};
 
   usbmuxd = callPackage ../tools/misc/usbmuxd {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ba65b8a41bc..89f78e496d0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30308,8 +30308,6 @@ EOF
 
   uranium = callPackage ../development/python-modules/uranium { };
 
-  urlscan = callPackage ../applications/misc/urlscan { };
-
   vine = buildPythonPackage rec {
     name = "vine-${version}";
     version = "1.1.3";