summaryrefslogtreecommitdiff
path: root/gnu/packages/web.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-09-07 11:04:44 +0200
committerLudovic Courtès <ludo@gnu.org>2021-09-07 14:19:08 +0200
commitd9dfbf886ddbb92dfdaa118bb9765e78aad5c53a (patch)
tree2732020de20a38c09b66a60b0cb36022799f7c2e /gnu/packages/web.scm
parentb949f34f31a045eb0fb242b81a223178fb6994d3 (diff)
parent49922efb11da0f0e9d4f5979d081de5ea8c99d25 (diff)
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r--gnu/packages/web.scm52
1 files changed, 12 insertions, 40 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 711bbd615b..08dbd4d2ec 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -373,15 +373,15 @@ the same, being completely separated from the Internet.")
;; Track the ‘mainline’ branch. Upstream considers it more reliable than
;; ’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.21.0")
+ ;; Please update the nginx-documentation package together with this one!
+ (version "1.21.2")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
- "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy"))))
+ "11ail85iw6mg8fxd2qnxhcghi0frjk5r70cfar83dms61rb1qxri"))))
(build-system gnu-build-system)
(inputs `(("libxml2" ,libxml2)
("libxslt" ,libxslt)
@@ -476,9 +476,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(define-public nginx-documentation
;; This documentation should be relevant for the current nginx package.
- (let ((version "1.21.0")
- (revision 2726)
- (changeset "a7a36efd10af"))
+ (let ((version "1.21.2")
+ (revision 2764)
+ (changeset "bc9c5d11b67c"))
(package
(name "nginx-documentation")
(version (simple-format #f "~A-~A-~A" version revision changeset))
@@ -490,7 +490,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(file-name (string-append name "-" version))
(sha256
(base32
- "1fl7rkbfdd26c78h85x4w3kas16rpj4pxzjhc071qvx7znwgm2pn"))))
+ "05n72q9vqxx37dyw3yl7jssmpqkw3rwxa2y3m6s0c0ih0z2bx58n"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
@@ -1674,13 +1674,17 @@ used to validate and fix HTML data.")
#t))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/evanw/esbuild/cmd/esbuild"
+ `(#:import-path "github.com/evanw/esbuild/cmd/esbuild"
#:unpack-path "github.com/evanw/esbuild"
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? unpack-path #:allow-other-keys)
(when tests?
+ ;; The "Go Race Detector" is only supported on 64-bit
+ ;; platforms, this variable disables it.
+ (unless ,(target-64bit?)
+ (setenv "ESBUILD_RACE" ""))
(with-directory-excursion (string-append "src/" unpack-path)
(invoke "make" "test-go")))
#t)))))
@@ -6624,38 +6628,6 @@ file links.")
license:psfl ; linkcheck/gzip2.py
license:expat)))) ; linkcheck/mem.py
-(define-public cadaver
- (package
- (name "cadaver")
- (version "0.23.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://www.webdav.org/cadaver/"
- name "-" version ".tar.gz"))
- (sha256
- (base32
- "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"))))
- (build-system gnu-build-system)
- ;; TODO: Unbundle libneon and make build succeed with new neon.
- (arguments
- `(#:configure-flags (list "--with-ssl=openssl")
- #:tests? #f)) ;No tests included
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("intltool" ,intltool)))
- (inputs
- `(("expat" ,expat)
- ("openssl" ,openssl-1.0)))
- (home-page "http://www.webdav.org/cadaver/")
- (synopsis "Command-line WebDAV client")
- (description
- "Cadaver is a command-line WebDAV client for Unix. It supports
-file upload, download, on-screen display, namespace operations (move/copy),
-collection creation and deletion, and locking operations.")
- (license license:gpl2)))
-
(define-public castor
(package
(name "castor")