summaryrefslogtreecommitdiff
path: root/gnu/packages/web.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-12-21 23:42:10 +0100
committerMarius Bakke <marius@gnu.org>2020-12-21 23:42:10 +0100
commitbbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (patch)
tree9fbf0642fe71d0d4f6d7cb4e85b4d1587c8b9b16 /gnu/packages/web.scm
parent034cfbd2449387c15823cd9ec3e91661f9e5bf49 (diff)
parentf00e68ace070fd5240a4b5874e61c26f6e909b6c (diff)
Merge branch 'master' into ungrafting
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r--gnu/packages/web.scm31
1 files changed, 14 insertions, 17 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 041e24b53a..5851251c6d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -289,14 +289,14 @@ the same, being completely separated from the Internet.")
;; ’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.19.5")
+ (version "1.19.6")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
- "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw"))))
+ "1d9kzks8x1226prjbpdin4dz93fjnv304zlqybfqachx5fh9a4di"))))
(build-system gnu-build-system)
(inputs `(("openssl" ,openssl)
("pcre" ,pcre)
@@ -379,9 +379,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.19.5")
- (revision 2622)
- (changeset "64bbb9163a14"))
+ (let ((version "1.19.6")
+ (revision 2636)
+ (changeset "a0824dab33ff"))
(package
(name "nginx-documentation")
(version (simple-format #f "~A-~A-~A" version revision changeset))
@@ -393,7 +393,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(file-name (string-append name "-" version))
(sha256
(base32
- "085f3c00mqsaq95hp1bv9y0b517jv4zzs2q0j1c9m8nvh7k09zaa"))))
+ "06w6fg33pnkqpaagzp9rqizill61vj7db7083mrd6i6by0j7cp1b"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
@@ -682,7 +682,7 @@ programming language.")))
(define-public lighttpd
(package
(name "lighttpd")
- (version "1.4.56")
+ (version "1.4.57")
(source (origin
(method url-fetch)
(uri (string-append "https://download.lighttpd.net/lighttpd/"
@@ -690,7 +690,7 @@ programming language.")))
"lighttpd-" version ".tar.xz"))
(sha256
(base32
- "0xyzahrkmldwskwgjgj4dc3rmfmgqiwwr9y7jfhqpbp8g76q9kp4"))))
+ "0zr1ssagirv5l4r2ii1k9v366a4vwylwbq74nb5pwby1i4drdjjj"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -1476,7 +1476,7 @@ used to validate and fix HTML data.")
(define-public esbuild
(package
(name "esbuild")
- (version "0.8.21")
+ (version "0.8.24")
(source
(origin
(method git-fetch)
@@ -1485,7 +1485,7 @@ used to validate and fix HTML data.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1gkh3ka7gfdqvzymj6vh9w2d0cp7n2vih42y7ghg7y8x6ry4c6mi"))
+ (base32 "14n67p9h70v26nfgnjxipj8v9dn0sbdy5gahz8v7720m80bxfdic"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1783,6 +1783,7 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.")
(method url-fetch)
(uri (string-append "mirror://apache/serf/serf-"
version ".tar.bz2"))
+ (patches (search-patches "serf-python3.patch"))
(sha256
(base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"))))
(build-system scons-build-system)
@@ -1795,8 +1796,7 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.")
;;("gss" ,gss)
("zlib" ,zlib)))
(arguments
- `(#:scons ,scons-python2
- #:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr"))
+ `(#:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr"))
(string-append "APU=" (assoc-ref %build-inputs "apr-util"))
(string-append "OPENSSL=" (assoc-ref %build-inputs "openssl"))
;; (string-append "GSSAPI=" (assoc-ref %build-inputs "gss"))
@@ -6131,9 +6131,6 @@ into your tests. It automatically starts up a HTTP server in a separate thread
@code{httpbin} and provides your test with the URL in the fixture.")
(license license:expat)))
-(define-public python2-pytest-httpbin
- (package-with-python2 python-pytest-httpbin))
-
(define-public http-parser
(package
(name "http-parser")
@@ -6314,7 +6311,7 @@ command-line arguments or read from stdin.")
(home-page "https://github.com/jjjake/internetarchive")
(synopsis "Command-line interface to archive.org")
(description "@code{ia} is a command-line tool for using
-@url{archive.org} from the command-line. It also emplements the
+@url{archive.org} from the command-line. It also implements the
internetarchive python module for programmatic access to archive.org.")
(license license:agpl3+)))
@@ -6422,7 +6419,7 @@ Instagram and YouTube.")
"03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"))))
(build-system python-build-system)
(inputs
- `(("python2-dnspython" ,python2-dnspython)
+ `(("python2-dnspython" ,python2-dnspython-1.16)
("python2-pyxdg" ,python2-pyxdg)
("python2-requests" ,python2-requests)))
(native-inputs