[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41690] [PATCH 1/1] website: Add fetch methods to JSON sources and p
From: |
zimoun |
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 |
* 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
- Prev by Date:
[bug#41690] [PATCH 0/1] Add svn-multi, hg, url/{tarbomb, zipbomb} to {sources, packages}.json
- Next by Date:
[bug#41360] [PATCH 09/12] gnu: java-openjfx-web: Add new variable.
- Previous by thread:
[bug#41690] [PATCH 0/1] Add svn-multi, hg, url/{tarbomb, zipbomb} to {sources, packages}.json
- Next by thread:
bug#41690: [PATCH 0/1] Add svn-multi, hg, url/{tarbomb, zipbomb} to {sources, packages}.json
- Index(es):