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.
This commit is contained in:
Tobias Geerinckx-Rice 2021-06-05 19:13:39 +02:00
parent 2e97761efe
commit bdd2970c08
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
3 changed files with 2 additions and 31 deletions

View file

@ -1805,7 +1805,6 @@ dist_patch_DATA = \
%D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/webkitgtk-share-store.patch \
%D%/packages/patches/webkitgtk-bind-all-fonts.patch \ %D%/packages/patches/webkitgtk-bind-all-fonts.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.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-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \
%D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \

View file

@ -1,27 +0,0 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
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() {

View file

@ -78,7 +78,7 @@ (define-public wget
(define-public wgetpaste (define-public wgetpaste
(package (package
(name "wgetpaste") (name "wgetpaste")
(version "2.30") (version "2.32")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -87,8 +87,7 @@ (define-public wgetpaste
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0fhm0qxdsm4k1m24z4bbb7mdv1x1iaqzgsnwkax6vb8bx9yd1ysi")) (base32 "13zdqfnbpymwz2f04icw92flj50227n5r0dcms84qxswfxrarnas"))))
(patches (search-patches "wgetpaste-update-bpaste.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)