From 7a8a4fd7a73f81d99e293ae9f2c70357524beba1 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 8 Dec 2020 02:46:40 +0000 Subject: gnu: python-dnspython: Update to 2.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-dnspython): Update to 2.0.0. [source]: Download from pypi. [native-inputs]: Add unzip. [home-page]: Prefer https. (python-dnspython-1.16): (python2-dnspython-1.16): New variables. * gnu/packages/ebook.scm (calibre): * gnu/packages/web.scm (linkchecker): Use python2-dnspython-1.16. * gnu/packages/finance.scm (electrum): Use python-dnspython-1.16. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f26b114d1a..55157443d1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6431,7 +6431,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 -- cgit 1.4.1 From 980013c5034ae16f36d7c54ef546e76afc96d790 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Tue, 15 Dec 2020 05:44:28 +0000 Subject: gnu: esbuild: Update to 0.8.23. * gnu/packages/web.scm (esbuild): Update to 0.8.23. Signed-off-by: Leo Famulari --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 55157443d1..f7d9d72df2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1485,7 +1485,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.21") + (version "0.8.23") (source (origin (method git-fetch) @@ -1494,7 +1494,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gkh3ka7gfdqvzymj6vh9w2d0cp7n2vih42y7ghg7y8x6ry4c6mi")) + (base32 "0lrz685hdhx4cyxbslacg5x2xvm8zd1a5kjg4b7q10i5w56wb5xc")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From b358a94e7440a6f1ec50da47e3b563f518245467 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 16 Dec 2020 09:58:34 +0100 Subject: gnu: python-internetarchive: Fix typo. * gnu/packages/web.scm (python-internetarchive): Fix typo. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f7d9d72df2..39820f7572 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6323,7 +6323,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+))) -- cgit 1.4.1 From f6f6e1efeecd553c3af4c31695b17fb69849967b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Dec 2020 21:59:03 +0100 Subject: gnu: serf: Build with Python 3. * gnu/packages/patches/serf-python3.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/web.scm (serf)[source](patches): New field. [arguments]: Remove #:scons. --- gnu/local.mk | 1 + gnu/packages/patches/serf-python3.patch | 29 +++++++++++++++++++++++++++++ gnu/packages/web.scm | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/serf-python3.patch (limited to 'gnu/packages/web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 98590ae8eb..11cb580b92 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1609,6 +1609,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seed-webkit.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ + %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shadow-hurd-pctrl.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ diff --git a/gnu/packages/patches/serf-python3.patch b/gnu/packages/patches/serf-python3.patch new file mode 100644 index 0000000000..636f51ed1e --- /dev/null +++ b/gnu/packages/patches/serf-python3.patch @@ -0,0 +1,29 @@ +Fix build with Python 3 scons. + +Patch taken from Arch Linux: +https://github.com/archlinux/svntogit-packages/blob/packages/serf/trunk/scons-python3.patch + +--- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000 ++++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 39820f7572..584003a1cf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1792,6 +1792,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) @@ -1804,8 +1805,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")) -- cgit 1.4.1 From 36e47069d03c37298b26ae7fc0fb70dffad550fc Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sat, 19 Dec 2020 03:58:22 +0000 Subject: gnu: esbuild: Update to 0.8.24. * gnu/packages/web.scm (esbuild): Update to 0.8.24. Signed-off-by: Efraim Flashner --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 584003a1cf..68c3299687 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1485,7 +1485,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.23") + (version "0.8.24") (source (origin (method git-fetch) @@ -1494,7 +1494,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0lrz685hdhx4cyxbslacg5x2xvm8zd1a5kjg4b7q10i5w56wb5xc")) + (base32 "14n67p9h70v26nfgnjxipj8v9dn0sbdy5gahz8v7720m80bxfdic")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 33c140e0fb3ddcd6ce05c02bc00df102830ecbd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Dec 2020 15:17:34 +0100 Subject: gnu: lighttpd: Update to 1.4.57. * gnu/packages/web.scm (lighttpd): Update to 1.4.57. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 68c3299687..5dc90415cf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -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 -- cgit 1.4.1 From 30a9ece4b2c440cb6764af86766f8d03e6b22409 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Dec 2020 15:21:04 +0100 Subject: gnu: nginx: Update to 1.19.6. * gnu/packages/web.scm (nginx): Update to 1.19.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5dc90415cf..4e980bc337 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) -- cgit 1.4.1 From 8a352094f6f576041a2c870f1c8dbb6247db1731 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Dec 2020 15:21:25 +0100 Subject: gnu: nginx-documentation: Update to 1.19.6-2636-a0824dab33ff. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.6-2636-a0824dab33ff. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4e980bc337..19f3cd7c65 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -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 -- cgit 1.4.1 From 159836967b0be221fce18644ca32ae474a0fc704 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 19 Dec 2020 14:12:24 -0500 Subject: gnu: python2-pytest-httpbin: Remove package. * gnu/packages/python-web.scm (python2-pytest-httpbin): Remove variable. --- gnu/packages/web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 19f3cd7c65..bd1e7eccaa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6140,9 +6140,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") -- cgit 1.4.1