diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/patches/wgetpaste-update-bpaste.patch | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.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() { |