From 9438b0412628b4855aa929b3435a7597c2bab51a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 02:15:19 -0300
Subject: [PATCH 01/17] NetSurf: refactor

I will refactor NetSurf to make it more understandable and discoverable.

- First, it will be moved from misc/ to networking/browsers/, with all its
  related libraries;
- Second, the expressions will be arranged in a flat directory.
---
 pkgs/top-level/all-packages.nix | 45 ++-------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f410dac26863..c96371c83fb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5047,49 +5047,8 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
   };
 
-  netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
-    # ui could be gtk, sixel or framebuffer. Note that console display (sixel)
-    # requires a terminal that supports `sixel` capabilities such as mlterm
-    # or xterm -ti 340
-    ui = "sixel";
-
-    uilib = if ui == "gtk" then "gtk" else "framebuffer";
-
-    SDL = if ui == "gtk" then null else if ui == "sixel" then SDL_sixel else SDL;
-
-    buildsystem = callPackage ../applications/misc/netsurf/buildsystem { };
-
-    libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { };
-
-    nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { };
-
-    libparserutils = callPackage ../applications/misc/netsurf/libparserutils { };
-
-    libnslog = callPackage ../applications/misc/netsurf/libnslog { };
-
-    libcss = callPackage ../applications/misc/netsurf/libcss { };
-
-    libhubbub = callPackage ../applications/misc/netsurf/libhubbub { };
-
-    libdom = callPackage ../applications/misc/netsurf/libdom { };
-
-    libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { };
-
-    libnsgif = callPackage ../applications/misc/netsurf/libnsgif { };
-
-    libnsfb = callPackage ../applications/misc/netsurf/libnsfb { };
-
-    libnsutils = callPackage ../applications/misc/netsurf/libnsutils { };
-
-    libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { };
-
-    libnspsl = callPackage ../applications/misc/netsurf/libnspsl { };
-
-    libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { };
-
-    browser = callPackage ../applications/misc/netsurf/browser { };
-
-  });
+  netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });
+  netsurf-browser = netsurf.browser;
 
   netperf = callPackage ../applications/networking/netperf { };
 

From b055ec84fcf30729743fcc4649cc64b4e9753c8b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 02:49:06 -0300
Subject: [PATCH 02/17] Netsurf buildysstem: 1.8 -> 1.9

---
 .../misc/netsurf/buildsystem/default.nix      | 24 -------------------
 .../browsers/netsurf/buildsystem.nix          | 24 +++++++++++++++++++
 .../networking/browsers/netsurf/default.nix   |  5 ++++
 3 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/applications/misc/netsurf/buildsystem/default.nix
 create mode 100644 pkgs/applications/networking/browsers/netsurf/buildsystem.nix
 create mode 100644 pkgs/applications/networking/browsers/netsurf/default.nix

diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
deleted file mode 100644
index 9d690546102a..000000000000
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-
-  pname = "netsurf-buildsystem";
-  version = "1.8";
-
-  src = fetchurl {
-    url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
-    sha256 = "0ffdjwskxlnh8sk40qqfgksbb1nrdzfxsshrscra0p4nqpkj98z6";
-  };
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
-    description = "Build system for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
new file mode 100644
index 000000000000..2d625b725446
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "netsurf-${libname}";
+  libname = "buildsystem";
+  version = "1.9";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz";
+    sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.netsurf-browser.org/";
+    description = "NetSurf browser shared build system";
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
new file mode 100644
index 000000000000..338fc58146a9
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -0,0 +1,5 @@
+{ lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+  buildsystem    = callPackage ./buildsystem.nix { };
+})

From 0f845601f6000e8b70d9f2e863a97ee9be50df1b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 02:54:15 -0300
Subject: [PATCH 03/17] Netsurf libparserutils: 0.2.4 -> 0.2.4

