diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-26 22:13:11 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-26 22:13:11 +0100 |
| commit | 7fe962788ac330fce18d7cc39f613bb1f961d6ea (patch) | |
| tree | d8f61f1fb2263d9186157202725ca8fe7b7dd896 /gnu/packages/web.scm | |
| parent | 9844848b23860136da54193b725b6653b4e9d8ee (diff) | |
| parent | 2e4011465b6c0757c45ddf118c9f406df045b376 (diff) | |
| download | guix-7fe962788ac330fce18d7cc39f613bb1f961d6ea.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 28f32df609..ae6072f585 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> -;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> @@ -7027,6 +7027,20 @@ compressed JSON header blocks. (base32 "12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2")))))) +;; 'Node' requires this newer version, to be removed on the next rebuild cycle. +(define-public nghttp2-1.40 + (package/inherit + nghttp2 + (version "1.40.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + "nghttp2-" version ".tar.xz")) + (sha256 + (base32 + "0wwhwv7cvi1vxpdjwvg0kpa4jzhszclpnwrwfcw728zz53a47z09")))))) + (define-public hpcguix-web (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508") (revision "4")) |