From patchwork Mon Apr 24 15:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 1436 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 C2D6427BBE2; Mon, 24 Apr 2023 16:49:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3952027BBE9 for ; Mon, 24 Apr 2023 16:49:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqyRC-0007AN-9r; Mon, 24 Apr 2023 11:49:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqyR5-00077g-Ad for guix-patches@gnu.org; Mon, 24 Apr 2023 11:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqyR5-0004C9-2n for guix-patches@gnu.org; Mon, 24 Apr 2023 11:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqyR4-0006iY-DF for guix-patches@gnu.org; Mon, 24 Apr 2023 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63053] [PATCH 0/3] Fix "guix import crate" Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Apr 2023 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63053 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63053@debbugs.gnu.org Cc: Simon Tournier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168235130225727 (code B ref -1); Mon, 24 Apr 2023 15:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Apr 2023 15:48:22 +0000 Received: from localhost ([127.0.0.1]:50145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyQP-0006gq-Ho for submit@debbugs.gnu.org; Mon, 24 Apr 2023 11:48:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:59908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyQI-0006g7-VF for submit@debbugs.gnu.org; Mon, 24 Apr 2023 11:48:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqyQI-0006kO-In for guix-patches@gnu.org; Mon, 24 Apr 2023 11:48:14 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqyQG-0003xk-Vl for guix-patches@gnu.org; Mon, 24 Apr 2023 11:48:14 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3f174c4b404so8544135e9.1 for ; Mon, 24 Apr 2023 08:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682351291; x=1684943291; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cw8koMDtUGDC16LZZb9ieaFLAsAaS9LlPNXf4CJXv08=; b=f+omkID/pvLuPhxtyKrkgh2UadbRBjhxDz0zr4KIet6xC4EgA3SnXQAYVyj6WSadhn ak2Yvg/eM0ri1GdxuhWJF1yULsyb4mi6NKf0bL4aQtY9V1kZhziOJZ+Et9xS4/yGE6to lvBr6aKsZP4Gpt2QfnFvQPuX0e4UZqgHSMcQ+jId3lAq2RPCp3xZj8roNDYq96YOYhYg 1Kp1AD1c+xJpqwpqhVG2xd0kO1iqpgOY9lK5QEVKQXPodw+5acqry5UDgNOJ3UPG4w0t CAO6bI+6ecYqgB+3c7fKaN9LHvrj9h582RkpDlf1mn0TgMBOiToZu7aKzZIZS2DDakKB F7kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682351291; x=1684943291; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cw8koMDtUGDC16LZZb9ieaFLAsAaS9LlPNXf4CJXv08=; b=OaITD697EbGKh89r6e4ZdLakGjn7MYo9XmYA5+ST4XiRjCGO6NfiOvcVMqN8I8hX9D WOdtPVoMpj58Ea9wrjmkPLTtFGHHr6jPA0C8FyjZv9OyyADT8+HW9yyKCsg9rYEqMA+u Fo8AvZLFOC9XJS3BR+e6TrWaRGhnAtZi9MeLzUqo47SLtckObqeGNiM8z7mZcNOBChz3 tKk8XPrANr6arp9Nkf6isi5ZYYeuClaiDigyrJwbIq6kZuk/P6I4UlaaPJy9aWIZ+7rn E3jy1KAr5fjamqpfradHWfhpLPng0X3bcFj8aMVs1R79B7WtXkNCvl3Qm2JoUfkQ1L4v BVNg== X-Gm-Message-State: AAQBX9eJYjLPG/HLHJcnALdzdYfC7mozFO0joRIAPwv/t2WFV4X4+vVV jUS7rKpAQX32tD5uRkwC6toV66qbpl0= X-Google-Smtp-Source: AKy350ZMHRZ0IYrK2hvLxm3okRUq0xdTz2HB7EVTqGrK17jxTZF9AYqxu9hDmCZ3wQz4vR/E1GM7PQ== X-Received: by 2002:a05:600c:82c8:b0:3f1:7332:40d9 with SMTP id eo8-20020a05600c82c800b003f1733240d9mr10936005wmb.0.1682351291120; Mon, 24 Apr 2023 08:48:11 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id v7-20020a5d4a47000000b002fe065da369sm10915161wrs.69.2023.04.24.08.48.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 08:48:10 -0700 (PDT) From: Simon Tournier Date: Mon, 24 Apr 2023 17:48:01 +0200 Message-Id: <20230424154801.1539772-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Consider, --8<---------------cut here---------------start------------->8--- $ guix import crate non-existent guix import: error: failed to download meta-data for package 'non-existent' --8<---------------cut here---------------end--------------->8--- and then, --8<---------------cut here---------------start------------->8--- $ guix import crate non-existent -r Backtrace: 5 (primitive-load "/home/simon/.config/guix/current/bin/guix") In guix/ui.scm: 2300:7 4 (run-guix . _) 2263:10 3 (run-guix-command _ . _) In guix/scripts/import.scm: 89:11 2 (guix-import . _) In guix/import/utils.scm: 638:27 1 (recursive-import "non-existent" #:repo->guix-package _ #:guix-name _ #:version _ . _) 630:33 0 (lookup-node "non-existent" #f) guix/import/utils.scm:630:33: In procedure lookup-node: Wrong number of values returned to continuation (expected 2) --8<---------------cut here---------------end--------------->8--- as reported by #63030 [1]. This patch set fixes that. Note that ’guile-semver’ is already part of ’self’ but not part of ’guix’, therefore “guix shell -D guix” does not provide the necessary guile-semver for testing with ./pre-inst-env. 1: https://issues.guix.gnu.org/issue/63020 Simon Tournier (3): guix: import: crate: Fix incorrect returned values. scripts: import: crate: Handle non-existent package. gnu: guix: Add guile-semver. gnu/packages/package-management.scm | 1 + guix/import/crate.scm | 54 +++++++++++++++-------------- guix/scripts/import/crate.scm | 20 ++++++----- 3 files changed, 40 insertions(+), 35 deletions(-) base-commit: 9350347dabd0f25f89fd2a703a250b20872ad911