From: zimoun <zimon.toutoune@gmail.com>
To: 41690@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#41690] [PATCH 1/1] website: Add fetch methods to JSON sources and packages list.
Date: Wed, 3 Jun 2020 17:00:10 +0200 [thread overview]
Message-ID: <20200603150010.13979-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20200603145810.13199-1-zimon.toutoune@gmail.com>
* website/apps/packages/builder.scm (origin->json): Add 'url-fetch/tarbomb',
'url-fetc/zipbomb', 'svn-multi-fetch' and 'hg-fetch' methods.
---
website/apps/packages/builder.scm | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/website/apps/packages/builder.scm b/website/apps/packages/builder.scm
index 85494a6..d2bccd7 100644
--- a/website/apps/packages/builder.scm
+++ b/website/apps/packages/builder.scm
@@ -43,6 +43,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix svn-download)
+ #:use-module (guix hg-download)
#:use-module (guix utils) ;location
#:use-module ((guix build download) #:select (maybe-expand-mirrors))
#:use-module (json)
@@ -102,11 +103,17 @@
(append-map (cut maybe-expand-mirrors <> %mirrors)
(map string->uri urls))))
- `((type . ,(cond ((eq? url-fetch method) 'url)
+ `((type . ,(cond ((or (eq? url-fetch method)
+ (eq? url-fetch/tarbomb method)
+ (eq? url-fetch/zipbomb method)) 'url)
((eq? git-fetch method) 'git)
- ((eq? svn-fetch method) 'svn)
+ ((or (eq? svn-fetch method)
+ (eq? svn-multi-fetch method)) 'svn)
+ ((eq? hg-fetch method) 'hg)
(else #nil)))
- ,@(cond ((eq? url-fetch method)
+ ,@(cond ((or (eq? url-fetch method)
+ (eq? url-fetch/tarbomb method)
+ (eq? url-fetch/zipbomb method))
`(("url" . ,(list->vector
(resolve
(match uri
@@ -116,13 +123,22 @@
`(("git_url" . ,(git-reference-url uri))))
((eq? svn-fetch method)
`(("svn_url" . ,(svn-reference-url uri))))
+ ((eq? svn-multi-fetch method)
+ `(("svn_url" . ,(svn-multi-reference-url uri))))
+ ((eq? hg-fetch method)
+ `(("hg_url" . ,(hg-reference-url uri))))
(else '()))
,@(if (eq? method git-fetch)
`(("git_ref" . ,(git-reference-commit uri)))
'())
,@(if (eq? method svn-fetch)
- `(("svn_revision" . ,(svn-reference-revision
- uri)))
+ `(("svn_revision" . ,(svn-reference-revision uri)))
+ '())
+ ,@(if (eq? method svn-multi-fetch)
+ `(("svn_revision" . ,(svn-multi-reference-revision uri)))
+ '())
+ ,@(if (eq? method hg-fetch)
+ `(("hg_changeset" . ,(hg-reference-changeset uri)))
'())))
(define (packages-json-builder)
--
2.26.2
next prev parent reply other threads:[~2020-06-03 15:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 14:58 [bug#41690] [PATCH 0/1] Add svn-multi, hg, url/{tarbomb, zipbomb} to {sources, packages}.json zimoun
2020-06-03 15:00 ` zimoun [this message]
2020-06-06 10:29 ` bug#41690: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200603150010.13979-1-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=41690@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).