diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
commit | f10921c5ade56534633eae0da94da6e81aacc2aa (patch) | |
tree | 599d0256cc509f47a3e75ea1214d5374de51eee8 /gnu/packages/web.scm | |
parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
parent | 9d0dfd9a9a7c43363a4e140c20d49f119fe6f2e3 (diff) | |
download | guix-f10921c5ade56534633eae0da94da6e81aacc2aa.tar guix-f10921c5ade56534633eae0da94da6e81aacc2aa.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r-- | gnu/packages/web.scm | 83 |
1 files changed, 45 insertions, 38 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 15b5dedd16..54c2885a26 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,16 +1,16 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org> -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org> @@ -4612,7 +4612,7 @@ tools they trust (e.g. wget).") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "buildsystem-" version ".tar.gz")) (sha256 (base32 @@ -4625,7 +4625,7 @@ tools they trust (e.g. wget).") #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build)))) - (home-page "http://www.netsurf-browser.org") + (home-page "https://www.netsurf-browser.org") (synopsis "Build system for the Netsurf project") (description "This package provides the shared build system for Netsurf project @@ -4651,7 +4651,7 @@ libraries.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" name "-" version "-src.tar.gz")) (sha256 (base32 @@ -4662,7 +4662,7 @@ libraries.") ("pkg-config" ,pkg-config) ("perl" ,perl))) ;for test harness (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/libparserutils/") + (home-page "https://www.netsurf-browser.org/projects/libparserutils/") (synopsis "Parser building library") (description "LibParserUtils is a library for building efficient parsers, written in @@ -4676,7 +4676,7 @@ C. It is developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "libhubbub-" version "-src.tar.gz")) (sha256 (base32 @@ -4692,7 +4692,7 @@ C. It is developed as part of the NetSurf project.") (propagated-inputs `(("libparserutils" ,libparserutils))) ;for libhubbub.pc (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/hubbub/") + (home-page "https://www.netsurf-browser.org/projects/hubbub/") (synopsis "HTML5 compliant parsing library") (description "Hubbub is an HTML5 compliant parsing library, written in C, which can @@ -4782,7 +4782,7 @@ commenting.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "libwapcaplet-" version "-src.tar.gz")) (sha256 (base32 @@ -4793,7 +4793,7 @@ commenting.") ("pkg-config" ,pkg-config) ("check" ,check))) ;for tests (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/libwapcaplet/") + (home-page "https://www.netsurf-browser.org/projects/libwapcaplet/") (synopsis "String internment library") (description "LibWapcaplet provides a reference counted string internment system @@ -4808,7 +4808,7 @@ developed as part of the Netsurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "libcss-" version "-src.tar.gz")) (sha256 (base32 @@ -4822,7 +4822,7 @@ developed as part of the Netsurf project.") `(("libparserutils" ,libparserutils) ("libwapcaplet" ,libwapcaplet))) (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/libcss/") + (home-page "https://www.netsurf-browser.org/projects/libcss/") (synopsis "CSS parser and selection library") (description "LibCSS is a CSS (Cascading Style Sheet) parser and selection engine, @@ -4836,7 +4836,7 @@ written in C. It is developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "libdom-" version "-src.tar.gz")) (sha256 (base32 @@ -4858,7 +4858,7 @@ written in C. It is developed as part of the NetSurf project.") (arguments `(#:tests? #f ;TODO: re-enable. tests take a looong time. ,@netsurf-buildsystem-arguments)) - (home-page "http://www.netsurf-browser.org/projects/libdom/") + (home-page "https://www.netsurf-browser.org/projects/libdom/") (synopsis "Implementation of the W3C DOM") (description "LibDOM is an implementation of the W3C DOM, written in C. It is @@ -4872,7 +4872,7 @@ developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" name "-" version "-src.tar.gz")) (sha256 (base32 @@ -4887,7 +4887,7 @@ developed as part of the NetSurf project.") (propagated-inputs `(("libdom" ,libdom))) ;for libsvgtiny.pc (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/libsvgtiny/") + (home-page "https://www.netsurf-browser.org/projects/libsvgtiny/") (synopsis "Library for parsing SVG files") (description "Libsvgtiny takes some SVG as input and returns a list of paths and texts @@ -4903,7 +4903,7 @@ project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" name "-" version "-src.tar.gz")) (sha256 (base32 @@ -4912,7 +4912,7 @@ project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/libnsbmp/") + (home-page "https://www.netsurf-browser.org/projects/libnsbmp/") (synopsis "Decoding library for BMP and ICO files") (description "Libnsbmp is a decoding library for BMP and ICO image file formats, @@ -4926,7 +4926,7 @@ written in C. It is developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" name "-" version "-src.tar.gz")) (sha256 (base32 @@ -4935,7 +4935,7 @@ written in C. It is developed as part of the NetSurf project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/projects/libnsgif/") + (home-page "https://www.netsurf-browser.org/projects/libnsgif/") (synopsis "Decoding library for GIF files") (description "Libnsgif is a decoding library for the GIF image file format, written in @@ -4949,7 +4949,7 @@ C. It is developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "libnslog-" version "-src.tar.gz")) (sha256 (base32 @@ -4962,7 +4962,7 @@ C. It is developed as part of the NetSurf project.") ("bison" ,bison) ("flex" ,flex))) (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/") + (home-page "https://www.netsurf-browser.org/") (synopsis "Logging library") (description "Libnslog provides a category-based logging library which supports @@ -4977,7 +4977,7 @@ client applications. It is developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" name "-" version "-src.tar.gz")) (sha256 (base32 @@ -4986,7 +4986,7 @@ client applications. It is developed as part of the NetSurf project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/") + (home-page "https://www.netsurf-browser.org/") (synopsis "Utility library for NetSurf") (description "Libnsutils provides a small number of useful utility routines. It is @@ -5000,7 +5000,7 @@ developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "libnspsl-" version "-src.tar.gz")) (sha256 (base32 @@ -5009,7 +5009,7 @@ developed as part of the NetSurf project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) (arguments netsurf-buildsystem-arguments) - (home-page "http://www.netsurf-browser.org/") + (home-page "https://www.netsurf-browser.org/") (synopsis "Library to generate a static Public Suffix List") (description "Libnspsl is a library to generate a static code representation of the @@ -5023,7 +5023,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/libs/releases/" + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" "nsgenbind-" version "-src.tar.gz")) (sha256 (base32 @@ -5037,7 +5037,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (substitute-keyword-arguments netsurf-buildsystem-arguments ((#:make-flags flags) `(delete "COMPONENT_TYPE=lib-shared" ,flags)))) - (home-page "http://www.netsurf-browser.org/") + (home-page "https://www.netsurf-browser.org/") (synopsis "Generate JavaScript to DOM bindings") (description "@code{nsgenbind} is a tool to generate JavaScript to DOM bindings from @@ -5051,7 +5051,7 @@ w3c webidl files and a binding configuration file.") (source (origin (method url-fetch) - (uri (string-append "http://download.netsurf-browser.org/netsurf/" + (uri (string-append "https://download.netsurf-browser.org/netsurf/" "releases/source/netsurf-" version "-src.tar.gz")) (sha256 (base32 @@ -5072,7 +5072,7 @@ w3c webidl files and a binding configuration file.") ("xxd" ,xxd))) (inputs `(("curl" ,curl) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("openssl" ,openssl) ("utf8proc" ,utf8proc) ("libpng" ,libpng) @@ -5088,6 +5088,7 @@ w3c webidl files and a binding configuration file.") ("miscfiles" ,miscfiles))) (arguments `(#:make-flags `("CC=gcc" "BUILD_CC=gcc" + "TARGET=gtk3" ,(string-append "PREFIX=" %output) ,(string-append "NSSHARED=" (assoc-ref %build-inputs @@ -5120,12 +5121,19 @@ w3c webidl files and a binding configuration file.") ;; Leave the DOCTYPE header as is. (display (read-line in 'concat) out) (sxml->xml - (let rec ((sxml (xml->sxml in))) + (let rec ((sxml (xml->sxml in + #:default-entity-handler + (lambda (port name) + (string-append "<ENTITY>" + (symbol->string name) + "</ENTITY>"))))) ;; We'd like to use sxml-match here, but it can't ;; match against generic tag symbols... (match sxml (`(div (@ (class "links")) . ,rest) '()) + (`(ENTITY ,ent) + `(*ENTITY* ,ent)) ((x ...) (map rec x)) (x x))) @@ -5152,7 +5160,7 @@ w3c webidl files and a binding configuration file.") (install-file "docs/netsurf-gtk.1" (string-append out "/share/man/man1/")) #t)))))) - (home-page "http://www.netsurf-browser.org") + (home-page "https://www.netsurf-browser.org") (synopsis "Web browser") (description "NetSurf is a lightweight web browser that has its own layout and @@ -5357,13 +5365,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.3.1") + (version "6.3.2") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni")))) + "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -6843,14 +6851,13 @@ features include: "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils) - (srfi srfi-1) - (srfi srfi-26)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) (srfi srfi-1) (srfi srfi-26)) + (let ((source (assoc-ref %build-inputs "source")) (php-dir (string-append %output "/share/web/" ,name "/"))) ;; The cache directory must not be in the store, but in a writable |