unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#47787] [PATCH] gnu: rss-bridge: Update to 2020-11-10.
@ 2021-04-15  4:12 la snesne
  2021-05-14 10:40 ` bug#47787: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: la snesne @ 2021-04-15  4:12 UTC (permalink / raw)
  To: 47787; +Cc: la snesne

* gnu/packages/web.scm (rss-bridge): Update to 2020-11-10.
[build-system]: Switch to copy-build-system.
[arguments]: Adjust to new build system. Add phase "patch-paths".
---
 gnu/packages/web.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 165a4fc236..45bbcd2103 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -48,6 +48,7 @@
 ;;; Copyright © 2020, 2021 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
+;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6496,7 +6497,7 @@ snippets on @url{https://commandlinefu.com}.")
 (define-public rss-bridge
   (package
     (name "rss-bridge")
-    (version "2019-09-12")
+    (version "2020-11-10")
     (source
      (origin
        (method git-fetch)
@@ -6505,19 +6506,23 @@ snippets on @url{https://commandlinefu.com}.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mx7f3l45nqhcrng531l4cq8kpzm164hhbwn26g5akb2pamdlnra"))))
-    (build-system trivial-build-system)
+        (base32 "1mir6mcm37sbdrhl5kgs6schpp3l4r5mfamhiic0yfbz4hqwmg44"))))
+    (build-system copy-build-system)
     (arguments
-     '(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (ice-9 match))
-         (let* ((out (assoc-ref %outputs "out"))
-                (share-rss-bridge (string-append out "/share/rss-bridge")))
-           (mkdir-p share-rss-bridge)
-           (copy-recursively (assoc-ref %build-inputs "source") share-rss-bridge)
-           #t))))
+     '(#:install-plan
+       '(("." "share/rss-bridge"))
+       #:phases
+       (modify-phases %standard-phases
+         ;;Change paths to not use source directory.
+         (add-before 'install 'patch-paths
+           (lambda _
+             (substitute* "lib/rssbridge.php"
+               (("PATH_ROOT . 'cache/'")
+                "'/var/cache/rss-bridge/'")
+               (("PATH_ROOT . 'whitelist.txt'")
+                "'/etc/rss-bridge/whitelist.txt'")
+               (("PATH_ROOT . 'config.ini.php'")
+                "'/etc/rss-bridge/config.ini.php'")))))))
     (home-page "https://github.com/RSS-Bridge/rss-bridge")
     (synopsis "Generate Atom feeds for social networking websites")
     (description "rss-bridge generates Atom feeds for social networking
-- 
2.31.1





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#47787: [PATCH] gnu: rss-bridge: Update to 2020-11-10.
  2021-04-15  4:12 [bug#47787] [PATCH] gnu: rss-bridge: Update to 2020-11-10 la snesne
@ 2021-05-14 10:40 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2021-05-14 10:40 UTC (permalink / raw)
  To: la snesne; +Cc: 47787-done

Hi,

la snesne <lasnesne@lagunposprasihopre.org> skribis:

> * gnu/packages/web.scm (rss-bridge): Update to 2020-11-10.
> [build-system]: Switch to copy-build-system.
> [arguments]: Adjust to new build system. Add phase "patch-paths".

Applied, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-14 10:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-15  4:12 [bug#47787] [PATCH] gnu: rss-bridge: Update to 2020-11-10 la snesne
2021-05-14 10:40 ` bug#47787: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).