From c107a30bb48cda91fba502e862a1b426d475cb19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 19:07:07 +0200 Subject: gnu: wgetpaste: Don't install LICENSE file twice. * gnu/packages/wget.scm (wgetpaste)[arguments]: Leave LICENSE file installation to the aptly-named 'install-license-files default phase. --- gnu/packages/wget.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 1092237a03..70022f6c90 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -106,11 +106,9 @@ in downloaded documents to relative links.") (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")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) + (zsh (string-append out "/share/zsh/site-functions"))) (install-file "wgetpaste" bin) (install-file "_wgetpaste" zsh) - (install-file "LICENSE" doc) #t))) (add-after 'install 'wrap-program ;; /bin/wgetpaste prides itself on relying only on the following -- cgit v1.2.3 From 2e97761efe4816df4604870c2c85c90725969de2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 19:11:33 +0200 Subject: gnu: wgetpaste: Build from Git. * gnu/packages/wget.scm (wgetpaste)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/wget.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 70022f6c90..3d7f266dd7 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -39,6 +39,7 @@ #:use-module (gnu packages xdisorg) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public wget @@ -80,11 +81,13 @@ in downloaded documents to relative links.") (version "2.30") (source (origin - (method url-fetch) - (uri (string-append "https://wgetpaste.zlin.dk/wgetpaste-" - version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/zlin/wgetpaste") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73")) + (base32 "0fhm0qxdsm4k1m24z4bbb7mdv1x1iaqzgsnwkax6vb8bx9yd1ysi")) (patches (search-patches "wgetpaste-update-bpaste.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From bdd2970c087eba1027123f45e358bf4eac295572 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 19:13:39 +0200 Subject: gnu: wgetpaste: Update to 2.32. * gnu/packages/wget.scm (wgetpaste): Update to 2.32. [source]: Remove patch. * gnu/packages/patches/wgetpaste-update-bpaste.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/wgetpaste-update-bpaste.patch | 27 ---------------------- gnu/packages/wget.scm | 5 ++-- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/wgetpaste-update-bpaste.patch (limited to 'gnu/packages/wget.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 870769cffc..1c692e0ce4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1805,7 +1805,6 @@ dist_patch_DATA = \ %D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ - %D%/packages/patches/wgetpaste-update-bpaste.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/patches/wgetpaste-update-bpaste.patch b/gnu/packages/patches/wgetpaste-update-bpaste.patch deleted file mode 100644 index f92a0c17ed..0000000000 --- a/gnu/packages/patches/wgetpaste-update-bpaste.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Tue, 01 Sep 2020 04:23:25 +0200 -Subject: [PATCH] Update bpaste URL & regular expressions. - -diff -Naur wgetpaste-2.30/wgetpaste wgetpaste-2.30a/wgetpaste ---- wgetpaste-2.30/wgetpaste 2020-07-31 23:56:05.000000000 +0200 -+++ wgetpaste-2.30a/wgetpaste 2020-09-01 04:22:37.499898403 +0200 -@@ -16,7 +16,7 @@ - SERVICES="codepad bpaste dpaste gists snippets" - # bpaste - ENGINE_bpaste=pinnwand --URL_bpaste="https://bpaste.net/" -+URL_bpaste="https://bpa.st/" - DEFAULT_EXPIRATION_bpaste="1week" - DEFAULT_LANGUAGE_bpaste="text" - # codepad -@@ -194,8 +194,8 @@ - xml+velocity xml xquery xslt xtend yaml" - EXPIRATIONS_pinnwand="1day 1week 1month never" - POST_pinnwand="submit=Paste! % % lexer expiry % code" --REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" --REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' -+REGEX_LOC_pinnwand="\(/[^ ]*\).*$|https://bpa.st\1" -+REGEX_RAW_pinnwand='s|^\(https\?://[^/]*\)\(/[^ ]*/\?\)$|\1/raw\2|' - - ### errors - die() { diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 3d7f266dd7..8891170e10 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -78,7 +78,7 @@ in downloaded documents to relative links.") (define-public wgetpaste (package (name "wgetpaste") - (version "2.30") + (version "2.32") (source (origin (method git-fetch) @@ -87,8 +87,7 @@ in downloaded documents to relative links.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fhm0qxdsm4k1m24z4bbb7mdv1x1iaqzgsnwkax6vb8bx9yd1ysi")) - (patches (search-patches "wgetpaste-update-bpaste.patch")))) + (base32 "13zdqfnbpymwz2f04icw92flj50227n5r0dcms84qxswfxrarnas")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3