;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; 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 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
-;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2016, 2017
, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
+;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
+;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system perl)
#:use-module (guix build-system cmake)
- #:use-module (guix build-system r)
#:use-module (guix build-system trivial)
#:use-module (guix build-system python)
#:use-module (guix build-system ant)
#:use-module (gnu packages adns)
#:use-module (gnu packages apr)
#:use-module (gnu packages check)
- #:use-module (gnu packages cran)
#:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
#:use-module (gnu packages autotools)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
+ #:use-module (gnu packages guile-xyz)
#:use-module (gnu packages java)
- #:use-module (gnu packages javascript)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
- #:use-module (gnu packages statistics)
#:use-module (gnu packages version-control))
(define-public httpd
(package
(name "httpd")
- (version "2.4.34")
+ (version "2.4.37")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/httpd/httpd-"
version ".tar.bz2"))
(sha256
(base32
- "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs"))))
+ "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l"))))
(build-system gnu-build-system)
(native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config'
(inputs `(("apr" ,apr)
(name "nginx")
;; Consider updating the nginx-documentation package if the nginx package is
;; updated.
- (version "1.14.0")
+ (version "1.14.2")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
- "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax"))))
+ "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80"))))
(build-system gnu-build-system)
(inputs `(("openssl" ,openssl)
("pcre" ,pcre)
(define-public jansson
(package
(name "jansson")
- (version "2.10")
+ (version "2.11")
(source (origin
(method url-fetch)
(uri
version ".tar.gz"))
(sha256
(base32
- "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq"))))
+ "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf"))))
(build-system gnu-build-system)
(home-page "http://www.digip.org/jansson/")
(synopsis "JSON C library")
(("-Werror") ""))
#t))))))
+(define-public json-parser
+ (package
+ (name "json-parser")
+ (version "1.1.0")
+ (source (origin
+ ;; do not use auto-generated tarballs
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/udp/json-parser.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ls7z4fx0sq633s5bc0j1gh36sv087gmrgr7rza22wjq2d4606yf"))))
+ ;; FIXME: we should build the python bindings in a separate package
+ (build-system gnu-build-system)
+ ;; the tests are written for the python bindings which are not built here
+ (arguments '(#:tests? #f))
+ (home-page "https://github.com/udp/json-parser")
+ (synopsis "JSON parser written in ANSI C")
+ (description "This package provides a very low footprint JSON parser
+written in portable ANSI C.
+
+@itemize
+@item BSD licensed with no dependencies (i.e. just drop the C file into your
+project)
+@item Never recurses or allocates more memory than it needs
+@item Very simple API with operator sugar for C++
+@end itemize")
+ (license l:bsd-2)))
+
(define-public qjson
(package
(name "qjson")
(define-public libpsl
(package
(name "libpsl")
- (version "0.20.1")
+ (version "0.20.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/rockdaboot/libpsl/"
"/libpsl-" version ".tar.gz"))
(sha256
(base32
- "17r18y25ka2ck2ykfidbg4a7jpyzmkqwrzplgqjp7mwd2l9rc6cm"))))
+ "03sn3fbcrmgl9x2f1gc6rbrdlbrnwbhrnkgi733gqb95cvmhmzgq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(define-public tinyproxy
(package
(name "tinyproxy")
- (version "1.8.4")
+ (version "1.10.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/tinyproxy/tinyproxy/"
version ".tar.xz"))
(sha256
(base32
- "002hi97687czhfkwsjkr174yvlp10224qi6gd5s53z230bgls7x4"))))
+ "10jnk6y2swld25mm47mjc0nkffyzsfysnsxwr7cs0ns1kil8ggjr"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v"))
;; (setenv "XML_DEBUG_CATALOG" "1")
#t)))))
- ;; All of the below are used to generate the documentation
- ;; (Should they be propagated inputs of asciidoc ??)
- (native-inputs `(("asciidoc" ,asciidoc)))
(home-page "https://tinyproxy.github.io/")
(synopsis "Light-weight HTTP/HTTPS proxy daemon")
(description "Tinyproxy is a light-weight HTTP/HTTPS proxy
#:tests? #f
#:phases
(modify-phases %standard-phases
+ (delete 'bootstrap)
(delete 'configure)
(add-after 'unpack 'unpack-libsass-and-set-path
(lambda* (#:key inputs #:allow-other-keys)
(invoke "tar" "xvf" (assoc-ref inputs "libsass"))
(setenv "SASS_LIBSASS_PATH"
- (string-append (getcwd) "/libsass-" ,version)))))))
+ (string-append (getcwd) "/libsass-" ,version))
+ #t)))))
(inputs
`(("libsass" ,libsass)))
(synopsis "CSS pre-processor")
(define-public perl-catalyst-runtime
(package
(name "perl-catalyst-runtime")
- (version "5.90118")
+ (version "5.90119")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
+ (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
"Catalyst-Runtime-" version ".tar.gz"))
(sha256
(base32
- "0cws3szx3vvh0372qdx8fypgv6qphcc3v81rbq30sl1ghby7ksd3"))))
+ "1iw7x9rqk3sz2hm1bw01blz5vwm7zlljdf4xj3r8vz54f1yggzqr"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)))
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)
("perl-test-needs" ,perl-test-needs)
- ("perl-test-requiresinternet", perl-test-requiresinternet)))
+ ("perl-test-requiresinternet" ,perl-test-requiresinternet)))
(propagated-inputs
`(("perl-encode-locale" ,perl-encode-locale)
("perl-file-listing" ,perl-file-listing)
(define-public perl-www-mechanize
(package
(name "perl-www-mechanize")
- (version "1.88")
+ (version "1.89")
(source
(origin
(method url-fetch)
"WWW-Mechanize-" version ".tar.gz"))
(sha256
(base32
- "0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n"))))
+ "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"))))
(build-system perl-build-system)
(native-inputs ;only for tests
`(("perl-cgi" ,perl-cgi)
(define-public python2-feedparser
(package-with-python2 python-feedparser))
-(define-public r-httpuv
- (package
- (name "r-httpuv")
- (version "1.4.4.1")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "httpuv" version))
- (sha256
- (base32
- "12kwq10xa8glrip7rai9xb4hnpysng00g2l0rw7swfzq5lk4z966"))))
- (build-system r-build-system)
- (native-inputs `(("r-rcpp" ,r-rcpp)))
- (propagated-inputs
- `(("r-bh" ,r-bh)
- ("r-later" ,r-later)
- ("r-promises" ,r-promises)))
- (home-page "https://github.com/rstudio/httpuv")
- (synopsis "HTTP and WebSocket server library for R")
- (description
- "The httpuv package provides low-level socket and protocol support for
-handling HTTP and WebSocket requests directly from within R. It is primarily
-intended as a building block for other packages, rather than making it
-particularly easy to create complete web applications using httpuv alone.")
- ;; This package includes third-party code that was originally released
- ;; under various non-copyleft licenses. Full licensing information can be
- ;; obtained here: https://github.com/rstudio/httpuv/blob/master/LICENSE
- (license l:gpl3+)))
-
-(define-public r-jsonlite
- (package
- (name "r-jsonlite")
- (version "1.5")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "jsonlite" version))
- (sha256
- (base32
- "00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"))))
- (build-system r-build-system)
- (home-page "http://arxiv.org/abs/1403.2805")
- (synopsis "Robust, high performance JSON parser and generator for R")
- (description
- "The jsonlite package provides a fast JSON parser and generator optimized
-for statistical data and the web. It offers flexible, robust, high
-performance tools for working with JSON in R and is particularly powerful for
-building pipelines and interacting with a web API. In addition to converting
-JSON data from/to R objects, jsonlite contains functions to stream, validate,
-and prettify JSON data. The unit tests included with the package verify that
-all edge cases are encoded and decoded consistently for use with dynamic data
-in systems and applications.")
- (license l:expat)))
-
-(define-public r-servr
- (package
- (name "r-servr")
- (version "0.10")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "servr" version))
- (sha256
- (base32
- "0yz3igqsiyqnjj1ngh199zicg3spx4kbmvl0wc8i8xahk6l9g06v"))))
- (build-system r-build-system)
- (propagated-inputs
- `(("r-httpuv" ,r-httpuv)
- ("r-jsonlite" ,r-jsonlite)
- ("r-mime" ,r-mime)
- ("r-xfun" ,r-xfun)))
- (home-page "https://github.com/yihui/servr")
- (synopsis "Simple HTTP server to serve static files or dynamic documents")
- (description
- "Servr provides an HTTP server in R to serve static files, or dynamic
-documents that can be converted to HTML files (e.g., R Markdown) under a given
-directory.")
- (license l:expat)))
-
-(define-public r-htmltools
- (package
- (name "r-htmltools")
- (version "0.3.6")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "htmltools" version))
- (sha256
- (base32
- "18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"))))
- (build-system r-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; See https://github.com/rstudio/htmltools/pull/68
- ;; The resource files are in the store and have mode 444. After
- ;; copying the files R fails to remove them again because it doesn't
- ;; have write access to them.
- (add-after 'unpack 'copy-files-without-mode
- (lambda _
- (substitute* "R/html_dependency.R"
- (("file.copy\\(from, to, " prefix)
- (string-append prefix
- "copy.mode = FALSE, ")))
- #t)))))
- (propagated-inputs
- `(("r-digest" ,r-digest)
- ("r-rcpp" ,r-rcpp)))
- (home-page "https://cran.r-project.org/web/packages/htmltools")
- (synopsis "R tools for HTML")
- (description
- "This package provides tools for HTML generation and output in R.")
- (license l:expat)))
-
-(define-public r-htmlwidgets
- (package
- (name "r-htmlwidgets")
- (version "1.2")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "htmlwidgets" version))
- (sha256
- (base32
- "04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s"))))
- (build-system r-build-system)
- (propagated-inputs
- `(("r-htmltools" ,r-htmltools)
- ("r-jsonlite" ,r-jsonlite)
- ("r-yaml" ,r-yaml)))
- (home-page "https://github.com/ramnathv/htmlwidgets")
- (synopsis "HTML Widgets for R")
- (description
- "HTML widgets is a framework for creating HTML widgets that render in
-various contexts including the R console, R Markdown documents, and Shiny web
-applications.")
- (license l:expat)))
-
-(define-public r-htmltable
- (package
- (name "r-htmltable")
- (version "1.12")
- (source
- (origin
- (method url-fetch)
- (uri (cran-uri "htmlTable" version))
- (sha256
- (base32
- "1n5136vb7mi4rxl5jgwdmdhn4mwv2pcqyw2mrj406ih4hy6hpxa2"))))
- (properties `((upstream-name . "htmlTable")))
- (build-system r-build-system)
- (propagated-inputs
- `(("r-checkmate" ,r-checkmate)
- ("r-htmltools" ,r-htmltools)
- ("r-htmlwidgets" ,r-htmlwidgets)
- ("r-knitr" ,r-knitr)
- ("r-magrittr" ,r-magrittr)
- ("r-rstudioapi" ,r-rstudioapi)
- ("r-stringr" ,r-stringr)))
- (home-page "http://gforge.se/packages/")
- (synopsis "Advanced tables for Markdown/HTML")
- (description
- "This package provides functions to build tables with advanced layout
-elements such as row spanners, column spanners, table spanners, zebra
-striping, and more. While allowing advanced layout, the underlying
-CSS-structure is simple in order to maximize compatibility with word
-processors such as LibreOffice. The package also contains a few text
-formatting functions that help outputting text compatible with HTML or
-LaTeX.")
- (license l:gpl3+)))
-
-(define-public r-curl
- (package
- (name "r-curl")
- (version "3.2")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "curl" version))
- (sha256
- (base32
- "15hmy71310hnf9yqvz0icx4cq939gv6iqaifzlfdh2ia8akawdhn"))))
- (build-system r-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; The environment variable CURL_CA_BUNDLE is only respected when
- ;; running Windows, so we disable the platform checks.
- ;; This can be removed once the libcurl has been patched.
- (add-after 'unpack 'allow-CURL_CA_BUNDLE
- (lambda _
- (substitute* "R/onload.R"
- (("if \\(!grepl\\(\"mingw\".*")
- "if (FALSE)\n"))
- (substitute* "src/handle.c"
- (("#ifdef _WIN32") "#if 1"))
- #t)))))
- (inputs
- `(("libcurl" ,curl)))
- (home-page "https://github.com/jeroenooms/curl")
- (synopsis "HTTP client for R")
- (description
- "The @code{curl()} and @code{curl_download()} functions provide highly
-configurable drop-in replacements for base @code{url()} and
-@code{download.file()} with better performance, support for encryption, gzip
-compression, authentication, and other @code{libcurl} goodies. The core of
-the package implements a framework for performing fully customized requests
-where data can be processed either in memory, on disk, or streaming via the
-callback or connection interfaces.")
- (license l:expat)))
-
-(define-public r-hwriter
- (package
- (name "r-hwriter")
- (version "1.3.2")
- (source
- (origin
- (method url-fetch)
- (uri (cran-uri "hwriter" version))
- (sha256
- (base32
- "0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"))))
- (build-system r-build-system)
- (home-page "https://cran.r-project.org/web/packages/hwriter")
- (synopsis "Output R objects in HTML format")
- (description
- "This package provides easy-to-use and versatile functions to output R
-objects in HTML format.")
- (license l:lgpl2.1+)))
-
-(define-public r-rjson
- (package
- (name "r-rjson")
- (version "0.2.20")
- (source
- (origin
- (method url-fetch)
- (uri (cran-uri "rjson" version))
- (sha256
- (base32
- "0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"))))
- (build-system r-build-system)
- (home-page "https://cran.r-project.org/web/packages/rjson")
- (synopsis "JSON library for R")
- (description
- "This package provides functions to convert R objects into JSON objects
-and vice-versa.")
- (license l:gpl2+)))
-
(define-public gumbo-parser
(package
(name "gumbo-parser")
(define-public jq
(package
(name "jq")
- (version "1.5")
+ (version "1.6")
(source (origin
(method url-fetch)
- (uri (string-append "https://github.com/stedolan/" name
- "/releases/download/" name "-" version
- "/" name "-" version ".tar.gz"))
+ (uri (string-append "https://github.com/stedolan/jq"
+ "/releases/download/jq-" version
+ "/jq-" version ".tar.gz"))
(sha256
(base32
- "0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"))
- ;; This patch has been pushed and the vulnerability will be
- ;; fixed in the next release after 1.5.
- ;; https://github.com/stedolan/jq/issues/995
- (patches (search-patches "jq-CVE-2015-8863.patch"))))
+ "1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn"))))
(inputs
`(("oniguruma" ,oniguruma)))
(native-inputs
(define netsurf-buildsystem
(package
(name "netsurf-buildsystem")
- (version "1.6")
+ (version "1.7")
(source
(origin
(method url-fetch)
"buildsystem-" version ".tar.gz"))
(sha256
(base32
- "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x"))))
+ "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw"))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl)))
(arguments
(define-public libparserutils
(package
(name "libparserutils")
- (version "0.2.3")
+ (version "0.2.4")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5"))))
+ "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public hubbub
(package
(name "hubbub")
- (version "0.3.4")
+ (version "0.3.5")
(source
(origin
(method url-fetch)
"lib" name "-" version "-src.tar.gz"))
(sha256
(base32
- "1shi4hv8drn9zy8f2f6yhnz2dqnpg5jkybvqhzggfjx1q35fbxz3"))
+ "13yq1k96a7972x4r71i9bcsz9yiglj0yx7lj0ziq5r94w5my70ma"))
(patches (search-patches "hubbub-sort-entities.patch"))))
(build-system gnu-build-system)
(native-inputs
(define-public libwapcaplet
(package
(name "libwapcaplet")
- (version "0.4.0")
+ (version "0.4.1")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "15yr0pl6qa6biy36qkmd949ydbjzpqiaccpx3sprh4jknabsk1vv"))))
+ "134pljlm8kby1yy49826f0ixnpig8iqak6xpyl3aivagnsjnxzy8"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libcss
(package
(name "libcss")
- (version "0.7.0")
+ (version "0.8.0")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "16mns3h8vj7iw8myvgnw58q84irvbjlvfkxh8mdw6fbkjvaa7cnz"))))
+ "0pxdqbxn6brj03nv57bsvac5n70k4scn3r5msaw0jgn2k06lk81m"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libdom
(package
(name "libdom")
- (version "0.3.2")
+ (version "0.3.3")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "1zb7x2qwm6p11lph6j2vcyp4a0a8i1klkqilnk5vb4qmlzzpcv7i"))))
+ "1919757mdl3gii2pl6kzm8b1cal0h06r5nqd2y0kny6hc5yrhsp0"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libsvgtiny
(package
(name "libsvgtiny")
- (version "0.1.6")
+ (version "0.1.7")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "12ppy2r7m21ykrjgbf067cgi6dn48fkj7i4b7m64xl4dc13y0ah6"))))
+ "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libnsbmp
(package
(name "libnsbmp")
- (version "0.1.4")
+ (version "0.1.5")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "0y4a0gn4l6lq4z9183wix0mdsgalqyw24k19k8jr8sz4h3lb7jrb"))))
+ "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public libnsgif
(package
(name "libnsgif")
- (version "0.2.0")
+ (version "0.2.1")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "1phwf0m24m6nd7096fw14hanl4f8gr9bcppi834lbik04agxk38a"))))
+ "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public libnsutils
(package
(name "libnsutils")
- (version "0.0.3")
+ (version "0.0.5")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "0wrxn4rcn7xrfnkmf60jafqn3n1kicgsdpnakd821q56bmqvzf0m"))))
+ "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public libnspsl
(package
(name "libnspsl")
- (version "0.1.2")
+ (version "0.1.3")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "0wim5hwzwrfrvvap096whf79m2mnfivbqhqlh03ci9d89xb1w0y9"))))
+ "1rsk1k2a495axxgv8060s0p1phhhcxrv75252kllbkvr8id5kqld"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public nsgenbind
(package
(name "nsgenbind")
- (version "0.5")
+ (version "0.6")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "1iwjpdaan0njlhb9ir6a2q5vpxfmkqfldkvnqszqdz50b44vd1jv"))))
+ "0v1cb1rz5fix9ql31nzmglj7sybya6d12b2fkaypm1avcca59xwj"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public netsurf
(package
(name "netsurf")
- (version "3.7")
+ (version "3.8")
(source
(origin
(method url-fetch)
"releases/source/netsurf-" version "-src.tar.gz"))
(sha256
(base32
- "05kynfzzwd4fc03vbqdjpghh5xnk2yrh43w7vikak89vla30mhpg"))
+ "0hjm1h4m1i913y4mhkl7yqdifn8k70fwi58zdh6faypawzryc3m0"))
(patches (search-patches "netsurf-system-utf8proc.patch"
"netsurf-y2038-tests.patch"
- "netsurf-longer-test-timeout.patch"))))
+ "netsurf-longer-test-timeout.patch"
+ "netsurf-message-timestamp.patch"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
"--localstatedir=/var")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-/bin/sh
+ (add-after 'unpack 'use-absolute-file-names
(lambda _
(substitute* '("bin/varnishtest/vtc_varnish.c"
"bin/varnishtest/vtc_process.c"
"bin/varnishd/mgt/mgt_vcc.c")
(("/bin/sh") (which "sh")))
+ (substitute* "bin/varnishd/mgt/mgt_shmem.c"
+ (("rm -rf") (string-append (which "rm") " -rf")))
#t))
(add-before 'install 'patch-Makefile
(lambda _
l:public-domain ;bin/varnishncsa/as64.c, include/miniobj.h
l:bsd-3)))) ;include/vqueue.h, lib/libvarnishcompat/daemon.c
+(define-public varnish-modules
+ (package
+ (name "varnish-modules")
+ (home-page "https://github.com/varnish/varnish-modules")
+ (version "0.15.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.varnish-software.com"
+ "/varnish-modules/varnish-modules-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("python" ,python)
+ ("varnish" ,varnish)))
+ (synopsis "Collection of Varnish modules")
+ (description
+ "This package provides a collection of modules (@dfn{vmods}) for the Varnish
+cache server, extending the @dfn{Varnish Configuration Language} (VCL) with
+additional capabilities.")
+ (license l:bsd-2)))
+
(define-public xinetd
(package
(name "xinetd")
(define-public hiawatha
(package
(name "hiawatha")
- (version "10.7")
+ (version "10.8.3")
(source
(origin
(method url-fetch)
"hiawatha-" version ".tar.gz"))
(modules '((guix build utils)))
(snippet '(begin
- ;; We use our packaged mbedtls, so delete the included copy.
- (delete-file-recursively "mbedtls")
+ ;; We use packaged libraries, so delete the bundled copies.
+ (for-each delete-file-recursively
+ (list "nghttp2" "mbedtls"))
#t))
(sha256
(base32
- "0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin"))))
+ "0w7047pwijhsbvvv1qjynp7gvn0nil56w82f7ax0gabrg7ddzk6s"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; No tests included
+ `(#:tests? #f ; no tests included
#:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on")
+ (string-append "-DENABLE_HTTP2=on")
+ (string-append "-DUSE_SYSTEM_NGHTTP2=on")
(string-append "-DENABLE_TOMAHAWK=on")
+ (string-append "-DLOG_DIR=/var/log/hiawatha")
+ (string-append "-DPID_DIR=/run")
(string-append "-DWEBROOT_DIR="
(assoc-ref %outputs "out")
- "/share/hiawatha/html"))
+ "/share/hiawatha/html")
+ (string-append "-DWORK_DIR=/var/lib/hiawatha"))
#:phases
(modify-phases %standard-phases
- (add-after 'install 'remove-empty-dirs
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- ;; The directories in "var" are empty, remove them.
- (delete-file-recursively (string-append out "/var"))
- #t)))
+ (add-after 'unpack 'install-no-empty-directories
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("install\\(DIRECTORY DESTINATION" match)
+ (string-append "#" match)))
+ #t))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'hiawatha' finds 'mbedtls'.
(wrap-program (string-append sbin "/hiawatha")
`("PATH" ":" prefix (,mbed)))))))))
(inputs
- ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha"
- `(("mbedtls-apache" ,mbedtls-apache) ;Hiawatha includes this version.
- ("zlib" ,zlib)
- ("libxslt" ,libxslt)
- ("libxml2" ,libxml2)))
+ ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha".
+ `(("libxslt" ,libxslt)
+ ("libxml2" ,libxml2)
+ ("mbedtls-apache" ,mbedtls-for-hiawatha)
+ ("nghttp2" ,nghttp2 "lib")
+ ("zlib" ,zlib)))
(home-page "https://www.hiawatha-webserver.org")
(synopsis "Webserver with focus on security")
(description
(define-public http-parser
(package
(name "http-parser")
- (version "2.8.1")
+ (version "2.9.0")
+ (home-page "https://github.com/nodejs/http-parser")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/nodejs/http-parser/"
- "archive/v" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"))))
+ "1qa3rh9x4as2fc2p0y2hah83iqs7jr5106a8anv317359dgf3ssj"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
#:phases
(modify-phases %standard-phases
(delete 'configure))))
- (home-page "https://github.com/nodejs/http-parser")
(synopsis "HTTP request/response parser for C")
(description "This is a parser for HTTP messages written in C. It parses
both requests and responses. The parser is designed to be used in
(define-public python2-clf
(package-with-python2 python-clf))
-(define-public r-shiny
- (package
- (name "r-shiny")
- (version "1.1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rstudio/shiny.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "041q2gzvzs13syfhbirmkik96asdji8dxnnbs63j7v1ks97hrvvz"))))
- (build-system r-build-system)
- (arguments
- `(#:modules ((guix build r-build-system)
- (guix build minify-build-system)
- (guix build utils)
- (ice-9 match))
- #:imported-modules (,@%r-build-system-modules
- (guix build minify-build-system))
- #:phases
- (modify-phases (@ (guix build r-build-system) %standard-phases)
- (add-after 'unpack 'replace-bundled-minified-JavaScript
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((replace-file (lambda (old new)
- (format #t "replacing ~a with ~a\n" old new)
- (delete-file old)
- (symlink new old))))
- ;; NOTE: Files in ./inst/www/shared/datepicker/js/locales/
- ;; contain just data. They are not minified code, so we don't
- ;; replace them.
- (with-directory-excursion "inst/www/shared"
- (replace-file "bootstrap/shim/respond.min.js"
- (string-append (assoc-ref inputs "js-respond")
- "/share/javascript/respond.min.js"))
- (replace-file "bootstrap/shim/html5shiv.min.js"
- (string-append (assoc-ref inputs "js-html5shiv")
- "/share/javascript/html5shiv.min.js"))
- (replace-file "json2-min.js"
- (string-append (assoc-ref inputs "js-json2")
- "/share/javascript/json2.min.js"))
- (replace-file "strftime/strftime-min.js"
- (string-append (assoc-ref inputs "js-strftime")
- "/share/javascript/strftime.min.js"))
- (replace-file "highlight/highlight.pack.js"
- (string-append (assoc-ref inputs "js-highlight")
- "/share/javascript/highlight.min.js"))
- (replace-file "datatables/js/jquery.dataTables.min.js"
- (string-append (assoc-ref inputs "js-datatables")
- "/share/javascript/jquery.dataTables.min.js"))
- (replace-file "selectize/js/selectize.min.js"
- (string-append (assoc-ref inputs "js-selectize")
- "/share/javascript/selectize.min.js"))
- (replace-file "selectize/js/es5-shim.min.js"
- (string-append (assoc-ref inputs "js-es5-shim")
- "/share/javascript/es5-shim.min.js"))
- (for-each (match-lambda
- ((source . target)
- (delete-file target)
- (minify source #:target target)))
- '(("jqueryui/jquery-ui.js" .
- "jqueryui/jquery-ui.min.js")
- ("showdown/src/showdown.js" .
- "showdown/compressed/showdown.js")
- ("datepicker/js/bootstrap-datepicker.js" .
- "datepicker/js/bootstrap-datepicker.min.js")
- ("ionrangeslider/js/ion.rangeSlider.js" .
- "ionrangeslider/js/ion.rangeSlider.min.js")
- ("bootstrap/js/bootstrap.js" .
- "bootstrap/js/bootstrap.min.js")
- ("shiny.js" .
- "shiny.min.js")
- ("jquery.js" .
- "jquery.min.js")))))
- #t)))))
- (propagated-inputs
- `(("r-crayon" ,r-crayon)
- ("r-httpuv" ,r-httpuv)
- ("r-mime" ,r-mime)
- ("r-jsonlite" ,r-jsonlite)
- ("r-xtable" ,r-xtable)
- ("r-digest" ,r-digest)
- ("r-htmltools" ,r-htmltools)
- ("r-r6" ,r-r6)
- ("r-sourcetools" ,r-sourcetools)))
- (inputs
- `(("js-datatables" ,js-datatables)
- ("js-html5shiv" ,js-html5shiv)
- ("js-json2" ,js-json2)
- ("js-respond" ,js-respond)
- ("js-selectize" ,js-selectize)
- ("js-strftime" ,js-strftime)
- ("js-highlight" ,js-highlight)
- ("js-es5-shim" ,js-es5-shim)))
- (home-page "http://shiny.rstudio.com")
- (synopsis "Easy interactive web applications with R")
- (description
- "Makes it incredibly easy to build interactive web applications
-with R. Automatic \"reactive\" binding between inputs and outputs and
-extensive prebuilt widgets make it possible to build beautiful,
-responsive, and powerful applications with minimal effort.")
- (license l:artistic2.0)))
-
-(define-public r-shinydashboard
- (package
- (name "r-shinydashboard")
- (version "0.7.0")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "shinydashboard" version))
- (sha256
- (base32
- "10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"))))
- (build-system r-build-system)
- ;; The directory inst/AdminLTE/ contains a minified JavaScript file.
- ;; Regenerate it from the included sources.
- (arguments
- `(#:modules ((guix build utils)
- (guix build r-build-system)
- (ice-9 popen))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'generate-minified-javascript
- (lambda _
- (with-directory-excursion "inst/AdminLTE"
- (delete-file "app.min.js")
- (let ((minified (open-pipe* OPEN_READ "uglify-js" "app.js")))
- (call-with-output-file "app.min.js"
- (lambda (port)
- (dump-port minified port))))))))))
- (propagated-inputs
- `(("r-htmltools" ,r-htmltools)
- ("r-shiny" ,r-shiny)))
- (native-inputs
- `(("uglify-js" ,uglify-js)))
- (home-page "http://rstudio.github.io/shinydashboard/")
- (synopsis "Create dashboards with shiny")
- (description "This package provides an extension to the Shiny web
-application framework for R, making it easy to create attractive dashboards.")
- ;; This package includes software that was released under the Expat
- ;; license, but the whole package is released under GPL version 2 or
- ;; later.
- (license l:gpl2+)))
-
-(define-public r-crosstalk
- (package
- (name "r-crosstalk")
- (version "1.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (cran-uri "crosstalk" version))
- (sha256
- (base32
- "0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"))))
- (build-system r-build-system)
- (propagated-inputs
- `(("r-ggplot2" ,r-ggplot2)
- ("r-htmltools" ,r-htmltools)
- ("r-jsonlite" ,r-jsonlite)
- ("r-lazyeval" ,r-lazyeval)
- ("r-r6" ,r-r6)
- ("r-shiny" ,r-shiny)))
- (home-page "https://rstudio.github.io/crosstalk/")
- (synopsis "Inter-widget interactivity for HTML widgets")
- (description
- "This package provides building blocks for allowing HTML widgets to
-communicate with each other, with Shiny or without (i.e. static @code{.html}
-files). It currently supports linked brushing and filtering.")
- (license l:expat)))
-
-(define-public r-rook
- (package
- (name "r-rook")
- (version "1.1-1")
- (source
- (origin
- (method url-fetch)
- (uri (cran-uri "Rook" version))
- (sha256
- (base32
- "00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"))))
- (properties `((upstream-name . "Rook")))
- (build-system r-build-system)
- (propagated-inputs `(("r-brew" ,r-brew)))
- (home-page "https://cran.r-project.org/web/packages/Rook")
- (synopsis "Web server interface for R")
- (description
- "This package contains the Rook specification and convenience software
-for building and running Rook applications. A Rook application is an R
-reference class object that implements a @code{call} method or an R closure
-that takes exactly one argument, an environment, and returns a list with three
-named elements: the @code{status}, the @code{headers}, and the @code{body}.")
- (license l:gpl2)))
-
(define-public rss-bridge
(package
(name "rss-bridge")
- (version "2018-03-11")
+ (version "2018-11-10")
(source
(origin
(method url-fetch)
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1ix15ck45yb659k63mhwxwia6qnm9nn8jw0bga85abrvk1rchjdn"))))
+ "1l9a82smh6k37bjvzbmkdlssxywlmr40ig4cykgsns1iiszwv4ia"))))
(build-system trivial-build-system)
(native-inputs
`(("gzip" ,gzip)
(uri (git-reference
(url "https://github.com/linkchecker/linkchecker")
(commit (string-append "v" version))))
+ (patches
+ (search-patches
+ "linkchecker-mark-more-tests-that-require-the-network.patch"))
+ (file-name (git-file-name name version))
(sha256
(base32
"03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"))))
`(("python2-dnspython" ,python2-dnspython)
("python2-pyxdg" ,python2-pyxdg)
("python2-requests" ,python2-requests)))
+ (native-inputs
+ `(("gettext" ,gettext-minimal)
+ ("python2-pytest" ,python2-pytest)
+ ("python2-miniboa" ,python2-miniboa)
+ ("python2-parameterized" ,python2-parameterized)))
(arguments
- `(#:python ,python-2))
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ ;; Move the 'check phase to after 'install, so that the installed
+ ;; library can be used
+ (delete 'check)
+ (add-after 'install 'check
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; Set PYTHONPATH so that the installed linkchecker is used
+ (setenv "PYTHONPATH"
+ (string-append out "/lib/python2.7/site-packages"
+ ":"
+ (getenv "PYTHONPATH")))
+ ;; Remove this directory to avoid it being used when running
+ ;; the tests
+ (delete-file-recursively "linkcheck")
+
+ (invoke "py.test" "tests"))
+ #t)))))
(home-page "https://linkcheck.github.io/linkchecker")
(synopsis "Check websites for broken links")
(description "LinkChecker is a website validator. It checks for broken
(define-public nghttp2
(package
(name "nghttp2")
- (version "1.31.1")
+ (version "1.32.0")
(source
(origin
(method url-fetch)
name "-" version ".tar.xz"))
(sha256
(base32
- "00z1687m4wi2gbgkijbv099l9hs1sjlyzbhh8jhn0xssx4xcifb5"))))
+ "0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh"))))
(build-system gnu-build-system)
(outputs (list "out"
"lib")) ; only libnghttp2
(license l:expat)))
(define-public hpcguix-web
- (let ((commit "87cb51611c0f1fd3863b830614ab1364599cf1ca"))
+ (let ((commit "53e09ea59ec0380b41a4cbda32df8bdb9a10004d")
+ (revision "3"))
(package
(name "hpcguix-web")
- (version (git-version "0.0.1" "1" commit))
+ (version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "0p66fl8r3v73v13fqg9rbqbzbdzvyznchxbq2s1jwq6qfsn2w3gr"))))
+ "1ah4pn9697vazhbvd45n4b1rrkx2nbhnw384cr0b941q3sz1dfyc"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(srfi srfi-26)
(ice-9 popen)
(ice-9 rdelim))
-
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'autoconf
+ (add-before 'configure 'set-variables
(lambda _
+ ;; This prevents a few warnings
(setenv "GUILE_AUTO_COMPILE" "0")
(setenv "XDG_CACHE_HOME" (getcwd))
- (invoke "autoreconf" "-vif")))
+ #t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(guix (assoc-ref inputs "guix"))
(guile (assoc-ref inputs "guile"))
+ (gcrypt (assoc-ref inputs "guile-gcrypt"))
+ (git (assoc-ref inputs "guile-git"))
+ (bs (assoc-ref inputs "guile-bytestructures"))
(json (assoc-ref inputs "guile-json"))
(guile-cm (assoc-ref inputs
"guile-commonmark"))
- (deps (list guile guile-cm guix json))
+ (deps (list guile gcrypt git bs guile-cm guix json))
(effective
(read-line
(open-pipe* OPEN_READ
HCoop / jackhill / guix / guix.git / blobdiff