diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/wgetpaste-update-bpaste.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/wgetpaste-update-bpaste.patch')
| -rw-r--r-- | gnu/packages/patches/wgetpaste-update-bpaste.patch | 27 |
1 files changed, 0 insertions, 27 deletions
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 <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() { |