Update metadata and maintain version
---
 .../networking/browsers/netsurf/default.nix         |  1 +
 .../browsers/netsurf/libparserutils.nix}            | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/{misc/netsurf/libparserutils/default.nix => networking/browsers/netsurf/libparserutils.nix} (60%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 338fc58146a9..91177b29e2ef 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -2,4 +2,5 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
+  libparserutils = callPackage ./libparserutils.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
similarity index 60%
rename from pkgs/applications/misc/netsurf/libparserutils/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libparserutils.nix
index 9fcd5cfebf6e..b96018d92eb8 100644
--- a/pkgs/applications/misc/netsurf/libparserutils/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
@@ -3,17 +3,16 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libparserutils";
   version = "0.2.4";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj";
+    sha256 = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
   };
 
-  buildInputs = [ buildsystem perl ];
+  buildInputs = [ perl buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -21,10 +20,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "Parser building library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From b06a3b1fcbe65f2ede386524d1db7d9b48117f11 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:02:31 -0300
Subject: [PATCH 04/17] Netsurf libnsbmp: 0.1.6 -> 0.1.6

---
 .../networking/browsers/netsurf/default.nix       |  1 +
 .../browsers/netsurf/libnsbmp.nix}                | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/applications/{misc/netsurf/libnsbmp/default.nix => networking/browsers/netsurf/libnsbmp.nix} (63%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 91177b29e2ef..d9559f38a7bf 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -2,5 +2,6 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
+  libnsbmp       = callPackage ./libnsbmp.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
similarity index 63%
rename from pkgs/applications/misc/netsurf/libnsbmp/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
index 8a7e8b607417..95487eed00fc 100644
--- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
@@ -3,20 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libnsbmp";
   version = "0.1.6";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r";
+    sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    buildsystem
-  ];
+  buildInputs = [ buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -24,10 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/";
     description = "BMP Decoder for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From bf98c55b76257bd1bced94297a4587c95b40d2cf Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:05:18 -0300
Subject: [PATCH 05/17] Netsurf libnsgif: 0.2.1 -> 0.2.1

---
 .../networking/browsers/netsurf/default.nix         |  1 +
 .../browsers/netsurf/libnsgif.nix}                  | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/{misc/netsurf/libnsgif/default.nix => networking/browsers/netsurf/libnsgif.nix} (62%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index d9559f38a7bf..cc97ea658e4a 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -3,5 +3,6 @@
 lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
   libnsbmp       = callPackage ./libnsbmp.nix { };
+  libnsgif       = callPackage ./libnsgif.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
similarity index 62%
rename from pkgs/applications/misc/netsurf/libnsgif/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libnsgif.nix
index 8bb67df70da9..d8683280c4e1 100644
--- a/pkgs/applications/misc/netsurf/libnsgif/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
@@ -3,18 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libnsgif";
   version = "0.2.1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly";
+    sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ buildsystem];
+  buildInputs = [ buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "GIF Decoder for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };
 }

From d1e5d5012fdad05935662ef47865ad956db4ed53 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:10:13 -0300
Subject: [PATCH 06/17] Netsurf libnslog: 0.1.2 -> 0.1.3

---
 .../networking/browsers/netsurf/default.nix     |  1 +
 .../browsers/netsurf/libnslog.nix}              | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/applications/{misc/netsurf/libnslog/default.nix => networking/browsers/netsurf/libnslog.nix} (62%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index cc97ea658e4a..db55e4026575 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -4,5 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
   libnsbmp       = callPackage ./libnsbmp.nix { };
   libnsgif       = callPackage ./libnsgif.nix { };
+  libnslog       = callPackage ./libnslog.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix
similarity index 62%
rename from pkgs/applications/misc/netsurf/libnslog/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libnslog.nix
index 43b4622ab03a..12fdcff50bd3 100644
--- a/pkgs/applications/misc/netsurf/libnslog/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix
@@ -3,20 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libnslog";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd";
+    sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=";
   };
 
   nativeBuildInputs = [ pkgconfig bison flex ];
