nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Efraim Flashner 2019-09-08 13:49:57 +03:00
parent 7fb742215c
commit 78249ebf5b
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gnu/packages/wget.scm
View File

@ -23,13 +23,11 @@
(define-module (gnu packages wget) (define-module (gnu packages wget)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnunet) #:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -40,7 +38,6 @@
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
(define-public wget (define-public wget
@ -141,60 +138,39 @@ online pastebin services.")
(define-public wget2 (define-public wget2
(package (package
(name "wget2") (name "wget2")
(version "1.99.1") (version "1.99.2")
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz"))
(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"))
(sha256 (sha256
(base32 (base32
"15wxsnjhc6bzk7f60i1djmsarh1w31gwi5h2gh9k19ncwypfj5dm")))) "0qv55f4bablrlhc8bnic8g3mkk1kq44c4cphrk5jmv92z9aqzi6b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'skip-network-test (add-after 'unpack 'skip-network-tests
(lambda _ (lambda _
(substitute* "tests/Makefile.am" (substitute* "tests/Makefile.in"
(("test-auth-digest\\$\\(EXEEXT)") "")) (("test-gpg-verify-no-file\\$\\(EXEEXT)") "")
#t)) (("test-gpg-valid\\$\\(EXEEXT)") "")
(replace 'bootstrap (("test-gpg-styles\\$\\(EXEEXT)") ""))
(lambda _ #t)))
;; Make sure all the files are writable so that ./bootstrap #:configure-flags '("--enable-static=no")))
;; 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"))))))
(inputs (inputs
`(("gnutls" ,gnutls/dane) `(("bzip2" ,bzip2)
("gnutls" ,gnutls/dane)
("gpgme" ,gpgme)
("libiconv" ,libiconv) ("libiconv" ,libiconv)
("libidn2" ,libidn2) ("libidn2" ,libidn2)
("libmicrohttpd" ,libmicrohttpd) ("libmicrohttpd" ,libmicrohttpd)
("libpsl" ,libpsl) ("libpsl" ,libpsl)
("pcre2" ,pcre2))) ("pcre2" ,pcre2)
("zlib" ,zlib)))
;; TODO: Add libbrotlidec, libnghttp2. ;; TODO: Add libbrotlidec, libnghttp2.
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("pkg-config" ,pkg-config)))
("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