;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
+;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages libunwind)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp-xyz)
+ #:use-module (gnu packages lsof)
#:use-module (gnu packages lua)
#:use-module (gnu packages markup)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages networking)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
#:use-module (gnu packages openstack)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages pcre)
(define-public httpd
(package
(name "httpd")
- (version "2.4.43")
+ (version "2.4.46")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/httpd/httpd-"
version ".tar.bz2"))
(sha256
(base32
- "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4"))))
+ "1sj1rwgbcjgkzac3ybjy7j68c9b3dv3ap71m48mrjhf6w7vds3kl"))))
(build-system gnu-build-system)
(native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config'
(inputs `(("apr" ,apr)
(define-public mod-wsgi
(package
(name "mod-wsgi")
- (version "4.5.22")
+ (version "4.7.1")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/GrahamDumpleton/mod_wsgi.git")
+ (url "https://github.com/GrahamDumpleton/mod_wsgi")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1q90xw2cbhka5gcd6yc69iir73x4gm7fm75qpkins2ryfl6w1q3f"))))
+ "1savh6h3qds20mwn1nqasmqzcp57pdhfc9v4b4k78d6q28y0r17s"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; TODO: can't figure out if there are tests
;; ’stable’ and recommends that “in general you deploy the NGINX mainline
;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/)
;; Consider updating the nginx-documentation package together with this one.
- (version "1.17.9")
+ (version "1.19.2")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
- "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx"))))
+ "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw"))))
(build-system gnu-build-system)
(inputs `(("openssl" ,openssl)
("pcre" ,pcre)
(string-append "--crossbuild="
system ":" release ":" machine)))))
(setenv "CC" "gcc")
- (format #t "environment variable `CC' set to `gcc'~%")
(format #t "configure flags: ~s~%" flags)
(apply invoke "./configure" flags)
#t)))
(license license:bsd-2))))
(define-public nginx-documentation
- ;; This documentation should be relevant for nginx@1.15.9.
- (let ((revision 2345)
- (changeset "7ef11708457e"))
+ ;; This documentation should be relevant for the current nginx package.
+ (let ((version "1.19.2")
+ (revision 2581)
+ (changeset "324ca14c3003"))
(package
(name "nginx-documentation")
- (version
- (simple-format #f "2019-03-01-~A-~A" revision changeset))
+ (version (simple-format #f "~A-~A-~A" version revision changeset))
(source
(origin (method hg-fetch)
(uri (hg-reference
(file-name (string-append name "-" version))
(sha256
(base32
- "15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y"))))
+ "15bdbi6cjqhx8lqsyr3hnwagq2r80bsyh2im80ajmbfv7y47djqi"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/giom/nginx_accept_language_module.git")
+ (url "https://github.com/giom/nginx_accept_language_module")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/gnosek/fcgiwrap.git")
+ (url "https://github.com/gnosek/fcgiwrap")
(commit version)))
(file-name (git-file-name name version))
(sha256
(define-public json-c
(package
+ (replacement json-c/fixed)
(name "json-c")
- (version "0.13.1")
+ (version "0.14")
(source (origin
(method url-fetch)
(uri (string-append
version ".tar.gz"))
(sha256
(base32
- "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq"))
+ "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/json-c/json-c/wiki")
+ (synopsis "JSON implementation in C")
+ (description
+ "JSON-C implements a reference counting object model that allows you to
+easily construct JSON objects in C, output them as JSON-formatted strings and
+parse JSON-formatted strings back into the C representation of JSON objects.
+It aims to conform to RFC 7159.")
+ (license license:x11)))
+
+(define json-c/fixed
+ (package
+ (inherit json-c)
+ (name "json-c")
+ (version "0.14")
+ (source (origin
+ (inherit (package-source json-c))
+ (patches (search-patches "json-c-CVE-2020-12762.patch"))))))
+
+;; TODO: Remove these old versions when all dependents have been updated.
+(define-public json-c-0.13
+ (package
+ (inherit json-c)
+ (version "0.13.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://s3.amazonaws.com/json-c_releases/releases/json-c-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq"))
+ (patches (search-patches "json-c-0.13-CVE-2020-12762.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(set-file-time "config.h.in"
(stat "aclocal.m4"))
#t))))
- (build-system gnu-build-system)
- (home-page "https://github.com/json-c/json-c/wiki")
- (synopsis "JSON implementation in C")
- (description
- "JSON-C implements a reference counting object model that allows you to
-easily construct JSON objects in C, output them as JSON-formatted strings and
-parse JSON-formatted strings back into the C representation of JSON objects.
-It aims to conform to RFC 7159.")
- (license license:x11)))
+ (build-system gnu-build-system)))
-;; TODO: remove this old version when all dependents have been updated.
(define-public json-c-0.12
(package
- (inherit json-c)
+ (inherit json-c-0.13)
(version "0.12.1")
(source (origin
(method url-fetch)
version ".tar.gz"))
(sha256
(base32 "08qibrq29a5v7g23wi5icy6l4fbfw90h9ccps6vq0bcklx8n84ra"))
+ (patches (search-patches "json-c-0.12-CVE-2020-12762.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; do not use auto-generated tarballs
(method git-fetch)
(uri (git-reference
- (url "https://github.com/udp/json-parser.git")
+ (url "https://github.com/udp/json-parser")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/flavio/qjson.git")
+ (url "https://github.com/flavio/qjson")
(commit version)))
(file-name (git-file-name name version))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/ayoy/qoauth.git")
+ (url "https://github.com/ayoy/qoauth")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Tencent/rapidjson.git")
+ (url "https://github.com/Tencent/rapidjson")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lloyd/yajl.git")
+ (url "https://github.com/lloyd/yajl")
(commit version)))
(file-name (git-file-name name version))
(sha256
;; things from Git.
(method git-fetch)
(uri (git-reference
- (url "https://github.com/warmcat/libwebsockets.git")
+ (url "https://github.com/warmcat/libwebsockets")
(commit (string-append "v" version
"-chrome37-firefox30"))))
(sha256
(define-public websocketpp
(package
(name "websocketpp")
- (version "0.8.1")
+ (version "0.8.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/zaphoyd/websocketpp.git")
+ (url "https://github.com/zaphoyd/websocketpp")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy"))
- (patches (search-patches "websocketpp-fix-for-boost-1.70.patch"))))
+ (base32 "1ww4fhl8qf12hkv6jaild8zzsygdspxm1gqpk2f63gv1xfi31wpm"))
+ (patches (search-patches "websocketpp-fix-for-cmake-3.15.patch"))))
(build-system cmake-build-system)
(inputs `(("boost" ,boost)
("openssl" ,openssl)))
(define-public wslay
(package
(name "wslay")
- (version "1.1.0")
+ (version "1.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tatsuhiro-t/wslay.git")
+ (url "https://github.com/tatsuhiro-t/wslay")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ak9a6hsanhys40yhv7c2gqkfghpm6jx36j1pnml8ajvgaky5q98"))))
+ (base32 "1w32iljg4inqf0712w5fxxhggvmjh6ipl2lnz0h36dv1xrj0d964"))))
(build-system gnu-build-system)
(arguments
;; Parallel builds don't reliably succeed.
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/novnc/websockify.git")
+ (url "https://github.com/novnc/websockify")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(define-public libyaml
(package
(name "libyaml")
- (version "0.1.7")
+ (version "0.2.4")
(source
(origin
(method url-fetch)
- (uri (string-append
- "http://pyyaml.org/download/libyaml/yaml-"
- version ".tar.gz"))
+ (uri (string-append "https://pyyaml.org/download/libyaml/yaml-"
+ version ".tar.gz"))
(sha256
- (base32
- "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"))))
+ (base32 "0mq5wf17ifcwwxq3kbimhi53jn3fg23vcynqpzxjcz3vfjlfs2nq"))))
(build-system gnu-build-system)
- (home-page "http://pyyaml.org/wiki/LibYAML")
+ (home-page "https://pyyaml.org/wiki/LibYAML")
(synopsis "YAML 1.1 parser and emitter written in C")
(description
"LibYAML is a YAML 1.1 parser and emitter written in C.")
(license license:expat)))
-(define-public libyaml-2.1
- (package
- (inherit libyaml)
- (version "0.2.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://pyyaml.org/download/libyaml/yaml-"
- version ".tar.gz"))
- (sha256
- (base32
- "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q"))))))
-
(define-public libquvi-scripts
(package
(name "libquvi-scripts")
(source
(origin
(method url-fetch)
- (uri (string-append "https://archive.apache.org/dist/serf/serf-"
+ (uri (string-append "mirror://apache/serf/serf-"
version ".tar.bz2"))
(sha256
(base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"))))
(package
(name "libsass")
;; When updating, check whether sassc/libsass-3.5 is still needed.
- (version "3.6.3")
+ (version "3.6.4")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sass/libsass.git")
+ (url "https://github.com/sass/libsass")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1vn0q343d1vxz5q0xb6f9dzjah8z6j0s6x0lwvwdd55xa8z7rsnh"))))
+ "0r8lfqvr3rjhjd8r036zd1wc9q17gyiskppcw9m13jks9an7xp4j"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sass/sassc.git")
+ (url "https://github.com/sass/sassc")
(commit version)))
(file-name (git-file-name name version))
(sha256
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/sass/libsass.git")
+ (url "https://github.com/sass/libsass")
(commit version)))
(file-name (git-file-name name version))
(sha256
(define-public perl-catalyst-devel
(package
(name "perl-catalyst-devel")
- (version "1.40")
+ (version "1.41")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
+ (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
"Catalyst-Devel-" version ".tar.gz"))
(sha256
- (base32 "1fqnw6cizpxnfr87rpid8w1wpi1p1lxg6imfjpixqn7s055hcpwc"))))
+ (base32 "1r8arq7sw37d0mjyfzkc3pg1a9plgydqbscryc8qpvba4swpljls"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)))
(define-public perl-catalyst-plugin-configloader
(package
(name "perl-catalyst-plugin-configloader")
- (version "0.34")
+ (version "0.35")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://cpan/authors/id/B/BO/BOBTFISH/"
+ (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
"Catalyst-Plugin-ConfigLoader-"
version ".tar.gz"))
(sha256
- (base32
- "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"))))
+ (base32 "0w8r3bbxqnlykvra6sx3sh3wh8ylkj914xg5ql6nw11ddy56jaly"))))
(build-system perl-build-system)
(native-inputs
`(("perl-path-class" ,perl-path-class)
(define-public perl-catalyst-view-tt
(package
(name "perl-catalyst-view-tt")
- (version "0.44")
+ (version "0.45")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
+ (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
"Catalyst-View-TT-" version ".tar.gz"))
(sha256
- (base32
- "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"))))
+ (base32 "0jzgpkgq5pwq82zlb0nykdyk40dfpsyn9ilz91d0wpixgi9i5pr8"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-catalyst-runtime" ,perl-catalyst-runtime)
(define-public perl-cgi
(package
(name "perl-cgi")
- (version "4.46")
+ (version "4.47")
(source
(origin
(method url-fetch)
"CGI-" version ".tar.gz"))
(sha256
(base32
- "16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq"))))
+ "1a9cylhqsm5icvbg09m21nj0xx4zy5gbk4p74npm1ch3qlryzyyr"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-deep" ,perl-test-deep)
and retry a few times.")
(license license:perl-license)))
+(define-public perl-lwpx-paranoidagent
+ (package
+ (name "perl-lwpx-paranoidagent")
+ (version "1.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"))))
+ (build-system perl-build-system)
+ (propagated-inputs
+ `(("perl-libwww" ,perl-libwww)
+ ;; Users should instead make sure SSL_ca_path is set properly.
+ ;; ("perl-mozilla-ca" ,perl-mozilla-ca)
+ ("perl-net-dns" ,perl-net-dns)))
+ (home-page "https://metacpan.org/release/LWPx-ParanoidAgent")
+ (synopsis "Security enhanced subclass of LWP::UserAgent")
+ (description "@code{LWPx::ParanoidAgent} is a class subclassing
+@code{LWP::UserAgent} but paranoid against attackers. Its purpose is
+to vet requests for a remote resource on behalf of a possibly
+malicious user. The class can do the same as @code{LWP::UserAgent},
+except that proxy support has been removed. Support for URI schemes
+is limited to http and https.")
+ (license license:perl-license)))
+
(define-public perl-net-amazon-s3
(package
(name "perl-net-amazon-s3")
(package-with-python2 python-feedparser))
(define-public guix-data-service
- (let ((commit "d1c243f7fd8902f359ff06fb78dce663cf4297ce")
- (revision "19"))
+ (let ((commit "c596a1c6a90bb2fe07da5339b8dc832b81d94194")
+ (revision "21"))
(package
(name "guix-data-service")
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
(file-name (git-file-name name version))
(sha256
(base32
- "1ji8d4vwmv7j9h7z96hvzi3zvik594yngjrdal37w13fbxy2v6sw"))))
+ "09gn2imhh3aqkzray0xgkz7slriy567inh5lpkxm74bgmx862g3g"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE
(lambda _
- ;; To avoid errors relating to guild
+ ;; To avoid warnings relating to 'guild'.
(setenv "GUILE_AUTO_COMPILE" "0")
#t))
(add-after 'install 'wrap-executable
("guile-fibers" ,guile3.0-fibers)
("guile-json" ,guile3.0-json)
("guile-email" ,guile3.0-email)
+ ("guile-prometheus" ,guile-prometheus)
("guile-squee" ,guile3.0-squee)
("ephemeralpg" ,ephemeralpg)
("util-linux" ,util-linux)
("postgresql" ,postgresql-11)
("sqitch" ,sqitch)))
(native-inputs
- `(("guile" ,guile-3.0)
+ `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("autoconf" ,autoconf)
("automake" ,automake)
("emacs-minimal" ,emacs-minimal)
(define-public uhttpmock
(package
(name "uhttpmock")
- (version "0.5.1")
+ (version "0.5.3")
(source
(origin
(method url-fetch)
- (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/"
- name "-" version ".tar.xz"))
+ (uri (string-append "https://tecnocode.co.uk/downloads/uhttpmock/"
+ "uhttpmock-" version ".tar.xz"))
(sha256
- (base32
- "163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6"))))
+ (base32 "0bqizz69hxk8rn4z57asz1d45vizl1rj6i5k3rzxn2x3qcik514h"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
(define netsurf-buildsystem
(package
(name "netsurf-buildsystem")
- (version "1.7")
+ (version "1.9")
(source
(origin
(method url-fetch)
"buildsystem-" version ".tar.gz"))
(sha256
(base32
- "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw"))))
+ "0alsmaig9ln8dgllb3z63gq90fiz75jz0ic71fi0k0k898qix14k"))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl)))
(arguments
(define-public hubbub
(package
(name "hubbub")
- (version "0.3.6")
+ (version "0.3.7")
(source
(origin
(method url-fetch)
"libhubbub-" version "-src.tar.gz"))
(sha256
(base32
- "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp"))
+ "1dimfyblmym98qa1b80c5jslv2zk8r44xbdrgrsrw1n9wr9y4yly"))
(patches (search-patches "hubbub-sort-entities.patch"))))
(build-system gnu-build-system)
(native-inputs
(define-public ikiwiki
(package
(name "ikiwiki")
- (version "3.20190228")
+ (version "3.20200202.3")
(source
(origin
- (method url-fetch)
- (uri (string-append "http://snapshot.debian.org/archive/debian/"
- "20190301T035241Z/pool/main/i/ikiwiki/ikiwiki_"
- version ".orig.tar.xz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://git.ikiwiki.info/")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"))))
+ "0fphyqzlk9y8v9s89ypsmrnbhyymzrpc2w0liy0n4knc7kk2pabq"))
+ (snippet
+ '(begin
+ ;; The POT file requires write permission during the build
+ ;; phase.
+ (chmod "po/ikiwiki.pot" #o644)
+ #t))))
(build-system perl-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'include-PERL5LIB-in-wrapper
- (lambda _
- (substitute* "IkiWiki/Wrapper.pm"
- (("^@wrapper\\_hooks")
- (string-append
- "@wrapper_hooks\n"
- " addenv(\"PERL5LIB\", \""
- (getenv "PERL5LIB")
- "\");")))))
- (add-after 'patch-source-shebangs 'patch-Makefile
+ (add-after 'patch-source-shebangs 'patch-Makefiles
(lambda _
(substitute* "Makefile.PL"
- (("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)"))
+ (("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)"))
+ (with-directory-excursion "po"
+ (substitute* "Makefile"
+ (("PERL5LIB=") "PERL5LIB=${PERL5LIB}:")))
+ #t))
+ (add-before 'build 'set-modification-times
+ ;; The wiki '--refresh' steps, which are executed during
+ ;; the check phase, require recent timestamps on files in
+ ;; the 'doc' and 'underlays' directories.
+ (lambda _
+ (invoke "find" "doc" "underlays" "-type" "f" "-exec"
+ "touch" "{}" "+")
+ #t))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Six tests use IPC::Run. For these tests the PERL5LIB
+ ;; variable is needed in the runtime environment and also
+ ;; in the search path list in the setup file.
+ (substitute*
+ '("t/aggregate-file.t" "t/git-cgi.t" "t/git-untrusted.t"
+ "t/passwordauth.t" "t/relativity.t" "t/wrapper-environ.t")
+ (("(.*)\"perl\"(.*)$" _ prefix suffix)
+ (string-append prefix "qw(env), 'PERL5LIB='.$ENV{PERL5LIB}"
+ ", qw(perl)" suffix))
+ (("(.*) PERL5LIB=(.*) perl(.*)$" _ prefix middle suffix)
+ (string-append prefix "), 'PERL5LIB='.$ENV{PERL5LIB}.':"
+ middle "', qw(perl" suffix))
+ (("(.*)setup(.* )getcwd(.*)$" _ prefix middle suffix)
+ (string-append prefix "setup" middle
+ "$ENV{PERL5LIB}.':'.getcwd" suffix))
+ (("^ENV(.*): '(.*)$" _ middle suffix)
+ (string-append "ENV" middle
+ ": '$ENV{PERL5LIB}:" suffix)))
+ ;; XDG_DATA_DIRS is needed by the podcast.t test.
+ (setenv "XDG_DATA_DIRS"
+ (string-append (assoc-ref inputs "shared-mime-info")
+ "/share"))
+ ;; CC is needed by IkiWiki/Wrapper.pm.
+ (setenv "CC" "gcc")
#t))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
#t))))))
(native-inputs
`(("which" ,which)
- ("perl-html-tagset" ,perl-html-tagset)
- ("perl-timedate" ,perl-timedate)
- ("perl-xml-sax" ,perl-xml-sax)
- ("perl-xml-simple" ,perl-xml-simple)
("gettext" ,gettext-minimal)
("subversion" ,subversion)
("git" ,git)
("mercurial" ,mercurial)))
(inputs
`(("python" ,python-wrapper)
- ("perl-cgi-formbuilder" ,perl-cgi-formbuilder)
- ("perl-cgi-session" ,perl-cgi-session)
+ ("perl-authen-passphrase" ,perl-authen-passphrase)
("perl-cgi-simple" ,perl-cgi-simple)
("perl-db-file" ,perl-db-file)
+ ("perl-file-mimeinfo" ,perl-file-mimeinfo)
+ ("perl-html-tagset" ,perl-html-tagset)
+ ("perl-image-magick" ,perl-image-magick)
+ ("perl-ipc-run" ,perl-ipc-run)
+ ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent)
+ ("perl-xml-feed" ,perl-xml-feed)
+ ("perl-xml-sax" ,perl-xml-sax)
+ ("perl-xml-twig" ,perl-xml-twig)
+ ("po4a" ,po4a)))
+ (propagated-inputs
+ `(("perl-cgi-formbuilder" ,perl-cgi-formbuilder)
+ ("perl-cgi-session" ,perl-cgi-session)
("perl-html-parser" ,perl-html-parser)
("perl-html-scrubber" ,perl-html-scrubber)
("perl-html-template" ,perl-html-template)
- ("perl-image-magick" ,perl-image-magick)
("perl-json" ,perl-json)
+ ("perl-mail-sendmail" ,perl-mail-sendmail)
("perl-text-markdown-discount" ,perl-text-markdown-discount)
+ ("perl-timedate" ,perl-timedate)
("perl-uri" ,perl-uri)
+ ("perl-xml-simple" ,perl-xml-simple)
("perl-yaml-libyaml" ,perl-yaml-libyaml)))
(home-page "https://ikiwiki.info/")
(synopsis "Wiki compiler, capable of generating HTML")
(define-public libwapcaplet
(package
(name "libwapcaplet")
- (version "0.4.2")
+ (version "0.4.3")
(source
(origin
(method url-fetch)
"libwapcaplet-" version "-src.tar.gz"))
(sha256
(base32
- "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86"))))
+ "0p0c2q9lsj4vs97aa7vjllfhw33zv3dpysdkjblzhib6dpfs2alv"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libcss
(package
(name "libcss")
- (version "0.9.0")
+ (version "0.9.1")
(source
(origin
(method url-fetch)
"libcss-" version "-src.tar.gz"))
(sha256
(base32
- "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr"))))
+ "1p66sdiiqm7w4jkq23hsf08khsnmq93hshh9f9m8sbirjdpf3p6j"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libcyaml
(package
(name "libcyaml")
- (version "1.0.1")
+ (version "1.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/tlsa/libcyaml.git")
+ (url "https://github.com/tlsa/libcyaml")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))
+ (base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(inputs
`(("libyaml" ,libyaml)))
(native-inputs
- `(("git", git)
- ("pkg-config", pkg-config)))
+ `(("pkg-config", pkg-config)))
(synopsis "C library for reading and writing YAML")
(description
"LibCYAML is a C library written in ISO C11 for reading and writing
(define-public libdom
(package
(name "libdom")
- (version "0.4.0")
+ (version "0.4.1")
(source
(origin
(method url-fetch)
"libdom-" version "-src.tar.gz"))
(sha256
(base32
- "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy"))))
+ "0jpg5hx3y0mdxk5szd47dyijqimd2321brbqk2620pp5f4j0gvlq"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public libnsbmp
(package
(name "libnsbmp")
- (version "0.1.5")
+ (version "0.1.6")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35"))))
+ "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public libnslog
(package
(name "libnslog")
- (version "0.1.2")
+ (version "0.1.3")
(source
(origin
(method url-fetch)
"libnslog-" version "-src.tar.gz"))
(sha256
(base32
- "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd"))))
+ "1l2k0kdv9iv18svhv360vszjavhl4g09cp8a8yb719pgsylxr67w"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
("pkg-config" ,pkg-config)
- ("check" ,check-0.12) ; For tests
+ ("check" ,check) ; For tests
("bison" ,bison)
("flex" ,flex)))
(arguments netsurf-buildsystem-arguments)
(define-public libnsutils
(package
(name "libnsutils")
- (version "0.0.5")
+ (version "0.1.0")
(source
(origin
(method url-fetch)
name "-" version "-src.tar.gz"))
(sha256
(base32
- "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf"))))
+ "1w5fyy2i60a3v3if3iqcn9sy9sycx6966rcx53v85gja6hb6a33r"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public libnspsl
(package
(name "libnspsl")
- (version "0.1.5")
+ (version "0.1.6")
(source
(origin
(method url-fetch)
"libnspsl-" version "-src.tar.gz"))
(sha256
(base32
- "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd"))))
+ "02q28n5i6fwqcz1nn167rb71k1q95mx38mfah6zi1lvqrc2q5ifk"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)))
(define-public nsgenbind
(package
(name "nsgenbind")
- (version "0.7")
+ (version "0.8")
(source
(origin
(method url-fetch)
"nsgenbind-" version "-src.tar.gz"))
(sha256
(base32
- "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq"))))
+ "1cqwgwca49jvmijwiyaab2bwxicgxdrnlpinf8kp3nha02nm73ad"))))
(build-system gnu-build-system)
(native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem)
(define-public netsurf
(package
(name "netsurf")
- (version "3.9")
+ (version "3.10")
(source
(origin
(method url-fetch)
"releases/source/netsurf-" version "-src.tar.gz"))
(sha256
(base32
- "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp"))
+ "0plra64c5xyiw12yx2q13brxsv8apmany97zqa2lcqckw4ll8j1n"))
(patches (search-patches "netsurf-system-utf8proc.patch"
"netsurf-y2038-tests.patch"
"netsurf-longer-test-timeout.patch"
(display (read-line in 'concat) out)
(sxml->xml
(let rec ((sxml (xml->sxml in
- #:default-entity-handler
- (lambda (port name)
- (string-append "<ENTITY>"
- (symbol->string name)
- "</ENTITY>")))))
+ #: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))
+ (`(ENTITY ,ent)
+ `(*ENTITY* ,ent))
((x ...)
(map rec x))
(x x)))
on the fly.")
(license license:x11)))
+(define-public hitch
+ (package
+ (name "hitch")
+ (version "1.6.0")
+ (home-page "https://hitch-tls.org/")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append home-page "source/hitch-" version ".tar.gz"))
+ (sha256
+ (base32
+ "01n70yf8hx42jb801jv5q1xhrpqxyjnqhd98hjf81lvxpd5fnisf"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Most tests attempts to access hitch-tls.org which is
+ ;; unavailable in the build container. Run them against
+ ;; a dummy local web server instead.
+ (for-each (lambda (test)
+ (substitute* test
+ (("\\[hitch-tls\\.org\\]:80")
+ "[localhost]:8000")))
+ (find-files "src/tests" "\\.sh$"))
+ (system "python3 -m http.server &")
+
+ ;; The build container does not reap zombie processes,
+ ;; causing stop_hitch to hang indefinitely while waiting
+ ;; for the process to terminate because 'kill -0' never
+ ;; succeeds. Use a different test to see whether the
+ ;; process has shut down.
+ (substitute* "src/tests/hitch_test.sh"
+ (("kill -0 \"\\$HITCH_PID\"")
+ "$(ps -p $HITCH_PID -o state= | grep -qv '^Z$')"))
+ #t)))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+
+ ;; For tests.
+ ("curl" ,curl)
+ ("egrep" ,grep)
+ ("lsof" ,lsof)
+ ("python" ,python)))
+ (inputs
+ `(("libev" ,libev)
+ ("openssl" ,openssl)))
+ (synopsis "Scalable TLS proxy")
+ (description
+ "Hitch is a performant TLS proxy based on @code{libev}. It terminates
+SSL/TLS connections and forwards the unencrypted traffic to a backend such
+as a web server. It is designed to handle many thousand connections on
+multicore machines.")
+ (license license:bsd-2)))
+
(define-public httptunnel
(package
(name "httptunnel")
(package
(name "varnish-modules")
(home-page "https://github.com/varnish/varnish-modules")
- (version "0.15.0")
+ (version "0.16.0")
(source (origin
(method url-fetch)
- (uri (string-append "https://download.varnish-software.com"
- "/varnish-modules/varnish-modules-"
- version ".tar.gz"))
+ (uri (string-append "https://github.com/varnish/varnish-modules"
+ "/releases/download/varnish-modules-" version
+ "/varnish-modules-" version ".tar.gz"))
(sha256
(base32
- "09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751"))))
+ "1ph5bplsip4rycql1c2hgbvmrwbgcrgv2ldgfp7saxxbsv5cpcds"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(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
+cache server, extending the @acronym{VCL, Varnish Configuration Language} with
additional capabilities.")
(license license:bsd-2)))
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/openSUSE/xinetd.git")
+ (url "https://github.com/openSUSE/xinetd")
(commit version)))
(file-name (git-file-name name version))
(sha256
(define-public tidy-html
(package
(name "tidy-html")
- (version "5.6.0")
+ (version "5.7.28")
(source
(origin
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32
- "0w175c5d1babq0w1zzdzw9gl6iqbgyq58v8587s7srp05y3hwy9k"))))
+ "01k5sqwgcsr26i8031v1yr2r8qcy9a5w7sj800660haszgfbjz2f"))))
(build-system cmake-build-system)
(outputs '("out"
"static")) ; 1.3MiB of .a files
(define-public hiawatha
(package
(name "hiawatha")
- (version "10.10")
+ (version "10.11")
(source
(origin
(method url-fetch)
(list "extra/nghttp2.tgz" "mbedtls"))
#t))
(sha256
- (base32 "1nd46cx1qp5lh2kwnn2mlwk9zm8jm7pgf90xs9vpwr7saxbnzr5m"))))
+ (base32 "09wpgilbv13zal71v9lbsqr8c3fignygadykpd1p1pb8blb5vn3r"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests included
(define-public http-parser
(package
(name "http-parser")
- (version "2.9.3")
+ (version "2.9.4")
(home-page "https://github.com/nodejs/http-parser")
- (source (origin
- (method git-fetch)
- (uri (git-reference (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (patches
- ;; When parsing URLs, treat an empty port (eg
- ;; `http://hostname:/`) as if it were unspecified. This patch is
- ;; applied to Fedora's http-parser and to libgit2's bundled version.
- (list
- (origin
- (method url-fetch)
- (uri (string-append
- "https://src.fedoraproject.org/rpms/http-parser/raw/"
- "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/"
- "f/0001-url-treat-empty-port-as-default.patch"))
- (sha256
- (base32
- "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))
- (sha256
- (base32
- "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page)
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"))
+ (file-name (git-file-name name version))
+ (patches
+ (list
+ (origin
+ ;; Treat an empty port (e.g. `http://hostname:/`) when parsing
+ ;; URLs as if no port were specified. This patch is applied
+ ;; to Fedora's http-parser and to libgit2's bundled version.
+ (method url-fetch)
+ (uri (string-append
+ "https://src.fedoraproject.org/rpms/http-parser/raw/"
+ "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/"
+ "f/0001-url-treat-empty-port-as-default.patch"))
+ (sha256
+ (base32
+ "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
'("CC=gcc")))
#:phases
(modify-phases %standard-phases
+ ,@(match (%current-system)
+ ("armhf-linux"
+ '((add-before 'check 'apply-assertion.patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((patch (assoc-ref inputs "assertion.patch")))
+ (invoke "patch" "-p1" "-i" patch)
+ #t)))))
+ (_ '()))
,@(if (%current-target-system)
'((replace 'configure
(lambda* (#:key target #:allow-other-keys)
(string-append "AR=" target "-ar\n")))
#t)))
'((delete 'configure))))))
+ (native-inputs
+ `(,@(match (%current-system)
+ ("armhf-linux"
+ ;; A fix for <https://issues.guix.gnu.org/40604> which in turn
+ ;; breaks i686-linux builds.
+ `(("assertion.patch"
+ ,@(search-patches "http-parser-fix-assertion-on-armhf.patch"))))
+ (_ '()))))
(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 jo
(package
(name "jo")
- (version "1.3")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/jpmens/jo/releases/download/"
version "/jo-" version ".tar.gz"))
(sha256
- (base32
- "0r6yb8pjsbcqfyac4240a0sj93pb91fv385bpk395cx3f5bcj9fy"))))
+ (base32 "18jna9xlpxci3cak3z85c448zv2zr41baclgym3hk433p0p4vii4"))))
(build-system gnu-build-system)
(home-page "https://github.com/jpmens/jo")
(synopsis "Output JSON from a shell")
(name "java-eclipse-jetty-test-helper")
(version "4.2")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/eclipse/jetty.toolchain/"
- "archive/jetty-test-helper-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/eclipse/jetty.toolchain/")
+ (commit (string-append "jetty-test-helper-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1jd6r9wc26fa11si4rn2gvy8ml8q4zw1nr6v04mjp8wvwpgvzwx5"))))
+ "1g7cdh03nfwbdxzvwm84ysgvw08xx7431lsjryj2gmf3lrqpizgb"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "eclipse-jetty-test-helper.jar"
(package
(name "nghttp2")
(version "1.40.0")
+ (replacement nghttp2-1.41)
(source
(origin
(method url-fetch)
`(("jemalloc" ,jemalloc))) ; fight nghttpd{,x} heap fragmentation
("libev" ,libev)
("libxml2" ,libxml2) ; for ‘nghttp -a’
- ("openssl" ,openssl)))
+ ("openssl" ,openssl)
+ ,@(if (hurd-target?)
+ `(("openssl-static" ,openssl "static"))
+ '())))
(arguments
`(#:configure-flags
(list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib")
@end itemize\n")
(license license:expat)))
+(define-public nghttp2-1.41 ;fixes CVE-2020-11080
+ (package
+ (inherit nghttp2)
+ (version "1.41.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/nghttp2/nghttp2/"
+ "releases/download/v" version "/"
+ "nghttp2-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1hk77vngjmvvzb5y1gi1aqwf6qywrc7yak08zvzb7x81qs6mphmb"))))))
+
(define-public hpcguix-web
- (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508")
- (revision "4"))
+ (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74")
+ (revision "5"))
(package
(name "hpcguix-web")
(version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/UMCUGenetics/hpcguix-web.git")
+ (url "https://github.com/UMCUGenetics/hpcguix-web")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "0idzzlwnaymk6hm5q9nh146h5m6vd8acp32vlmzp6qq08mimfkq7"))))
+ "0wjgj2s7v2cyz6dx24c111rxs99i84sfvxl4ch8brnh02j2606jz"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
("uglify-js" ,uglify-js)
("pkg-config" ,pkg-config)))
(inputs
- `(("guix" ,guix)))
+ `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
+ ("guix" ,guix)))
(propagated-inputs
- `(("guile" ,guile-3.0)
+ `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("guile-commonmark" ,guile-commonmark)
- ("guile-json" ,guile-json-3)))
+ ("guile-json" ,guile-json-4)))
(home-page "https://github.com/UMCUGenetics/hpcguix-web")
(synopsis "Web interface for cluster deployments of Guix")
(description "Hpcguix-web provides a web interface to the list of packages
HCoop / jackhill / guix / guix.git / blobdiff