From 81803c5eaae4ac6d48415a47b5d92de7a9e18b1a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 May 2022 22:18:40 +0300 Subject: gnu: wget2: Update to 2.0.1. * gnu/packages/wget.scm (wget2): Update to 2.0.1. [arguments]: Remove trailing #t from phases. --- gnu/packages/wget.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 9d23ecdaef..f5b7a5b91f 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 ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès -;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2016, 2017, 2019-2022 Efraim Flashner ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen @@ -135,14 +135,14 @@ (define-public wgetpaste (define-public wget2 (package (name "wget2") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz")) (sha256 (base32 - "0i0m4k6w9smsr2m5mj05zvl1fb110izyl2qqrk0yqlxnmfhgpqjg")))) + "1caxhkwk08z3npzw8x2qhkmjc224cfw1aphvbv8bidbvd41zmdqb")))) (build-system gnu-build-system) (arguments `(#:phases @@ -152,8 +152,7 @@ (define-public wget2 (substitute* "tests/Makefile.in" (("test-gpg-verify-no-file\\$\\(EXEEXT)") "") (("test-gpg-valid\\$\\(EXEEXT)") "") - (("test-gpg-styles\\$\\(EXEEXT)") "")) - #t))) + (("test-gpg-styles\\$\\(EXEEXT)") ""))))) #:configure-flags '("--enable-static=no"))) (inputs (list bzip2 -- cgit v1.2.3 From 0542905a2c5cb4f645399e19c2a4924dc757057e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 May 2022 22:19:56 +0300 Subject: gnu: wget2: Reindent package. * gnu/packages/wget.scm (wget2): Reindent package with 'guix style'. --- gnu/packages/wget.scm | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index f5b7a5b91f..7c8c961dfb 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -134,42 +134,40 @@ (define-public wgetpaste (define-public wget2 (package - (name "wget2") - (version "2.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz")) - (sha256 - (base32 - "1caxhkwk08z3npzw8x2qhkmjc224cfw1aphvbv8bidbvd41zmdqb")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-network-tests - (lambda _ - (substitute* "tests/Makefile.in" - (("test-gpg-verify-no-file\\$\\(EXEEXT)") "") - (("test-gpg-valid\\$\\(EXEEXT)") "") - (("test-gpg-styles\\$\\(EXEEXT)") ""))))) - #:configure-flags '("--enable-static=no"))) - (inputs - (list bzip2 - gnutls/dane - gpgme - libidn2 - libmicrohttpd - libpsl - pcre2 - zlib)) - ;; TODO: Add libbrotlidec, libnghttp2. - (native-inputs - (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 -website downloader. Designed and written from scratch it wraps around libwget, -that provides the basic functions needed by a web client.") - (properties '((ftp-directory . "/gnu/wget"))) - (license (list license:gpl3+ license:lgpl3+)))) + (name "wget2") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz")) + (sha256 + (base32 + "1caxhkwk08z3npzw8x2qhkmjc224cfw1aphvbv8bidbvd41zmdqb")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-network-tests + (lambda _ + (substitute* "tests/Makefile.in" + (("test-gpg-verify-no-file\\$\\(EXEEXT)") "") + (("test-gpg-valid\\$\\(EXEEXT)") "") + (("test-gpg-styles\\$\\(EXEEXT)") ""))))) + #:configure-flags + '("--enable-static=no"))) + (inputs (list bzip2 + gnutls/dane + gpgme + libidn2 + libmicrohttpd + libpsl + pcre2 + zlib)) + ;; TODO: Add libbrotlidec, libnghttp2. + (native-inputs (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 website +downloader. Designed and written from scratch it wraps around libwget, that +provides the basic functions needed by a web client.") + (properties '((ftp-directory . "/gnu/wget"))) + (license (list license:gpl3+ license:lgpl3+)))) -- cgit v1.2.3 From c62be7d53041ce03054371fb320688c6f5800596 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2022 16:23:48 +0300 Subject: gnu: wgetpaste: Add missing input. * gnu/packages/wget.scm (wgetpaste)[inputs]: Add bash-minimal. --- gnu/packages/wget.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 7c8c961dfb..95baed25a7 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -24,6 +24,7 @@ (define-module (gnu packages wget) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages gnunet) @@ -124,7 +125,7 @@ (define-public wgetpaste #t)))) #:tests? #f)) ; no test target (inputs - (list wget xclip)) + (list bash-minimal wget xclip)) (home-page "https://wgetpaste.zlin.dk/") (synopsis "Script that automates pasting to a number of pastebin services") (description -- cgit v1.2.3 From 50970a28b768c98ed45ed0201e201f5da8d993e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2022 16:25:35 +0300 Subject: gnu: wgetpaste: Remove trailing #t from phases. * gnu/packages/wget.scm (wgetpaste)[arguments]: Remove trailing #t from phases. --- gnu/packages/wget.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 95baed25a7..a2131785a7 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -100,16 +100,14 @@ (define-public wgetpaste (substitute* "wgetpaste" ;; dpaste blocks Tor users. Use a better default. (("DEFAULT_SERVICE:-dpaste") - "DEFAULT_SERVICE-bpaste")) - #t)) + "DEFAULT_SERVICE-bpaste")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (zsh (string-append out "/share/zsh/site-functions"))) (install-file "wgetpaste" bin) - (install-file "_wgetpaste" zsh) - #t))) + (install-file "_wgetpaste" zsh)))) (add-after 'install 'wrap-program ;; /bin/wgetpaste prides itself on relying only on the following ;; inputs, and doesn't need to execute arbitrary commands, so @@ -121,8 +119,7 @@ (define-public wgetpaste ,(delete-duplicates (map (lambda (command) (dirname (which command))) (list "bash" "mktemp" "sed" "sort" "tee" "tr" - "wget" "xclip"))))) - #t)))) + "wget" "xclip"))))))))) #:tests? #f)) ; no test target (inputs (list bash-minimal wget xclip)) -- cgit v1.2.3 From 9cd22702b87f873f7e307c99b406fb758e5a307c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2022 16:31:59 +0300 Subject: gnu: wget: Update to 1.21.3. * gnu/packages/wget.scm (wget): Update to 1.21.3. --- gnu/packages/wget.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index a2131785a7..960569f3ed 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -45,7 +45,7 @@ (define-module (gnu packages wget) (define-public wget (package (name "wget") - (version "1.21.1") + (version "1.21.3") (source (origin (method url-fetch) @@ -53,7 +53,7 @@ (define-public wget version ".tar.lz")) (sha256 (base32 - "1bchzkacjsc5c0x01ngaana9fs5j12wfw1c8qxps1yp68x9vx6yv")))) + "19afmyr1i3zwdwr8wkyz8q6z5764ik3dm87as194g78l8xggplnv")))) (build-system gnu-build-system) (inputs (list gnutls libidn2 libpsl)) -- cgit v1.2.3