git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #98991 from AndersonTorres/netsurf-upload

Netsurf: a huge rewrite+update!

commit9f973593c81e4bbd78afe8e72394e2eb47a85c8d authorAnderson Torres <torres.anderson.85@protonmail.com> dateTue 29 Sep 2020, 15:01 (6 years ago) parentc7698843072952
22 files changed+274−284
pkgs/applications/misc/netsurf/buildsystem/default.nix−24 pkgs/applications/misc/netsurf/libhubbub/default.nix−35 pkgs/applications/misc/netsurf/libnsfb/default.nix−32 pkgs/applications/misc/netsurf/nsgenbind/default.nix−30 pkgs/applications/misc/netsurf/browser/default.nix → pkgs/applications/networking/browsers/netsurf/browser.nix+19−26 pkgs/applications/networking/browsers/netsurf/buildsystem.nix+24 pkgs/applications/networking/browsers/netsurf/default.nix+36 pkgs/applications/misc/netsurf/libcss/default.nix → pkgs/applications/networking/browsers/netsurf/libcss.nix+17−12 pkgs/applications/misc/netsurf/libdom/default.nix → pkgs/applications/networking/browsers/netsurf/libdom.nix+15−11 pkgs/applications/networking/browsers/netsurf/libhubbub.nix+44 pkgs/applications/misc/netsurf/libnsbmp/default.nix → pkgs/applications/networking/browsers/netsurf/libnsbmp.nix+6−9 pkgs/applications/networking/browsers/netsurf/libnsfb.nix+32 pkgs/applications/misc/netsurf/libnsgif/default.nix → pkgs/applications/networking/browsers/netsurf/libnsgif.nix+6−7 pkgs/applications/misc/netsurf/libnslog/default.nix → pkgs/applications/networking/browsers/netsurf/libnslog.nix+7−10 pkgs/applications/misc/netsurf/libnspsl/default.nix → pkgs/applications/networking/browsers/netsurf/libnspsl.nix+6−9 pkgs/applications/misc/netsurf/libnsutils/default.nix → pkgs/applications/networking/browsers/netsurf/libnsutils.nix+7−8 pkgs/applications/misc/netsurf/libparserutils/default.nix → pkgs/applications/networking/browsers/netsurf/libparserutils.nix+6−7 pkgs/applications/misc/netsurf/libsvgtiny/default.nix → pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix+5−7 pkgs/applications/misc/netsurf/libutf8proc/default.nix → pkgs/applications/networking/browsers/netsurf/libutf8proc.nix+6−7 pkgs/applications/misc/netsurf/libwapcaplet/default.nix → pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix+6−7 pkgs/applications/networking/browsers/netsurf/nsgenbind.nix+30 pkgs/top-level/all-packages.nix+2−43
pkgs/applications/misc/netsurf/buildsystem/default.nixdeleted−24
@@ -1,24 +0,0 @@
1−{ stdenv, fetchurl }:
2−
3−stdenv.mkDerivation rec {
4−
5− pname = "netsurf-buildsystem";
6− version = "1.8";
7−
8− src = fetchurl {
9− url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
10− sha256 = "0ffdjwskxlnh8sk40qqfgksbb1nrdzfxsshrscra0p4nqpkj98z6";
11− };
12−
13− makeFlags = [
14− "PREFIX=$(out)"
15− ];
16−
17− meta = with stdenv.lib; {
18− homepage = "http://www.netsurf-browser.org/";
19− description = "Build system for netsurf browser";
20− license = licenses.gpl2;
21− maintainers = [ maintainers.vrthra ];
22− platforms = platforms.unix;
23− };
24−}
pkgs/applications/misc/netsurf/libhubbub/default.nixdeleted−35
@@ -1,35 +0,0 @@
1−{ stdenv, fetchurl, pkgconfig, perl
2−, buildsystem
3−, libparserutils
4−}:
5−
6−stdenv.mkDerivation rec {
7−
8− name = "netsurf-${libname}-${version}";
9− libname = "libhubbub";
10− version = "0.3.6";
11−
12− src = fetchurl {
13− url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
14− sha256 = "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp";
15− };
16−
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ perl
19− buildsystem
20− libparserutils
21− ];
22−
23− makeFlags = [
24− "PREFIX=$(out)"
25− "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
26− ];
27−
28− meta = with stdenv.lib; {
29− homepage = "http://www.netsurf-browser.org/";
30− description = "HTML5 parser library for netsurf browser";
31− license = licenses.gpl2;
32− maintainers = [ maintainers.vrthra ];
33− platforms = platforms.linux;
34− };
35−}
pkgs/applications/misc/netsurf/libnsfb/default.nixdeleted−32
@@ -1,32 +0,0 @@
1−{ stdenv, fetchurl, pkgconfig, uilib? "framebuffer", SDL
2−, buildsystem
3−}:
4−
5−stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
8− libname = "libnsfb";
9− version = "0.2.1";
10−
11− src = fetchurl {
12− url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "09qag9lgn5ahanbcyf2rvfmsz15vazfwnl8xpn8f1iczd44b0bv0";
14− };
15−
16− nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ buildsystem SDL ];
18−
19− makeFlags = [
20− "PREFIX=$(out)"
21− "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
22− "TARGET=${uilib}"
23− ];
24−
25− meta = with stdenv.lib; {
26− homepage = "http://www.netsurf-browser.org/";
27− description = "CSS parser and selection library for netsurf browser";
28− license = licenses.gpl2;
29− maintainers = [ maintainers.vrthra ];
30− platforms = platforms.linux;
31− };
32−}
pkgs/applications/misc/netsurf/nsgenbind/default.nixdeleted−30
@@ -1,30 +0,0 @@
1−{ stdenv, fetchurl
2−, flex, bison
3−, buildsystem
4−}:
5−
6−stdenv.mkDerivation rec {
7−
8− pname = "netsurf-nsgenbind";
9− version = "0.7";
10−
11− src = fetchurl {
12− url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz";
13− sha256 = "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq";
14− };
15−
16− buildInputs = [ buildsystem flex bison ];
17−
18− makeFlags = [
19− "PREFIX=$(out)"
20− "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
21− ];
22−
23− meta = with stdenv.lib; {
24− homepage = "http://www.netsurf-browser.org/";
25− description = "Generator for JavaScript bindings for netsurf browser";
26− license = licenses.gpl2;
27− maintainers = [ maintainers.vrthra ];
28− platforms = platforms.linux;
29− };
30−}
pkgs/applications/misc/netsurf/browser/default.nix → pkgs/applications/networking/browsers/netsurf/browser.nixrenamed+19−26
@@ -1,25 +1,21 @@
11{ stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
22
33# Buildtime dependencies.
4−
54, check, pkgconfig, xxd
65
76# Runtime dependencies.
8−
97, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2
108, openssl, perl, perlPackages
119
1210# uilib-specific dependencies
13−
1411, gtk2 # GTK 2
12+, gtk3 # GTK 3
1513, SDL # Framebuffer
1614
1715# Configuration
18−
19−, uilib ? "framebuffer"
16+, uilib
2017
2118# Netsurf-specific dependencies
22−
2319, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif
2420, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc
2521, libwapcaplet, nsgenbind
@@ -29,24 +25,14 @@ let
2925 inherit (stdenv.lib) optional optionals;
3026in
3127stdenv.mkDerivation rec {
32−
3328 pname = "netsurf";
34− version = "3.9";
29+ version = "3.10";
3530
3631 src = fetchurl {
37− url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
38− sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
32+ url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz";
33+ sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
3934 };
4035
41− patches = [
42− # GTK: prefer using curl's intrinsic defaults for CURLOPT_CA*
43− (fetchpatch {
44− name = "0001-GTK-prefer-using-curl-s-intrinsic-defaults-for-CURLO.patch";
45− url = "http://source.netsurf-browser.org/netsurf.git/patch/?id=87177d8aa109206d131e0d80a2080ce55dab01c7";
46− sha256 = "08bc60pc5k5qpckqv21zgmgszj3rpwskfc84shs8vg92vkimv2ai";
47− })
48− ];
49−
5036 nativeBuildInputs = [
5137 makeWrapper
5238 perl
@@ -54,10 +40,10 @@ stdenv.mkDerivation rec {
5440 pkgconfig
5541 xxd
5642 ]
57− ++ optional (uilib == "gtk") wrapGAppsHook
43+ ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook
5844 ;
5945
60− buildInputs = [
46+ buildInputs = [
6147 check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl
6248 # Netsurf-specific libraries
6349 nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss
@@ -65,7 +51,8 @@ stdenv.mkDerivation rec {
6551 libutf8proc
6652 ]
6753 ++ optionals (uilib == "framebuffer") [ expat SDL ]
68− ++ optional (uilib == "gtk") gtk2
54+ ++ optional (uilib == "gtk2") gtk2
55+ ++ optional (uilib == "gtk3") gtk3
6956 ;
7057
7158 preConfigure = ''
@@ -81,10 +68,16 @@ stdenv.mkDerivation rec {
8168 ];
8269
8370 meta = with stdenv.lib; {
84− homepage = "http://www.netsurf-browser.org/";
85− description = "Free opensource web browser";
86− license = licenses.gpl2;
87− maintainers = [ maintainers.vrthra ];
71+ homepage = "https://www.netsurf-browser.org/";
72+ description = "A free, open source, small web browser";
73+ longDescription = ''
74+ NetSurf is a free, open source web browser. It is written in C and
75+ released under the GNU Public Licence version 2. NetSurf has its own
76+ layout and rendering engine entirely written from scratch. It is small and
77+ capable of handling many of the web standards in use today.
78+ '';
79+ license = licenses.gpl2Only;
80+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
8881 platforms = platforms.linux;
8982 };
9083}
pkgs/applications/networking/browsers/netsurf/buildsystem.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, fetchurl }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "netsurf-${libname}";
5+ libname = "buildsystem";
6+ version = "1.9";
7+
8+ src = fetchurl {
9+ url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz";
10+ sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=";
11+ };
12+
13+ makeFlags = [
14+ "PREFIX=$(out)"
15+ ];
16+
17+ meta = with stdenv.lib; {
18+ homepage = "https://www.netsurf-browser.org/";
19+ description = "NetSurf browser shared build system";
20+ license = licenses.mit;
21+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
22+ platforms = platforms.unix;
23+ };
24+}
pkgs/applications/networking/browsers/netsurf/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib, pkgs }:
2+
3+lib.makeScope pkgs.newScope (self: with self; {
4+ # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel)
5+ # requires a terminal that supports `sixel` capabilities, such as mlterm
6+ # or xterm -ti 340
7+ ui = "gtk3";
8+ uilib =
9+ if ui == "gtk2" ||
10+ ui == "gtk3" ||
11+ ui == "framebuffer" then ui
12+ else if ui == "sixel" then "framebuffer"
13+ else null; # Never will happen
14+ SDL =
15+ if ui == "sixel" then pkgs.SDL_sixel
16+ else if ui == "framebuffer" then pkgs.SDL
17+ else null;
18+
19+ browser = callPackage ./browser.nix { };
20+
21+ buildsystem = callPackage ./buildsystem.nix { };
22+ libcss = callPackage ./libcss.nix { };
23+ libdom = callPackage ./libdom.nix { };
24+ libhubbub = callPackage ./libhubbub.nix { };
25+ libnsbmp = callPackage ./libnsbmp.nix { };
26+ libnsfb = callPackage ./libnsfb.nix { };
27+ libnsgif = callPackage ./libnsgif.nix { };
28+ libnslog = callPackage ./libnslog.nix { };
29+ libnspsl = callPackage ./libnspsl.nix { };
30+ libnsutils = callPackage ./libnsutils.nix { };
31+ libparserutils = callPackage ./libparserutils.nix { };
32+ libsvgtiny = callPackage ./libsvgtiny.nix { };
33+ libutf8proc = callPackage ./libutf8proc.nix { };
34+ libwapcaplet = callPackage ./libwapcaplet.nix { };
35+ nsgenbind = callPackage ./nsgenbind.nix { };
36+})
pkgs/applications/misc/netsurf/libcss/default.nix → pkgs/applications/networking/browsers/netsurf/libcss.nixrenamed+17−12
@@ -1,26 +1,25 @@
11{ stdenv, fetchurl, pkgconfig, perl
22, buildsystem
3−, libwapcaplet
43, libparserutils
4+, libwapcaplet
55}:
66
77stdenv.mkDerivation rec {
8−
9− name = "netsurf-${libname}-${version}";
8+ pname = "netsurf-${libname}";
109 libname = "libcss";
11− version = "0.9.0";
10+ version = "0.9.1";
1211
1312 src = fetchurl {
1413 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
15− sha256 = "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr";
14+ sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
1615 };
1716
1817 nativeBuildInputs = [ pkgconfig ];
19− buildInputs = [ perl
20− buildsystem
21− libwapcaplet
18+ buildInputs = [
19+ perl
2220 libparserutils
23− ];
21+ libwapcaplet
22+ buildsystem ];
2423
2524 makeFlags = [
2625 "PREFIX=$(out)"
@@ -30,10 +29,16 @@ stdenv.mkDerivation rec {
3029 NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough";
3130
3231 meta = with stdenv.lib; {
33− homepage = "http://www.netsurf-browser.org/";
32+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
3433 description = "Cascading Style Sheets library for netsurf browser";
35− license = licenses.gpl2;
36− maintainers = [ maintainers.vrthra ];
34+ longDescription = ''
35+ LibCSS is a CSS parser and selection engine. It aims to parse the forward
36+ compatible CSS grammar. It was developed as part of the NetSurf project
37+ and is available for use by other software, under a more permissive
38+ license.
39+ '';
40+ license = licenses.mit;
41+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
3742 platforms = platforms.linux;
3843 };
3944}
pkgs/applications/misc/netsurf/libdom/default.nix → pkgs/applications/networking/browsers/netsurf/libdom.nixrenamed+15−11
@@ -6,23 +6,22 @@
66}:
77
88stdenv.mkDerivation rec {
9−
10− name = "netsurf-${libname}-${version}";
9+ pname = "netsurf-${libname}";
1110 libname = "libdom";
12− version = "0.4.0";
11+ version = "0.4.1";
1312
1413 src = fetchurl {
1514 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
16− sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy";
15+ sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
1716 };
1817
1918 nativeBuildInputs = [ pkgconfig ];
20− buildInputs = [ expat
21− buildsystem
19+ buildInputs = [
20+ expat
21+ libhubbub
2222 libparserutils
2323 libwapcaplet
24− libhubbub
25− ];
24+ buildsystem ];
2625
2726 makeFlags = [
2827 "PREFIX=$(out)"
@@ -30,10 +29,15 @@ stdenv.mkDerivation rec {
3029 ];
3130
3231 meta = with stdenv.lib; {
33− homepage = "http://www.netsurf-browser.org/";
32+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
3433 description = "Document Object Model library for netsurf browser";
35− license = licenses.gpl2;
36− maintainers = [ maintainers.vrthra ];
34+ longDescription = ''
35+ LibDOM is an implementation of the W3C DOM, written in C. It is currently
36+ in development for use with NetSurf and is intended to be suitable for use
37+ in other projects under a more permissive license.
38+ '';
39+ license = licenses.mit;
40+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
3741 platforms = platforms.linux;
3842 };
3943}
pkgs/applications/networking/browsers/netsurf/libhubbub.nixnew file+44
@@ -0,0 +1,44 @@
1+{ stdenv, fetchurl, pkgconfig, perl
2+, buildsystem
3+, libparserutils
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "netsurf-${libname}";
8+ libname = "libhubbub";
9+ version = "0.3.7";
10+
11+ src = fetchurl {
12+ url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13+ sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
14+ };
15+
16+ nativeBuildInputs = [ pkgconfig ];
17+ buildInputs = [
18+ perl
19+ libparserutils
20+ buildsystem ];
21+
22+ makeFlags = [
23+ "PREFIX=$(out)"
24+ "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
25+ ];
26+
27+ meta = with stdenv.lib; {
28+ homepage = "https://www.netsurf-browser.org/projects/hubbub/";
29+ description = "HTML5 parser library for netsurf browser";
30+ longDescription = ''
31+ Hubbub is an HTML5 compliant parsing library, written in C. It was
32+ developed as part of the NetSurf project and is available for use by other
33+ software under the MIT licence.
34+
35+ The HTML5 specification defines a parsing algorithm, based on the
36+ behaviour of mainstream browsers, which provides instructions for how to
37+ parse all markup, both valid and invalid. As a result, Hubbub parses web
38+ content well.
39+ '';
40+ license = licenses.mit;
41+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
42+ platforms = platforms.linux;
43+ };
44+}
pkgs/applications/misc/netsurf/libnsbmp/default.nix → pkgs/applications/networking/browsers/netsurf/libnsbmp.nixrenamed+6−9
@@ -3,20 +3,17 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libnsbmp";
98 version = "0.1.6";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r";
12+ sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
1413 };
1514
1615 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [
18− buildsystem
19− ];
16+ buildInputs = [ buildsystem ];
2017
2118 makeFlags = [
2219 "PREFIX=$(out)"
@@ -24,10 +21,10 @@ stdenv.mkDerivation rec {
2421 ];
2522
2623 meta = with stdenv.lib; {
27− homepage = "http://www.netsurf-browser.org/";
24+ homepage = "https://www.netsurf-browser.org/";
2825 description = "BMP Decoder for netsurf browser";
29− license = licenses.gpl2;
30− maintainers = [ maintainers.vrthra ];
26+ license = licenses.mit;
27+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
3128 platforms = platforms.linux;
3229 };
3330}
pkgs/applications/networking/browsers/netsurf/libnsfb.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, fetchurl, pkgconfig
2+, uilib, SDL
3+, buildsystem
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "netsurf-${libname}";
8+ libname = "libnsfb";
9+ version = "0.2.2";
10+
11+ src = fetchurl {
12+ url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13+ sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=";
14+ };
15+
16+ nativeBuildInputs = [ pkgconfig ];
17+ buildInputs = [ SDL buildsystem ];
18+
19+ makeFlags = [
20+ "PREFIX=$(out)"
21+ "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
22+ "TARGET=${uilib}"
23+ ];
24+
25+ meta = with stdenv.lib; {
26+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
27+ description = "Netsurf framebuffer abstraction library";
28+ license = licenses.mit;
29+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
30+ platforms = platforms.linux;
31+ };
32+}
pkgs/applications/misc/netsurf/libnsgif/default.nix → pkgs/applications/networking/browsers/netsurf/libnsgif.nixrenamed+6−7
@@ -3,18 +3,17 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libnsgif";
98 version = "0.2.1";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly";
12+ sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
1413 };
1514
1615 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ buildsystem];
16+ buildInputs = [ buildsystem ];
1817
1918 makeFlags = [
2019 "PREFIX=$(out)"
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
2221 ];
2322
2423 meta = with stdenv.lib; {
25− homepage = "http://www.netsurf-browser.org/";
24+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
2625 description = "GIF Decoder for netsurf browser";
27− license = licenses.gpl2;
28− maintainers = [ maintainers.vrthra ];
26+ license = licenses.mit;
27+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
2928 platforms = platforms.unix;
3029 };
3130}
pkgs/applications/misc/netsurf/libnslog/default.nix → pkgs/applications/networking/browsers/netsurf/libnslog.nixrenamed+7−10
@@ -3,20 +3,17 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libnslog";
9− version = "0.1.2";
8+ version = "0.1.3";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd";
12+ sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=";
1413 };
1514
1615 nativeBuildInputs = [ pkgconfig bison flex ];
17− buildInputs = [
18− buildsystem
19− ];
16+ buildInputs = [ buildsystem ];
2017
2118 makeFlags = [
2219 "PREFIX=$(out)"
@@ -24,10 +21,10 @@ stdenv.mkDerivation rec {
2421 ];
2522
2623 meta = with stdenv.lib; {
27− homepage = "http://www.netsurf-browser.org/";
24+ homepage = "https://www.netsurf-browser.org/";
2825 description = "NetSurf Parametric Logging Library";
29− license = licenses.mit;
30− maintainers = [ maintainers.samueldr ];
26+ license = licenses.isc;
27+ maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
3128 platforms = platforms.linux;
3229 };
3330}
pkgs/applications/misc/netsurf/libnspsl/default.nix → pkgs/applications/networking/browsers/netsurf/libnspsl.nixrenamed+6−9
@@ -3,20 +3,17 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libnspsl";
9− version = "0.1.5";
8+ version = "0.1.6";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd";
12+ sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
1413 };
1514
1615 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [
18− buildsystem
19− ];
16+ buildInputs = [ buildsystem ];
2017
2118 makeFlags = [
2219 "PREFIX=$(out)"
@@ -24,10 +21,10 @@ stdenv.mkDerivation rec {
2421 ];
2522
2623 meta = with stdenv.lib; {
27− homepage = "http://www.netsurf-browser.org/";
24+ homepage = "https://www.netsurf-browser.org/";
2825 description = "NetSurf Public Suffix List - Handling library";
2926 license = licenses.mit;
30− maintainers = [ maintainers.samueldr ];
27+ maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
3128 platforms = platforms.linux;
3229 };
3330}
pkgs/applications/misc/netsurf/libnsutils/default.nix → pkgs/applications/networking/browsers/netsurf/libnsutils.nixrenamed+7−8
@@ -3,18 +3,17 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libnsutils";
9− version = "0.0.5";
8+ version = "0.1.0";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf";
12+ sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
1413 };
1514
1615 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ buildsystem];
16+ buildInputs = [ buildsystem ];
1817
1918 makeFlags = [
2019 "PREFIX=$(out)"
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
2221 ];
2322
2423 meta = with stdenv.lib; {
25− homepage = "http://www.netsurf-browser.org/";
24+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
2625 description = "Generalised utility library for netsurf browser";
27− license = licenses.gpl2;
28− maintainers = [ maintainers.vrthra ];
26+ license = licenses.mit;
27+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
2928 platforms = platforms.linux;
3029 };
3130}
pkgs/applications/misc/netsurf/libparserutils/default.nix → pkgs/applications/networking/browsers/netsurf/libparserutils.nixrenamed+6−7
@@ -3,17 +3,16 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libparserutils";
98 version = "0.2.4";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj";
12+ sha256 = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
1413 };
1514
16− buildInputs = [ buildsystem perl ];
15+ buildInputs = [ perl buildsystem ];
1716
1817 makeFlags = [
1918 "PREFIX=$(out)"
@@ -21,10 +20,10 @@ stdenv.mkDerivation rec {
2120 ];
2221
2322 meta = with stdenv.lib; {
24− homepage = "http://www.netsurf-browser.org/";
23+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
2524 description = "Parser building library for netsurf browser";
26− license = licenses.gpl2;
27− maintainers = [ maintainers.vrthra ];
25+ license = licenses.mit;
26+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
2827 platforms = platforms.linux;
2928 };
3029}
pkgs/applications/misc/netsurf/libsvgtiny/default.nix → pkgs/applications/networking/browsers/netsurf/libsvgtiny.nixrenamed+5−7
@@ -7,24 +7,22 @@
77}:
88
99stdenv.mkDerivation rec {
10−
11− name = "netsurf-${libname}-${version}";
10+ pname = "netsurf-${libname}";
1211 libname = "libsvgtiny";
1312 version = "0.1.7";
1413
1514 src = fetchurl {
1615 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
17− sha256 = "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c";
16+ sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
1817 };
1918
2019 nativeBuildInputs = [ pkgconfig gperf ];
2120 buildInputs = [
22− buildsystem
2321 libdom
2422 libhubbub
2523 libparserutils
2624 libwapcaplet
27− ];
25+ buildsystem ];
2826
2927 makeFlags = [
3028 "PREFIX=$(out)"
@@ -32,10 +30,10 @@ stdenv.mkDerivation rec {
3230 ];
3331
3432 meta = with stdenv.lib; {
35− homepage = "http://www.netsurf-browser.org/";
33+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
3634 description = "NetSurf SVG decoder";
3735 license = licenses.mit;
38− maintainers = [ maintainers.samueldr ];
36+ maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
3937 platforms = platforms.linux;
4038 };
4139}
pkgs/applications/misc/netsurf/libutf8proc/default.nix → pkgs/applications/networking/browsers/netsurf/libutf8proc.nixrenamed+6−7
@@ -3,18 +3,17 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libutf8proc";
98 version = "2.4.0-1";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "0wn409laqaqlqnz2d77419b5rya99vvc696vj187biy1i5livaq1";
12+ sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
1413 };
1514
1615 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ buildsystem];
16+ buildInputs = [ buildsystem ];
1817
1918 makeFlags = [
2019 "PREFIX=$(out)"
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
2221 ];
2322
2423 meta = with stdenv.lib; {
25− homepage = "http://www.netsurf-browser.org/";
24+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
2625 description = "UTF8 Processing library for netsurf browser";
27− license = licenses.gpl2;
28− maintainers = [ maintainers.vrthra ];
26+ license = licenses.mit;
27+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
2928 platforms = platforms.linux;
3029 };
3130}
pkgs/applications/misc/netsurf/libwapcaplet/default.nix → pkgs/applications/networking/browsers/netsurf/libwapcaplet.nixrenamed+6−7
@@ -3,14 +3,13 @@
33}:
44
55stdenv.mkDerivation rec {
6−
7− name = "netsurf-${libname}-${version}";
6+ pname = "netsurf-${libname}";
87 libname = "libwapcaplet";
9− version = "0.4.2";
8+ version = "0.4.3";
109
1110 src = fetchurl {
1211 url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13− sha256 = "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86";
12+ sha256 = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=";
1413 };
1514
1615 buildInputs = [ buildsystem ];
@@ -23,10 +22,10 @@ stdenv.mkDerivation rec {
2322 NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
2423
2524 meta = with stdenv.lib; {
26− homepage = "http://www.netsurf-browser.org/";
25+ homepage = "https://www.netsurf-browser.org/projects/${libname}/";
2726 description = "String internment library for netsurf browser";
28− license = licenses.gpl2;
29− maintainers = [ maintainers.vrthra ];
27+ license = licenses.mit;
28+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
3029 platforms = platforms.linux;
3130 };
3231}
pkgs/applications/networking/browsers/netsurf/nsgenbind.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, fetchurl
2+, flex, bison
3+, buildsystem
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "netsurf-${libname}";
8+ libname = "nsgenbind";
9+ version = "0.8";
10+
11+ src = fetchurl {
12+ url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
13+ sha256 = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
14+ };
15+
16+ buildInputs = [ flex bison buildsystem ];
17+
18+ makeFlags = [
19+ "PREFIX=$(out)"
20+ "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
21+ ];
22+
23+ meta = with stdenv.lib; {
24+ homepage = "https://www.netsurf-browser.org/";
25+ description = "Generator for JavaScript bindings for netsurf browser";
26+ license = licenses.mit;
27+ maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
28+ platforms = platforms.linux;
29+ };
30+}
pkgs/top-level/all-packages.nix+2−43
@@ -5047,49 +5047,8 @@ in
50475047 inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
50485048 };
50495049
5050− netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
5051− # ui could be gtk, sixel or framebuffer. Note that console display (sixel)
5052− # requires a terminal that supports `sixel` capabilities such as mlterm
5053− # or xterm -ti 340
5054− ui = "sixel";
5055−
5056− uilib = if ui == "gtk" then "gtk" else "framebuffer";
5057−
5058− SDL = if ui == "gtk" then null else if ui == "sixel" then SDL_sixel else SDL;
5059−
5060− buildsystem = callPackage ../applications/misc/netsurf/buildsystem { };
5061−
5062− libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { };
5063−
5064− nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { };
5065−
5066− libparserutils = callPackage ../applications/misc/netsurf/libparserutils { };
5067−
5068− libnslog = callPackage ../applications/misc/netsurf/libnslog { };
5069−
5070− libcss = callPackage ../applications/misc/netsurf/libcss { };
5071−
5072− libhubbub = callPackage ../applications/misc/netsurf/libhubbub { };
5073−
5074− libdom = callPackage ../applications/misc/netsurf/libdom { };
5075−
5076− libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { };
5077−
5078− libnsgif = callPackage ../applications/misc/netsurf/libnsgif { };
5079−
5080− libnsfb = callPackage ../applications/misc/netsurf/libnsfb { };
5081−
5082− libnsutils = callPackage ../applications/misc/netsurf/libnsutils { };
5083−
5084− libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { };
5085−
5086− libnspsl = callPackage ../applications/misc/netsurf/libnspsl { };
5087−
5088− libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { };
5089−
5090− browser = callPackage ../applications/misc/netsurf/browser { };
5091−
5092− });
5050+ netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });
5051+ netsurf-browser = netsurf.browser;
50935052
50945053 netperf = callPackage ../applications/networking/netperf { };
50955054