diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/wget.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
| download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/wget.scm')
| -rw-r--r-- | gnu/packages/wget.scm | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 4fc4a1d281..472b67a416 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> @@ -57,16 +57,14 @@ "1bchzkacjsc5c0x01ngaana9fs5j12wfw1c8qxps1yp68x9vx6yv")))) (build-system gnu-build-system) (inputs - `(("gnutls" ,gnutls) - ("libidn2" ,libidn2) - ("libpsl" ,libpsl))) + (list gnutls libidn2 libpsl)) (native-inputs - `(("lzip" ,lzip) - ("pkg-config" ,pkg-config) - ("perl" ,perl) - ("python" ,python) ;for testenv suite - ("perl-http-daemon" ,perl-http-daemon) - ("perl-io-socket-ssl" ,perl-io-socket-ssl))) + (list lzip + pkg-config + perl + python ;for testenv suite + perl-http-daemon + perl-io-socket-ssl)) (home-page "https://www.gnu.org/software/wget/") (synopsis "Non-interactive command-line utility for downloading files") (description @@ -128,8 +126,7 @@ in downloaded documents to relative links.") #t)))) #:tests? #f)) ; no test target (inputs - `(("wget" ,wget) - ("xclip" ,xclip))) + (list wget xclip)) (home-page "https://wgetpaste.zlin.dk/") (synopsis "Script that automates pasting to a number of pastebin services") (description @@ -140,14 +137,14 @@ online pastebin services.") (define-public wget2 (package (name "wget2") - (version "1.99.2") + (version "2.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz")) (sha256 (base32 - "0qv55f4bablrlhc8bnic8g3mkk1kq44c4cphrk5jmv92z9aqzi6b")))) + "0i0m4k6w9smsr2m5mj05zvl1fb110izyl2qqrk0yqlxnmfhgpqjg")))) (build-system gnu-build-system) (arguments `(#:phases @@ -172,7 +169,7 @@ online pastebin services.") ("zlib" ,zlib))) ;; TODO: Add libbrotlidec, libnghttp2. (native-inputs - `(("pkg-config" ,pkg-config))) + (list 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 |