From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sHnIA/YEB2C+TgAA0tVLHw (envelope-from ) for ; Tue, 19 Jan 2021 16:12:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0MozO/UEB2CEWQAAB5/wlQ (envelope-from ) for ; Tue, 19 Jan 2021 16:12:37 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 635149404D5 for ; Tue, 19 Jan 2021 16:12:37 +0000 (UTC) Received: from localhost ([::1]:53010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tcS-0005lf-9W for larch@yhetil.org; Tue, 19 Jan 2021 11:12:36 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=npLFM7YT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 635149404D5 X-Spam-Score: -1.25 X-Migadu-Scanner: scn1.migadu.com X-TUID: QjBQZPgJkm6J 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)) -- 2.29.2