futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: wget2: Update to 1.99.1.

Browse Source 
This fixes https://issues.guix.info/issue/34718.

* gnu/packages/wget.scm (wget2): Update to 1.99.1.
[arguments]: Add phase to skip network tests. Update custom 'bootstrap
phase to not require unnecessary binaries.
[inputs]: Remove doxygen, python. Move autoconf, automake, flex,
gettext-minimal, libtool ...
[native-inputs]: ... to here. Add python-2.
This commit is contained in:
Efraim Flashner 2019-03-05 16:17:20 +02:00
parent f347fb79df
commit f5e08f1793
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
gnu/packages/wget.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
@ -111,48 +111,60 @@ online pastebin services.")
(define-public wget2 (define-public wget2
(package (package
(name "wget2") (name "wget2")
(version "1.0.0") (version "1.99.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/gnuwget/wget2.git") (url "https://gitlab.com/gnuwget/wget2.git")
(commit "b45709d3d21714135ce79df6abbdcb704684063d") (commit (string-append name "-" version))
(recursive? #t))) ;; Needed for 'gnulib' git submodule. (recursive? #t))) ;; Needed for 'gnulib' git submodule.
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0ww84wwzmpyylkz8rnb6nk6f7x040132z81x52w7rjhk68p9mm24")))) "15wxsnjhc6bzk7f60i1djmsarh1w31gwi5h2gh9k19ncwypfj5dm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases
(replace 'bootstrap (modify-phases %standard-phases
(lambda _ (add-after 'unpack 'skip-network-test
;; Make sure all the files are writable so that ./bootstrap (lambda _
;; can proceed. (substitute* "tests/Makefile.am"
(for-each (lambda (file) (("test-auth-digest\\$\\(EXEEXT)") ""))
(chmod file #o755)) #t))
(find-files ".")) (replace 'bootstrap
(substitute* "./gnulib/gnulib-tool.py" (lambda _
(("/usr/bin/python") (which "python3"))) ;; Make sure all the files are writable so that ./bootstrap
(invoke "sh" "./bootstrap" ;; can proceed.
"--gnulib-srcdir=gnulib" (for-each (lambda (file)
"--no-git")))))) (chmod file #o755))
(inputs `(("autoconf" ,autoconf) (find-files "."))
("automake" ,automake) (patch-shebang "./gnulib/gnulib-tool.py")
("doxygen" ,doxygen) ;; Remove unnecessary inputs from bootstrap.conf
("flex" ,flex) (substitute* "bootstrap.conf"
("gettext" ,gettext-minimal) (("flex.*") "")
("gnutls" ,gnutls/dane) (("makeinfo.*") "")
("libiconv" ,libiconv) (("lzip.*") "")
("libidn2" ,libidn2) (("rsync.*") ""))
("libmicrohttpd" ,libmicrohttpd) (invoke "sh" "./bootstrap"
("libpsl" ,libpsl) "--gnulib-srcdir=gnulib"
("libtool" ,libtool) "--no-git"))))))
("pcre2" ,pcre2) (inputs
("python" ,python))) `(("gnutls" ,gnutls/dane)
("libiconv" ,libiconv)
("libidn2" ,libidn2)
("libmicrohttpd" ,libmicrohttpd)
("libpsl" ,libpsl)
("pcre2" ,pcre2)))
;; TODO: Add libbrotlidec, libnghttp2. ;; TODO: Add libbrotlidec, libnghttp2.
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("flex" ,flex)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config)
("python" ,python-2)))
(home-page "https://gitlab.com/gnuwget/wget2") (home-page "https://gitlab.com/gnuwget/wget2")
(synopsis "Successor of GNU Wget") (synopsis "Successor of GNU Wget")
(description "GNU Wget2 is the successor of GNU Wget, a file and recursive (description "GNU Wget2 is the successor of GNU Wget, a file and recursive