From patchwork Wed Jun 3 15:00:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 22545 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 17B1627BBE3; Wed, 3 Jun 2020 16:06:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AF9CF27BBE1 for ; Wed, 3 Jun 2020 16:06:29 +0100 (BST) Received: from localhost ([::1]:33844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgUyL-0005C1-4w for patchwork@mira.cbaines.net; Wed, 03 Jun 2020 11:06:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgUt5-00072I-3g for guix-patches@gnu.org; Wed, 03 Jun 2020 11:01:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgUt4-000208-B9 for guix-patches@gnu.org; Wed, 03 Jun 2020 11:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jgUt4-0008R6-9w for guix-patches@gnu.org; Wed, 03 Jun 2020 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41690] [PATCH 1/1] website: Add fetch methods to JSON sources and packages list. References: <20200603145810.13199-1-zimon.toutoune@gmail.com> In-Reply-To: <20200603145810.13199-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jun 2020 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41690 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41690@debbugs.gnu.org Cc: zimoun Received: via spool by 41690-submit@debbugs.gnu.org id=B41690.159119642232374 (code B ref 41690); Wed, 03 Jun 2020 15:01:02 +0000 Received: (at 41690) by debbugs.gnu.org; 3 Jun 2020 15:00:22 +0000 Received: from localhost ([127.0.0.1]:44369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgUsQ-0008Q5-9T for submit@debbugs.gnu.org; Wed, 03 Jun 2020 11:00:22 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:54299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgUsO-0008Pq-DM for 41690@debbugs.gnu.org; Wed, 03 Jun 2020 11:00:21 -0400 Received: by mail-wm1-f51.google.com with SMTP id g10so2243384wmh.4 for <41690@debbugs.gnu.org>; Wed, 03 Jun 2020 08:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=c1tVQdJRkr3GFw9bXZLwp+NEbTF1oE0lMxDHOeeInZU=; b=vRmK3IbZseVL5yXp6FxLOXxOaHsWTmksobzSuJoHFqMg4HRoNeuI8Y0RQKUpHulitN 7QpQznbKPn1UiC2tpWjINa/C7RC/jby9fjfEZY9fNk+m4lKY8NvKX//0/FifCuZ30Jtz 3kITrXBfke/bJoAPE8CFFLzyLU3yM6c76g312R2eX7Y4yWuOWMjXG6RQLNz8/QXP0I1T b0fuZCcl+43lLOGcPWSKfQ6GMPE88j3EnWA7ZVPnM8cK18sZ8hQVLtaSRzSLBV3E7nYB gyKi2jLXMEAEG438dPrzMUW0GBLMpCDEzfRNy8+qCEPdvK+C+okZDZNtdd7PoX5qIk0Z rN0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=c1tVQdJRkr3GFw9bXZLwp+NEbTF1oE0lMxDHOeeInZU=; b=cNj0ed7+x7WSmTzv0Jh/GTMaQjtQG8Ez/KS/liZTgKNIPCD6WT7McLk+2/IPcWylnG nUwZdDK2Gfkg/MJllfQDiHc2pd/BySHINVXJwgzHsgILEaxqz+tyB5trG45x9eYjcyfH mL3+QYofqeYhREmJUNAe5NLCAo+as6pj1xE76gdgyjk49ZE33xI+291HPePH4ihWcqht 02O1tqHVa1tUlyg3ljAs6Ck78Zl3/I35vYU2Y9i2dz2AC9N1iHB77/f/JZvhL6Vky41A FBDBbtiu2H1gHJiDJl2CiYqEDcqYoWmDuGdHnGa9wkeCEosRhiHNTNKVwgpbRYlLkn5+ ZsXw== X-Gm-Message-State: AOAM533/O3rcvyUBZGioUwuLDcA7NYHtf2e02l3R8nIAGju63jAO69Fi hMYDC5L76nqc9Ku7XQ2cbUJwTUwj X-Google-Smtp-Source: ABdhPJycUmdBv7GNgXNXKy6QzC/JBPrvO2JJduazwJsBg2Q0jg8zGTlmo8lQPet3jGjbSsW6+7PWzw== X-Received: by 2002:a1c:32c5:: with SMTP id y188mr10028237wmy.16.1591196414355; Wed, 03 Jun 2020 08:00:14 -0700 (PDT) Received: from localhost.localdomain (57.246.195.77.rev.sfr.net. [77.195.246.57]) by smtp.gmail.com with ESMTPSA id e5sm3792311wrw.19.2020.06.03.08.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 08:00:13 -0700 (PDT) From: zimoun Date: Wed, 3 Jun 2020 17:00:10 +0200 Message-Id: <20200603150010.13979-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)