diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
commit | 651478aa18a3f575d3b4cc14166a15a1c45b0f61 (patch) | |
tree | 87c27dc9eff3d321f7ad4a622b110c517856a104 /gnu/packages/wget.scm | |
parent | 71c08ee60bb3f62bac0614888fb62405f7a388ab (diff) | |
parent | 9a2e5fe5fdcc6ea848ceeefa0f70147dfb360639 (diff) | |
download | guix-651478aa18a3f575d3b4cc14166a15a1c45b0f61.tar guix-651478aa18a3f575d3b4cc14166a15a1c45b0f61.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/wget.scm')
-rw-r--r-- | gnu/packages/wget.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 4940156db5..7261137cab 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -31,12 +31,13 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnunet) #:use-module (gnu packages libidn) - #:use-module (gnu packages python) - #:use-module (gnu packages perl) - #:use-module (gnu packages web) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages tls) + #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -45,7 +46,7 @@ (define-public wget (package (name "wget") - (version "1.20.1") + (version "1.20.3") (source (origin (method url-fetch) @@ -53,7 +54,7 @@ version ".tar.lz")) (sha256 (base32 - "0a29qsqxkk8145vkyy35q5a1wc7qzwx3qj3gmfrkmi9xs96yhqqg")))) + "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) @@ -102,7 +103,7 @@ in downloaded documents to relative links.") (lambda _ (substitute* "wgetpaste" ((" poundpython\"") "\"") - (("-poundpython") "-dpaste")) + (("-poundpython") "-bpaste")) ; dpaste blocks tor users #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -123,11 +124,12 @@ in downloaded documents to relative links.") ,(delete-duplicates (map (lambda (command) (dirname (which command))) (list "bash" "mktemp" "sed" "sort" "tee" "tr" - "wget"))))) + "wget" "xclip"))))) #t)))) #:tests? #f)) ; no test target (inputs - `(("wget" ,wget))) + `(("wget" ,wget) + ("xclip" ,xclip))) (home-page "http://wgetpaste.zlin.dk/") (synopsis "Script that automates pasting to a number of pastebin services") (description |