From patchwork Tue Jan 19 15:47:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26498 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 926A827BC15; Tue, 19 Jan 2021 16:00:53 +0000 (GMT) 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,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTPS id 0EE1C27BC14 for ; Tue, 19 Jan 2021 16:00:53 +0000 (GMT) Received: from localhost ([::1]:34244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tR6-0004wd-4w for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 11:00:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEh-0008De-0S for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEg-0006zr-Po for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEg-0004w7-OJ for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 1/5] import: pypi: Return 'values'. References: <20210119154525.11230-1-zimon.toutoune@gmail.com> In-Reply-To: <20210119154525.11230-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107125518887 (code B ref 45984); Tue, 19 Jan 2021 15:48:02 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:35 +0000 Received: from localhost ([127.0.0.1]:51347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEE-0004uS-Qf for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:35 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:40152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEB-0004tt-IT for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:32 -0500 Received: by mail-wm1-f52.google.com with SMTP id c127so171303wmf.5 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:31 -0800 (PST) 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=oVb+OK2YvVx0wdk5foNYvo9Uy6fXu+eoDlepggIgEqM=; b=KXnKbGPyyvBPetDRiqlzrHnjRk5vEfvXd2x6tutM//z1JmlY2QgEvEzYCw2yL4UYBU 2bMpRhV1Uy/mdazZaip8+DzVVxT2y1+83kPM4mD1MUsQqhVZf3/1pR6pyoG5E9iMGiAP pR3JxS1XIAQRRy3ylX/9WjBx2yRGFkBKYA2X/aoZaF/SX0DMsMqlVs5WQqC8pp5B77XZ YXa2Ruc3htNDOkbBly8GGEcBJT1yU0fnnDQMC/IfRvMnsRNxrtdOid/hH0+5mrDuipKE /n9ZuDc8KFR/01ECSqXHMXQFf/Wwt/nXufOtUXcTAmGLSaeXt7eIsg+e5edr64oIKfX1 DK9A== 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=oVb+OK2YvVx0wdk5foNYvo9Uy6fXu+eoDlepggIgEqM=; b=FPNI4ta9GWoXkafMYUB10y6kH1xhNscyXzkVmsKzHSgK8lAVrS7y58RwUrQ7U1bat0 6FOARRnBckfF0DzeeNwr4l75rZVsisLL4pIg/B0Np1zYFytJFrekKsb0PXwxcEatRkDY RrLE8PQVO2tB/jcTZzfWlxxvmA/mbI3jBkC2kW6CEQpEt6CWhMlP9dDjPi1u3KDW5Ajj l/Z/cn+bveX5D1egnyD88Ntg0velNN2EJGnUWTnIFUmDKM50QAsKXpNxliZEPzZSirku 9ddtnxQknhz/SYlNpaeOa5/BMsS0WeM5Cejv2oawh7jgA7ptIRq6wydoIdy5QAtHNR/o TXiA== X-Gm-Message-State: AOAM530kaIzchY0SMFdahwTdtlQaEi5G87m+Oex37MN02HHBvkUjF++B aP/bsfBMBNRq7Mxeqrmws3s+htyC5F8= X-Google-Smtp-Source: ABdhPJwVatYNjMo3m//IRzq2dcOqjMaDsBIe3ZZyhvfRnywfnhvPSLJqPtLqiA2wopPeWxHd9cSMpg== X-Received: by 2002:a1c:4d13:: with SMTP id o19mr237015wmh.3.1611071245633; Tue, 19 Jan 2021 07:47:25 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:25 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:17 +0100 Message-Id: <20210119154721.11999-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.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 Fixes partially . * guix/import/pypi.scm (pypi->guix-package): Exhaustive 'values' return. --- guix/import/pypi.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index bf4dc50138..56f4f3f589 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -477,12 +478,10 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." `package' s-expression corresponding to that package, or #f on failure." (let* ((project (pypi-fetch package-name)) (info (and project (pypi-project-info project)))) - (and project + (if project (guard (c ((missing-source-error? c) (let ((package (missing-source-error-package c))) - (leave (G_ "no source release for pypi package ~a ~a~%") - (project-info-name info) - (project-info-version info))))) + (values #f '())))) (make-pypi-sexp (project-info-name info) (project-info-version info) (and=> (latest-source-release project) @@ -493,7 +492,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (project-info-summary info) (project-info-summary info) (string->license - (project-info-license info))))))))) + (project-info-license info)))) + (values #f '())))))) (define (pypi-recursive-import package-name) (recursive-import package-name From patchwork Tue Jan 19 15:47:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26499 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 665F227BC15; Tue, 19 Jan 2021 16:12:36 +0000 (GMT) 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,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTPS id 21DE627BC14 for ; Tue, 19 Jan 2021 16:12:36 +0000 (GMT) Received: from localhost ([::1]:53010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tcR-0005lf-8A for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 11:12:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEh-0008Dg-DD for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEh-0006zw-6I for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEh-0004wF-56 for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 2/5] import: hackage: Return 'values'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107125518894 (code B ref 45984); Tue, 19 Jan 2021 15:48:03 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:35 +0000 Received: from localhost ([127.0.0.1]:51349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEF-0004ua-97 for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:35 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:51420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEC-0004ty-GV for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:33 -0500 Received: by mail-wm1-f50.google.com with SMTP id m2so194915wmm.1 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2S8N7HAd1CLHqflzbmBu2/nGGBCSc8/j4XL7QDjj4/E=; b=npLFM7YTNaRCoDHOw1lLF6afzDWrbvnvXXZtfQIpAHWkUrAQpI2ovzWdVJzj693BXq Key73fIAKO28TrNM/9kfQOHpgw3bP+twqonKKYDi6cmSaFPBAKoZM/LhCEwNHbFrsfli dUlfhenU+60UJivxIeitfMUDqFilxUInkYCliV0/Iskyl9yKORePLJ8JxD6UuPxHGT5W 1XX+D3OELmcYMlmxrIf5L3CUl9/LtjfgQeQo5JZ7gVegrnfwuBwcqYJxg01YwL9zgLFg 6mewPgNc5UOVKXgWZE+9q7+Oa9ktC4sYg4U5rJzXFw1l0PaNf6pQSBSAUvWy0KMR6L9n CdQQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2S8N7HAd1CLHqflzbmBu2/nGGBCSc8/j4XL7QDjj4/E=; b=OBCG+BM2yoosxsRaVZJ9QudXU8rnvkd4GIKWe8m5i6M2De3/iD1jEJs3jJPCV/33xk tacg9UIWih8scEsU7hPlq5EmKhTmuD9bQiSaUGhOoAOOUgO3isIizTIYuhwUj0Pz8rxo QMlJ3lfQd7dr7+tHyc54HjTeMNWuuiT6DRG8Rg8Tg961cqtc5rgztx51XhxuJWgw/Nur Yji3sFnCayq8cWGPQZX7jI1t/QPkmAMONeUoBoLuaVx6nECA5JFex3RfeNL82E/N+EMP Y3NPy/5WZlDGceuUnK5eeA00atRnghWFiPfXU8GFOXGORS6hSV4CM9EjIi9pxaQqMDmo 201g== X-Gm-Message-State: AOAM531odixsThD+afayN2PRfhL2awm4ivchBvXeClC5FUAmLUasD3DG ZOejlTIpBLAPRXWRxG4fswLwoEBuRlc= X-Google-Smtp-Source: ABdhPJxddi1+gtlWFiFK9A76ENan7cgKnUs51UOBosbn+Vu6SBZ3prE8Iwkus23iuQnqTAiaIMfmtQ== X-Received: by 2002:a1c:5941:: with SMTP id n62mr169354wmb.63.1611071246944; Tue, 19 Jan 2021 07:47:26 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:26 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:18 +0100 Message-Id: <20210119154721.11999-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119154721.11999-1-zimon.toutoune@gmail.com> References: <20210119154721.11999-1-zimon.toutoune@gmail.com> 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 Fixes partially . * guix/import/hackage.scm (hackage->guix-package): Return 'values'. (hackage-recursive-import): Fix number of arguments. --- guix/import/hackage.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 6ca4f65cb0..30769cd255 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Robert Vollmert +;;; Copyright © 2019 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -335,17 +336,20 @@ respectively." (if port (read-cabal-and-hash port) (hackage-fetch-and-hash package-name)))) - (and=> cabal-meta (compose (cut hackage-module->sexp <> cabal-hash - #:include-test-dependencies? - include-test-dependencies?) - (cut eval-cabal <> cabal-environment))))) + (if cabal-meta + ((compose (cut hackage-module->sexp <> cabal-hash + #:include-test-dependencies? + include-test-dependencies?) + (cut eval-cabal <> cabal-environment)) + cabal-meta) + (values #f '())))) (define hackage->guix-package/m ;memoized variant (memoize hackage->guix-package)) (define* (hackage-recursive-import package-name . args) - (recursive-import package-name #f - #:repo->guix-package (lambda (name repo) + (recursive-import package-name + #:repo->guix-package (lambda* (name #:key version repo) (apply hackage->guix-package/m (cons name args))) #:guix-name hackage-name->package-name)) From patchwork Tue Jan 19 15:47:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26497 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 75F8E27BC15; Tue, 19 Jan 2021 15:51:48 +0000 (GMT) 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,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTPS id 44D6427BC14 for ; Tue, 19 Jan 2021 15:51:48 +0000 (GMT) Received: from localhost ([::1]:43084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tIJ-0003mX-Dh for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 10:51:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEh-0008Dl-Pk for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEh-000702-IF for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEh-0004wM-HC for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 3/5] import: elpa: Return 'values'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107125618900 (code B ref 45984); Tue, 19 Jan 2021 15:48:03 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:36 +0000 Received: from localhost ([127.0.0.1]:51351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEF-0004uh-Km for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:35 -0500 Received: from mail-wm1-f51.google.com ([209.85.128.51]:37515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tED-0004u0-DT for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:33 -0500 Received: by mail-wm1-f51.google.com with SMTP id c128so189495wme.2 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NImNnMMtxPMHPbh5yxnHjviR5NWJQe6ilcA+mT+hb9g=; b=g4BPifBXOZbDV9UsR6/OR6625T1eNJeaCurg8+hoxyoZPU3H0UMMRN25bqAdb+Pa9s 8ykLaj+yrR2YXBvPW1VeBAqvrxWoeGIQBBV567oYmoBUqNfOnZtrokhP5qLWJ4EzliUL GTPKHZVUwQ+bQsopPibk/u7vhhbZ53j7b7qX2nOn8ZMjDbsPw4dJqi+92BxkB4FoV4tL SX8Mm/uh5188PkSM7k3qefgTjSrLHA4PRHHhs6++grpHhio31kF/rSr/o7kyYIuBPdFM rLm5cTDMLyk+R7l+DfZleb1a6jQ1ccyOM+YpRlN4uWFyEEZSs+7+MB0w8VGHulAxc7ti L0kQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=NImNnMMtxPMHPbh5yxnHjviR5NWJQe6ilcA+mT+hb9g=; b=RNC2e5ngpFe9on+TsZpep7S/wNs8ImsG3o/OSH3ryYtNsBZvFvvkCO0wBL+AgITTO+ A4v+L7heEMJMdUTXmydF+645y85t+we24XNTQh39x9/Qs+RvhZyx9zFmBm33vxjIgv7+ DQnvLYRYKAVljlhWebXcHlkR6Dpn6CsXdDsKDdPPBZgcqS8zflosddURIHPcMi8J8NzB afHztpbOFMwIV7DK4CL04wmh+k2lDRlQBPh6MyNb9MFajWRBL9ZFToX/QLsDjQ/Uor9s h6vPrckNBhuUde740dGDjTsLhjLyCIoo6Md0tLA9vhL6oEJNbWgJP7ht1hFJpLb5axhk Ql0A== X-Gm-Message-State: AOAM532pXs5zjaaLMzMFhaa7V8DPfZCRj9k/HdacNkWl/HS6fRPLZBZP pDtdIOvepz0k4AbhaYerxoQUX7X/xes= X-Google-Smtp-Source: ABdhPJyCxfTGmiGNOAK3rAtJND+yrVBnSi9YUBflgwtmPwMt8fkkieztXjhQ9D4Dsz+ALLJeweO3YQ== X-Received: by 2002:a1c:4303:: with SMTP id q3mr241552wma.3.1611071247837; Tue, 19 Jan 2021 07:47:27 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:27 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:19 +0100 Message-Id: <20210119154721.11999-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119154721.11999-1-zimon.toutoune@gmail.com> References: <20210119154721.11999-1-zimon.toutoune@gmail.com> 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 Fixes partially . * guix/import/elpa.scm (elpa->guix-package): Return values. --- guix/import/elpa.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c0dc5acf51..7073533daa 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -396,11 +397,7 @@ type ''." "Fetch the package NAME from REPO and produce a Guix package S-expression." (match (fetch-elpa-package name repo) (#false - (raise (condition - (&message - (message (format #false - "couldn't find meta-data for ELPA package `~a'." - name)))))) + (values #f '())) (package ;; ELPA is known to contain only GPLv3+ code. Other repos may contain ;; code under other license but there's no license metadata. From patchwork Tue Jan 19 15:47:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26500 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 53D0327BC15; Tue, 19 Jan 2021 16:12:50 +0000 (GMT) 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,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTPS id 0751B27BC14 for ; Tue, 19 Jan 2021 16:12:50 +0000 (GMT) Received: from localhost ([::1]:53466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tcf-0005x7-1s for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 11:12:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEi-0008E2-6T for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEh-000706-VR for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEh-0004wT-U3 for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 4/5] import: cran: Return 'values'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107126118923 (code B ref 45984); Tue, 19 Jan 2021 15:48:03 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:41 +0000 Received: from localhost ([127.0.0.1]:51354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEK-0004v8-Uz for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:41 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:51417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEE-0004u2-Lx for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:35 -0500 Received: by mail-wm1-f41.google.com with SMTP id m2so195038wmm.1 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WRhpWcjlOTt/x2TrFuJdf5lIoaWafkVdqT10cdiYjQA=; b=Qu22gATN78U3LDDCQHeCpkrQEYMoVetr46ke1ldH/8fTmXB3UmvN5zSP/SwgkrR0Rk RPrukUjpmdGdVzcxYJ971zxBXgc1/T6ZTHXuRteycoWZe3W4jlgK6OPB8RCJKx4Tep0q e767/g3DvC6z12rVtS9lxahYnXlRGFrwrnQAVfW6TLVTL07Dh+/jeXIDQ1szh44MNx4o C8xysX7DBX48pBksYVc03skMBTbT7DjkCW+gCiQr+b1kbdRaiF3qlFz2850ilurxDFFW sMvj1T3+X/ncyMMZ1Oo38uz0MOxBg7Xf4kU6kpYTBkwVNy6vfdY1SchJBpoAKzGIkwe7 AWwg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WRhpWcjlOTt/x2TrFuJdf5lIoaWafkVdqT10cdiYjQA=; b=p9hMep0Dw/JooJZUHJ+Lj+iIAvZ5eEpPjiCUVU0ftHJ0A3HvXtGkO2rcfhFF6y+J2m dFlUGf6s/5clDuWHtrV6Hk/I7u8bgFGiotaycN7S1pj7ynP+w5Xgza7BCUh9LIDjUjjI NYUYGeIodj78y0IMX9cRTMa9UGRG/ApdPkv0/4pKh8bX0LcB8Sn39Ga4qouWaUvpXR7H utUIm3TuHyEaVEz4Iup8mYcEqI9ciWrJjtlzeCDWoSq32pmfSfpXrat9mNEVE30HiEek mdCsDs6BHZ/sf2BluEwTiz649MmUPjOuixkbB4yIZlJ2eRy2CATySROlEKrNBdlDtxA6 1Nvg== X-Gm-Message-State: AOAM530ZfWToRZPBQN0NOlHTeJp252nW2mjpZTUU/J/xRIXdrT3RHcvF UfueJ94hr29DBoEQ+67ZDMVkTsmDCdM= X-Google-Smtp-Source: ABdhPJyCBD3H9vtS6L+/MJaizxturDF1Kbbw6YT/uy+SB5MjdWl2dkSztheQVe/bIYeU9lcuV2165A== X-Received: by 2002:a7b:cbd5:: with SMTP id n21mr248833wmi.5.1611071249114; Tue, 19 Jan 2021 07:47:29 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:28 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:20 +0100 Message-Id: <20210119154721.11999-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119154721.11999-1-zimon.toutoune@gmail.com> References: <20210119154721.11999-1-zimon.toutoune@gmail.com> 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 Fixes partially . * guix/import/pypi.scm (cran->guix-package): Return 'values'. --- guix/import/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index fd44d80915..79fc2af5c6 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -601,9 +602,7 @@ s-expression corresponding to that package, or #f on failure." ;; Retry import from CRAN (cran->guix-package package-name #:repo 'cran)) (else - (raise (condition - (&message - (message "couldn't find meta-data for R package"))))))))))) + (values #f '())))))))) (define* (cran-recursive-import package-name #:key (repo 'cran)) (recursive-import package-name From patchwork Tue Jan 19 15:47:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26495 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 2173427BC15; Tue, 19 Jan 2021 15:48:48 +0000 (GMT) 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,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED 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 ESMTPS id CD06727BC14 for ; Tue, 19 Jan 2021 15:48:47 +0000 (GMT) Received: from localhost ([::1]:35930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tFO-0008Ig-T1 for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 10:48:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEi-0008E3-IF for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEi-00070B-BD for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEi-0004wg-A8 for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 5/5] scripts: import: gem: Fix recursive error handling. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107126118929 (code B ref 45984); Tue, 19 Jan 2021 15:48:04 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:41 +0000 Received: from localhost ([127.0.0.1]:51356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEL-0004vA-7a for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:41 -0500 Received: from mail-wr1-f43.google.com ([209.85.221.43]:36717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEG-0004u5-1I for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:36 -0500 Received: by mail-wr1-f43.google.com with SMTP id 6so12924863wri.3 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AZq9n9K3mhLGo69q8/aCWeQfa1D/MIPb9a+XYJWSpBE=; b=QGX0xSMbU3SVPc5VVadiwYBx8aw9hVDgLIMJ++6i+BSsMeGeZ48RxMszpu2nz9gUV0 eazwED8JDl4C+18+etr6J04XubgS8XHHfdIRxJnSpFdngX1t+XCUDsf/RiEYGetbNht6 LEf2Y5jLFcFxw7ZJwU4Sz4vu+QwrMBN5vYfH4UjxuBhEloI07SWoaveowFaDx+DtvMmq xZWDvhfxx/rRI8h1i+AZalmkYFIklp/zzJ5aGDTKel+lpT1X39oHUJKHhkOwYpSHVrC6 aBC8sD4AejNTnUwtVGRKKwQHPMnE8Hwk5jTGn+tFa18m12lQUqGAjp6c2jYfnKnHfElW QVIg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AZq9n9K3mhLGo69q8/aCWeQfa1D/MIPb9a+XYJWSpBE=; b=Ntqb9bBhtm8IzraDUz/4hAFSMRnu6eD0vY3yaB6EFl0unLTUzo2aXLYZPPTy+biB3A Z0tMqfmZBa83/Wm1Q4whrfRuxh3sALivWotXj4r42uM10h0aeqGLyL0Z0P9Bh0iprI51 m3qOBqBt7oLkPwEcjjAj8qqAHPE7paSZKeE/dwSUQRz7YH7JibD6/3oUIzgj2nAVPWYm o+cucnZyDooyexLGZXB3Qoaf0A+y7W4KhAvCaYdJ+WZKJe/FbM5ON6oyDJvOxo1D+dh5 QwbYRrZFGfhIRUPnb5oDbPWQmZoD0O/C6qmCk7IEKUDo0H+vm2KXBxKFXfN3oeKowfFd gCaQ== X-Gm-Message-State: AOAM531rj1hZ70zyUEqWCdwOl8TQIdCMAK+KnXlOV8LteTWZjw8syaMr BXnen3BgvAjU4sdFqeXJYmuZuANPOKM= X-Google-Smtp-Source: ABdhPJycwiiNP3yhu2zEe38FOZH+FYlMJ5oGYccqkJHC2OrxT1W/1gZ0Vbl+xWz0y/ZrCCjQ28CTTw== X-Received: by 2002:adf:dc8b:: with SMTP id r11mr5096789wrj.131.1611071250216; Tue, 19 Jan 2021 07:47:30 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:29 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:21 +0100 Message-Id: <20210119154721.11999-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119154721.11999-1-zimon.toutoune@gmail.com> References: <20210119154721.11999-1-zimon.toutoune@gmail.com> 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 Fixes partially . * guix/scripts/import/gem.scm (guix-import-gem): Handle error. --- guix/scripts/import/gem.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/guix/scripts/import/gem.scm b/guix/scripts/import/gem.scm index c64596b514..99a2955e4c 100644 --- a/guix/scripts/import/gem.scm +++ b/guix/scripts/import/gem.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,18 +89,20 @@ Import and convert the RubyGems package for PACKAGE-NAME.\n")) (reverse opts)))) (match args ((package-name) - (if (assoc-ref opts 'recursive) - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) - (gem-recursive-import package-name 'rubygems)) - (let ((sexp (gem->guix-package package-name))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - package-name)) - sexp))) + (let ((code (if (assoc-ref opts 'recursive) + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (gem-recursive-import package-name 'rubygems)) + (let ((sexp (gem->guix-package package-name))) + (if sexp sexp #f))))) + (match code + ((or #f '(#f)) + (leave (G_ "failed to download meta-data for package '~a'~%") + package-name)) + (_ code)))) (() (leave (G_ "too few arguments~%"))) ((many ...)