-  buildInputs = [
-    buildsystem
-  ];
+  buildInputs = [ buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -24,10 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/";
     description = "NetSurf Parametric Logging Library";
-    license = licenses.mit;
-    maintainers = [ maintainers.samueldr ];
+    license = licenses.isc;
+    maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From 88ef1ffe46125b01eefcf7f0f9b8a42f90907354 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:19:39 -0300
Subject: [PATCH 07/17] Netsurf libnspsl: 0.1.5 -> 0.1.6

---
 .../networking/browsers/netsurf/default.nix       |  1 +
 .../browsers/netsurf/libnspsl.nix}                | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/applications/{misc/netsurf/libnspsl/default.nix => networking/browsers/netsurf/libnspsl.nix} (65%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index db55e4026575..6c35be4c8da9 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -5,5 +5,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   libnsbmp       = callPackage ./libnsbmp.nix { };
   libnsgif       = callPackage ./libnsgif.nix { };
   libnslog       = callPackage ./libnslog.nix { };
+  libnspsl       = callPackage ./libnspsl.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libnspsl/default.nix b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix
similarity index 65%
rename from pkgs/applications/misc/netsurf/libnspsl/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libnspsl.nix
index 5ded38d974e0..4338f78247c7 100644
--- a/pkgs/applications/misc/netsurf/libnspsl/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix
@@ -3,20 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libnspsl";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd";
+    sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    buildsystem
-  ];
+  buildInputs = [ buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -24,10 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/";
     description = "NetSurf Public Suffix List - Handling library";
     license = licenses.mit;
-    maintainers = [ maintainers.samueldr ];
+    maintainers =  [ maintainers.samueldr maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From 91f818b2be8ada0617e0f79c554d32fe93ac9dd8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:24:38 -0300
Subject: [PATCH 08/17] Netsurf libnsutils: 0.0.5 -> 0.1.0

---
 .../networking/browsers/netsurf/default.nix       |  1 +
 .../browsers/netsurf/libnsutils.nix}              | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/applications/{misc/netsurf/libnsutils/default.nix => networking/browsers/netsurf/libnsutils.nix} (60%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 6c35be4c8da9..861081077a84 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -6,5 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   libnsgif       = callPackage ./libnsgif.nix { };
   libnslog       = callPackage ./libnslog.nix { };
   libnspsl       = callPackage ./libnspsl.nix { };
+  libnsutils     = callPackage ./libnsutils.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix
similarity index 60%
rename from pkgs/applications/misc/netsurf/libnsutils/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libnsutils.nix
index 6d3a3d1f104f..42c8b8b06214 100644
--- a/pkgs/applications/misc/netsurf/libnsutils/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix
@@ -3,18 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libnsutils";
-  version = "0.0.5";
+  version = "0.1.0";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf";
+    sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ buildsystem];
+  buildInputs = [ buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "Generalised utility library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From fc5cb71883bef2f792f6fb2051c126ccd686df90 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:26:51 -0300
Subject: [PATCH 09/17] Netsurf libutf8proc: 2.4.0-1

---
 .../networking/browsers/netsurf/default.nix         |  1 +
 .../browsers/netsurf/libutf8proc.nix}               | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/{misc/netsurf/libutf8proc/default.nix => networking/browsers/netsurf/libutf8proc.nix} (63%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 861081077a84..a7465c0fda9d 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -8,4 +8,5 @@ lib.makeScope pkgs.newScope (self: with self; {
   libnspsl       = callPackage ./libnspsl.nix { };
   libnsutils     = callPackage ./libnsutils.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
+  libutf8proc    = callPackage ./libutf8proc.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
similarity index 63%
rename from pkgs/applications/misc/netsurf/libutf8proc/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
index dcd56182e320..59bae9e941eb 100644
--- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
@@ -3,18 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libutf8proc";
   version = "2.4.0-1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0wn409laqaqlqnz2d77419b5rya99vvc696vj187biy1i5livaq1";
+    sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ buildsystem];
+  buildInputs = [ buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "UTF8 Processing library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From b537eb29c013c27e640753a6d3b64f9206f5a4f5 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:30:14 -0300
Subject: [PATCH 10/17] Netsurf libwapcaplet: 0.4.2 -> 0.4.3

---
 .../networking/browsers/netsurf/default.nix         |  1 +
 .../browsers/netsurf/libwapcaplet.nix}              | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/{misc/netsurf/libwapcaplet/default.nix => networking/browsers/netsurf/libwapcaplet.nix} (65%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index a7465c0fda9d..de68a0428691 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -9,4 +9,5 @@ lib.makeScope pkgs.newScope (self: with self; {
   libnsutils     = callPackage ./libnsutils.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
   libutf8proc    = callPackage ./libutf8proc.nix { };
+  libwapcaplet   = callPackage ./libwapcaplet.nix { };
 })
diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
similarity index 65%
rename from pkgs/applications/misc/netsurf/libwapcaplet/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
index f3c7bcbd1a0e..8c5af461fd06 100644
--- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
@@ -3,14 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libwapcaplet";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86";
+    sha256 = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=";
   };
 
   buildInputs = [ buildsystem ];
@@ -23,10 +22,10 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "String internment library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From d5832afa3e0249ce77f012c2d9419b16ae757c29 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:32:24 -0300
Subject: [PATCH 11/17] Netsurf nsgenbind: 0.7 -> 0.8

---
 .../misc/netsurf/nsgenbind/default.nix        | 30 -------------------
 .../networking/browsers/netsurf/default.nix   |  1 +
 .../networking/browsers/netsurf/nsgenbind.nix | 30 +++++++++++++++++++
 3 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/misc/netsurf/nsgenbind/default.nix
 create mode 100644 pkgs/applications/networking/browsers/netsurf/nsgenbind.nix

diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
deleted file mode 100644
index 2dd4b830102a..000000000000
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl
-, flex, bison
-, buildsystem
-}:
-
-stdenv.mkDerivation rec {
-
-  pname = "netsurf-nsgenbind";
-  version = "0.7";
-
-  src = fetchurl {
-    url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz";
-    sha256 = "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq";
-  };
-
-  buildInputs = [ buildsystem flex bison ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
-    description = "Generator for JavaScript bindings for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index de68a0428691..7c5b98a7ea6a 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -10,4 +10,5 @@ lib.makeScope pkgs.newScope (self: with self; {
   libparserutils = callPackage ./libparserutils.nix { };
   libutf8proc    = callPackage ./libutf8proc.nix { };
   libwapcaplet   = callPackage ./libwapcaplet.nix { };
+  nsgenbind      = callPackage ./nsgenbind.nix { };
 })
diff --git a/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix b/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix
new file mode 100644
index 000000000000..0be7adc4a595
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl
+, flex, bison
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+  pname = "netsurf-${libname}";
+  libname = "nsgenbind";
+  version = "0.8";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
+  };
+
+  buildInputs = [ flex bison buildsystem ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.netsurf-browser.org/";
+    description = "Generator for JavaScript bindings for netsurf browser";
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}

From d6d7ead024395125982934e3d21832a5a92df72f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:35:38 -0300
Subject: [PATCH 12/17] Netsurf libcss: 0.9.0 -> 0.9.1

---
 .../networking/browsers/netsurf/default.nix   |  1 +
 .../browsers/netsurf/libcss.nix}              | 29 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)
 rename pkgs/applications/{misc/netsurf/libcss/default.nix => networking/browsers/netsurf/libcss.nix} (50%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 7c5b98a7ea6a..25ef6c048ee9 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -2,6 +2,7 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
+  libcss         = callPackage ./libcss.nix { };
   libnsbmp       = callPackage ./libnsbmp.nix { };
   libnsgif       = callPackage ./libnsgif.nix { };
   libnslog       = callPackage ./libnslog.nix { };
diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix
similarity index 50%
rename from pkgs/applications/misc/netsurf/libcss/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libcss.nix
index 528b0d9b9585..db907edd8799 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix
@@ -1,26 +1,25 @@
 { stdenv, fetchurl, pkgconfig, perl
 , buildsystem
-, libwapcaplet
 , libparserutils
+, libwapcaplet
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libcss";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr";
+    sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl
-    buildsystem
-    libwapcaplet
+  buildInputs = [
+    perl
     libparserutils
-  ];
+    libwapcaplet
+    buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -30,10 +29,16 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough";
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "Cascading Style Sheets library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    longDescription = ''
+      LibCSS is a CSS parser and selection engine. It aims to parse the forward
+      compatible CSS grammar. It was developed as part of the NetSurf project
+      and is available for use by other software, under a more permissive
+      license.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From 486a3fb5569a9503eb5399103ae6213192b6bf81 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:40:19 -0300
Subject: [PATCH 13/17] Netsurf libhubub: 0.3.6 -> 0.3.7

---
 .../misc/netsurf/libhubbub/default.nix        | 35 ---------------
 .../networking/browsers/netsurf/default.nix   |  1 +
 .../networking/browsers/netsurf/libhubbub.nix | 44 +++++++++++++++++++
 3 files changed, 45 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/misc/netsurf/libhubbub/default.nix
 create mode 100644 pkgs/applications/networking/browsers/netsurf/libhubbub.nix

diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix
deleted file mode 100644
index 7cfd0a935f3d..000000000000
--- a/pkgs/applications/misc/netsurf/libhubbub/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, perl
-, buildsystem
-, libparserutils
-}:
-
-stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
-  libname = "libhubbub";
-  version = "0.3.6";
-
-  src = fetchurl {
-    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl
-    buildsystem
-    libparserutils
-  ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
-    description = "HTML5 parser library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 25ef6c048ee9..7aa18f514fb1 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -3,6 +3,7 @@
 lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
   libcss         = callPackage ./libcss.nix { };
+  libhubbub      = callPackage ./libhubbub.nix { };
   libnsbmp       = callPackage ./libnsbmp.nix { };
   libnsgif       = callPackage ./libnsgif.nix { };
   libnslog       = callPackage ./libnslog.nix { };
diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix
new file mode 100644
index 000000000000..53b8d270d4f6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, pkgconfig, perl
+, buildsystem
+, libparserutils
+}:
+
+stdenv.mkDerivation rec {
+  pname = "netsurf-${libname}";
+  libname = "libhubbub";
+  version = "0.3.7";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    perl
+    libparserutils
+    buildsystem ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.netsurf-browser.org/projects/hubbub/";
+    description = "HTML5 parser library for netsurf browser";
+    longDescription = ''
+      Hubbub is an HTML5 compliant parsing library, written in C. It was
+      developed as part of the NetSurf project and is available for use by other
+      software under the MIT licence.
+
+      The HTML5 specification defines a parsing algorithm, based on the
+      behaviour of mainstream browsers, which provides instructions for how to
+      parse all markup, both valid and invalid. As a result, Hubbub parses web
+      content well.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}

From ed204dc61bf393683c15286c312e4b0ec1ef770a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:43:38 -0300
Subject: [PATCH 14/17] Netsurf libdom: 0.4.0 -> 0.4.1

---
 .../networking/browsers/netsurf/default.nix   |  1 +
 .../browsers/netsurf/libdom.nix}              | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)
 rename pkgs/applications/{misc/netsurf/libdom/default.nix => networking/browsers/netsurf/libdom.nix} (50%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 7aa18f514fb1..0698642af00d 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -3,6 +3,7 @@
 lib.makeScope pkgs.newScope (self: with self; {
   buildsystem    = callPackage ./buildsystem.nix { };
   libcss         = callPackage ./libcss.nix { };
+  libdom         = callPackage ./libdom.nix { };
   libhubbub      = callPackage ./libhubbub.nix { };
   libnsbmp       = callPackage ./libnsbmp.nix { };
   libnsgif       = callPackage ./libnsgif.nix { };
diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix
similarity index 50%
rename from pkgs/applications/misc/netsurf/libdom/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libdom.nix
index 8dde3e336cdb..3aa9e3a1878e 100644
--- a/pkgs/applications/misc/netsurf/libdom/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix
@@ -6,23 +6,22 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libdom";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy";
+    sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ expat
-    buildsystem
+  buildInputs = [
+    expat
+    libhubbub
     libparserutils
     libwapcaplet
-    libhubbub
-  ];
+    buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -30,10 +29,15 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "Document Object Model library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    longDescription = ''
+      LibDOM is an implementation of the W3C DOM, written in C. It is currently
+      in development for use with NetSurf and is intended to be suitable for use
+      in other projects under a more permissive license.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From a5c9ce767b1eba17da40a7cf952831fd3448329b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:45:02 -0300
Subject: [PATCH 15/17] Netsurf libsvgtiny: 0.1.7 -> 0.1.7

---
 .../networking/browsers/netsurf/default.nix          |  1 +
 .../browsers/netsurf/libsvgtiny.nix}                 | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/applications/{misc/netsurf/libsvgtiny/default.nix => networking/browsers/netsurf/libsvgtiny.nix} (71%)

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 0698642af00d..6f2569548ed5 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -11,6 +11,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   libnspsl       = callPackage ./libnspsl.nix { };
   libnsutils     = callPackage ./libnsutils.nix { };
   libparserutils = callPackage ./libparserutils.nix { };
+  libsvgtiny     = callPackage ./libsvgtiny.nix { };
   libutf8proc    = callPackage ./libutf8proc.nix { };
   libwapcaplet   = callPackage ./libwapcaplet.nix { };
   nsgenbind      = callPackage ./nsgenbind.nix { };
diff --git a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
similarity index 71%
rename from pkgs/applications/misc/netsurf/libsvgtiny/default.nix
rename to pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
index b6e1b5a1667e..aef154bbc17c 100644
--- a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
@@ -7,24 +7,22 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
+  pname = "netsurf-${libname}";
   libname = "libsvgtiny";
   version = "0.1.7";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c";
+    sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
   };
 
   nativeBuildInputs = [ pkgconfig gperf ];
   buildInputs = [
-    buildsystem
     libdom
     libhubbub
     libparserutils
     libwapcaplet
-  ];
+    buildsystem ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -32,10 +30,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
     description = "NetSurf SVG decoder";
     license = licenses.mit;
-    maintainers = [ maintainers.samueldr ];
+    maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From 66fac9a0bf59b64f8a6c6b3ad2974bd824e9e9ba Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:48:46 -0300
Subject: [PATCH 16/17] Netsurf libnsfb: 0.2.1 -> 0.2.2

---
 .../misc/netsurf/libnsfb/default.nix          | 32 -------------------
 .../networking/browsers/netsurf/default.nix   | 16 ++++++++++
 .../networking/browsers/netsurf/libnsfb.nix   | 32 +++++++++++++++++++
 3 files changed, 48 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/misc/netsurf/libnsfb/default.nix
 create mode 100644 pkgs/applications/networking/browsers/netsurf/libnsfb.nix

diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix
deleted file mode 100644
index 4e56ce7f5a12..000000000000
--- a/pkgs/applications/misc/netsurf/libnsfb/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, uilib? "framebuffer", SDL
-, buildsystem
-}:
-
-stdenv.mkDerivation rec {
-
-  name = "netsurf-${libname}-${version}";
-  libname = "libnsfb";
-  version = "0.2.1";
-
-  src = fetchurl {
-    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "09qag9lgn5ahanbcyf2rvfmsz15vazfwnl8xpn8f1iczd44b0bv0";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ buildsystem SDL ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
-    "TARGET=${uilib}"
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
-    description = "CSS parser and selection library for netsurf browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 6f2569548ed5..627a84df2be5 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -1,11 +1,27 @@
 { lib, pkgs }:
 
 lib.makeScope pkgs.newScope (self: with self; {
+  # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel)
+  # requires a terminal that supports `sixel` capabilities, such as mlterm
+  # or xterm -ti 340
+  ui = "gtk3";
+  uilib =
+    if ui == "gtk2" ||
+       ui == "gtk3" ||
+       ui == "framebuffer" then ui
+    else if ui == "sixel" then "framebuffer"
+    else null; # Never will happen
+  SDL =
+    if ui == "sixel" then pkgs.SDL_sixel
+    else if ui == "framebuffer" then pkgs.SDL
+    else null;
+
   buildsystem    = callPackage ./buildsystem.nix { };
   libcss         = callPackage ./libcss.nix { };
   libdom         = callPackage ./libdom.nix { };
   libhubbub      = callPackage ./libhubbub.nix { };
   libnsbmp       = callPackage ./libnsbmp.nix { };
+  libnsfb        = callPackage ./libnsfb.nix { };
   libnsgif       = callPackage ./libnsgif.nix { };
   libnslog       = callPackage ./libnslog.nix { };
   libnspsl       = callPackage ./libnspsl.nix { };
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix
new file mode 100644
index 000000000000..d37766f5330f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig
+, uilib, SDL
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+  pname = "netsurf-${libname}";
+  libname = "libnsfb";
+  version = "0.2.2";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ SDL buildsystem ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+    "TARGET=${uilib}"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+    description = "Netsurf framebuffer abstraction library";
+    license = licenses.mit;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}

From 30729522955f1d43edc6a4af4004b323e23435a6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Sep 2020 03:50:11 -0300
Subject: [PATCH 17/17] Netsurf browser: 3.9 -> 3.10

---
 .../browsers/netsurf/browser.nix}             | 45 ++++++++-----------
 .../networking/browsers/netsurf/default.nix   |  2 +
 2 files changed, 21 insertions(+), 26 deletions(-)
 rename pkgs/applications/{misc/netsurf/browser/default.nix => networking/browsers/netsurf/browser.nix} (63%)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix
similarity index 63%
rename from pkgs/applications/misc/netsurf/browser/default.nix
rename to pkgs/applications/networking/browsers/netsurf/browser.nix
index f2fdd01215d6..407d94a4dc45 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/browser.nix
@@ -1,25 +1,21 @@
 { stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
 
 # Buildtime dependencies.
-
 , check, pkgconfig, xxd
 
 # Runtime dependencies.
-
 , curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2
 , openssl, perl, perlPackages
 
 # uilib-specific dependencies
-
 , gtk2 # GTK 2
+, gtk3 # GTK 3
 , SDL  # Framebuffer
 
 # Configuration
-
-, uilib ? "framebuffer"
+, uilib
 
 # Netsurf-specific dependencies
-
 , libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif
 , libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc
 , libwapcaplet, nsgenbind
@@ -29,24 +25,14 @@ let
   inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
-
   pname = "netsurf";
-  version = "3.9";
+  version = "3.10";
 
   src = fetchurl {
-    url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
-    sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
+    url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz";
+    sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
   };
 
-  patches = [
-    # GTK: prefer using curl's intrinsic defaults for CURLOPT_CA*
-    (fetchpatch {
-	  name = "0001-GTK-prefer-using-curl-s-intrinsic-defaults-for-CURLO.patch";
-      url = "http://source.netsurf-browser.org/netsurf.git/patch/?id=87177d8aa109206d131e0d80a2080ce55dab01c7";
-      sha256 = "08bc60pc5k5qpckqv21zgmgszj3rpwskfc84shs8vg92vkimv2ai";
-    })
-  ];
-
   nativeBuildInputs = [
     makeWrapper
     perl
@@ -54,10 +40,10 @@ stdenv.mkDerivation rec {
     pkgconfig
     xxd
   ]
-  ++ optional (uilib == "gtk") wrapGAppsHook
+  ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook
   ;
 
-  buildInputs = [ 
+  buildInputs = [
     check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl
     # Netsurf-specific libraries
     nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss
@@ -65,7 +51,8 @@ stdenv.mkDerivation rec {
     libutf8proc
   ]
   ++ optionals (uilib == "framebuffer") [ expat SDL ]
-  ++ optional (uilib == "gtk") gtk2
+  ++ optional (uilib == "gtk2") gtk2
+  ++ optional (uilib == "gtk3") gtk3
   ;
 
   preConfigure = ''
@@ -81,10 +68,16 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
-    description = "Free opensource web browser";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.vrthra ];
+    homepage = "https://www.netsurf-browser.org/";
+    description = "A free, open source, small web browser";
+    longDescription = ''
+      NetSurf is a free, open source web browser. It is written in C and
+      released under the GNU Public Licence version 2. NetSurf has its own
+      layout and rendering engine entirely written from scratch. It is small and
+      capable of handling many of the web standards in use today.
+    '';
+    license = licenses.gpl2Only;
+    maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 627a84df2be5..409ab80ce3ac 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -16,6 +16,8 @@ lib.makeScope pkgs.newScope (self: with self; {
     else if ui == "framebuffer" then pkgs.SDL
     else null;
 
+  browser = callPackage ./browser.nix { };
+
   buildsystem    = callPackage ./buildsystem.nix { };
   libcss         = callPackage ./libcss.nix { };
   libdom         = callPackage ./libdom.nix { };