summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-09-08 13:49:57 +0300
committerEfraim Flashner <efraim@flashner.co.il>2019-09-08 13:53:26 +0300
commit78249ebf5badd00d2bb130d85ca1fd2f3ac50963 (patch)
treed620e9ced1eb4d6d8b8c4c302a99fc1d82340792
parent7fb742215cf616f8f457be65b7acf0c358d8b2ef (diff)
downloadpatches-78249ebf5badd00d2bb130d85ca1fd2f3ac50963.tar
patches-78249ebf5badd00d2bb130d85ca1fd2f3ac50963.tar.gz
gnu: wget2: Update to 1.99.2.
* gnu/packages/wget.scm (wget2): Update to 1.99.2. [source]: Download from gnu mirrors. [arguments]: Remove custom 'bootstrap phase, update custom 'skip-network-tests phase. Don't build static library. [inputs]: Add bzip2, gpgme, zlib. [native-inputs]: Remove autoconf, automake, flex, gettext-minimal, libtool, python-2.
-rw-r--r--gnu/packages/wget.scm60
1 files changed, 18 insertions, 42 deletions
diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index ba775961a8..1501ea2746 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -23,13 +23,11 @@
(define-module (gnu packages wget)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
- #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
- #:use-module (gnu packages flex)
- #:use-module (gnu packages gettext)
#:use-module (gnu packages gnunet)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages libidn)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
@@ -40,7 +38,6 @@
#:use-module (gnu packages xdisorg)
#:use-module (guix packages)
#:use-module (guix download)
- #:use-module (guix git-download)
#:use-module (guix build-system gnu))
(define-public wget
@@ -141,60 +138,39 @@ online pastebin services.")
(define-public wget2
(package
(name "wget2")
- (version "1.99.1")
+ (version "1.99.2")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/gnuwget/wget2.git")
- (commit (string-append name "-" version))
- (recursive? #t))) ;; Needed for 'gnulib' git submodule.
- (file-name (string-append name "-" version "-checkout"))
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz"))
(sha256
(base32
- "15wxsnjhc6bzk7f60i1djmsarh1w31gwi5h2gh9k19ncwypfj5dm"))))
+ "0qv55f4bablrlhc8bnic8g3mkk1kq44c4cphrk5jmv92z9aqzi6b"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'skip-network-test
+ (add-after 'unpack 'skip-network-tests
(lambda _
- (substitute* "tests/Makefile.am"
- (("test-auth-digest\\$\\(EXEEXT)") ""))
- #t))
- (replace 'bootstrap
- (lambda _
- ;; Make sure all the files are writable so that ./bootstrap
- ;; can proceed.
- (for-each (lambda (file)
- (chmod file #o755))
- (find-files "."))
- (patch-shebang "./gnulib/gnulib-tool.py")
- ;; Remove unnecessary inputs from bootstrap.conf
- (substitute* "bootstrap.conf"
- (("flex.*") "")
- (("makeinfo.*") "")
- (("lzip.*") "")
- (("rsync.*") ""))
- (invoke "sh" "./bootstrap"
- "--gnulib-srcdir=gnulib"
- "--no-git"))))))
+ (substitute* "tests/Makefile.in"
+ (("test-gpg-verify-no-file\\$\\(EXEEXT)") "")
+ (("test-gpg-valid\\$\\(EXEEXT)") "")
+ (("test-gpg-styles\\$\\(EXEEXT)") ""))
+ #t)))
+ #:configure-flags '("--enable-static=no")))
(inputs
- `(("gnutls" ,gnutls/dane)
+ `(("bzip2" ,bzip2)
+ ("gnutls" ,gnutls/dane)
+ ("gpgme" ,gpgme)
("libiconv" ,libiconv)
("libidn2" ,libidn2)
("libmicrohttpd" ,libmicrohttpd)
("libpsl" ,libpsl)
- ("pcre2" ,pcre2)))
+ ("pcre2" ,pcre2)
+ ("zlib" ,zlib)))
;; TODO: Add libbrotlidec, libnghttp2.
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("flex" ,flex)
- ("gettext" ,gettext-minimal)
- ("libtool" ,libtool)
- ("pkg-config" ,pkg-config)
- ("python" ,python-2)))
+ `(("pkg-config" ,pkg-config)))
(home-page "https://gitlab.com/gnuwget/wget2")
(synopsis "Successor of GNU Wget")
(description "GNU Wget2 is the successor of GNU Wget, a file and recursive