From unknown Sun Jun 22 22:42:20 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#63053 <63053@debbugs.gnu.org> To: bug#63053 <63053@debbugs.gnu.org> Subject: Status: [PATCH 0/3] Fix "guix import crate" Reply-To: bug#63053 <63053@debbugs.gnu.org> Date: Mon, 23 Jun 2025 05:42:20 +0000 retitle 63053 [PATCH 0/3] Fix "guix import crate" reassign 63053 guix-patches submitter 63053 Simon Tournier severity 63053 normal tag 63053 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 11:48:21 2023 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 To: guix-patches@gnu.org Subject: [PATCH 0/3] Fix "guix import crate" 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 11:51:36 2023 Received: (at 63053) by debbugs.gnu.org; 24 Apr 2023 15:51:36 +0000 Received: from localhost ([127.0.0.1]:50162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyTY-0006rf-9o for submit@debbugs.gnu.org; Mon, 24 Apr 2023 11:51:36 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:41103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyTW-0006qj-50 for 63053@debbugs.gnu.org; Mon, 24 Apr 2023 11:51:34 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-2f4130b898cso439412f8f.0 for <63053@debbugs.gnu.org>; Mon, 24 Apr 2023 08:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682351488; x=1684943488; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=isyfrgl2G+tfMguAH5MUdzP+GC14wldhDrF7esYQ+n8=; b=eo+e9c7aI+bADX5vND76zREVHTudPoxlLTIG16JC4I/V8HVVxjeT/fHdr5WWTLw29Z IR8BM1NHtBAXgML8McF69wO0RJWujyRIV1YoYhisibGWxGkjEbv8mbHv1VWEa98z7wYm tnIEGu4kp6Y6azkGcANYg66UUn2zdrlLESxYlOGRrvy+3N3QwXnNUeXrsLgJ/7Fa2qR9 u7GsyGa9M8nmQTjU7lSUDPNmBHwS3cckNXKVxXE3iK3a1vhzv/TEsPFzsqU+X102AXND sm6Dll7yqTJ5gWITP6oeOhjyxByW10SdenenpjpI8Zl1li40pOpjq3a2booWvUDA8Xea s5fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682351488; x=1684943488; 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=isyfrgl2G+tfMguAH5MUdzP+GC14wldhDrF7esYQ+n8=; b=DRYqgJqjzjaBLkktoWs+vlZPHiHCRbcuVklZcABZIk+pQM3g1AEm2WoYG+e5Zlfv3L iRaeKUVihcr5QAITlvk31/WZNitbPpWvsDdiq9Cysim6LoT8pmDXP7eodWFixOvigMlx EOdyYGNaCOS4gIaP5BPUuGyPLlx8kC4nAWlSyeMB4aayze3PojrOkTIkbYZ6Pld0g2uF BF0ZaJA2K5TCN1+M0V5ImUGILPnajQ97DVaxanwgmw/Gi9iAS9IYFAXfgQ1aU2pGnf7K psSPXQn4QCMd6AJYkCqDWeUCV7vbyl7JKuCH2ZtdcSG7TR659Cuc5csihUiyA62qIpiY HQlg== X-Gm-Message-State: AAQBX9fXZfcAXniccHy4L8OQH73rTOO6Ae4tBBqEucNZNH4k9Man1ghY kR/w7QNpjEuGqQTUq65NrxugL3EsxBs= X-Google-Smtp-Source: AKy350Z3mBcZu72MX12S24V6VC1slVC6uvinLcNm4ZAnqnBAJVcTXPQaN0wiL9EKetgh87/SEUhONA== X-Received: by 2002:adf:cd86:0:b0:2f9:12ae:4a29 with SMTP id q6-20020adfcd86000000b002f912ae4a29mr8689833wrj.5.1682351487668; Mon, 24 Apr 2023 08:51:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id e5-20020a5d5305000000b002cf1c435afcsm11109853wrv.11.2023.04.24.08.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 08:51:27 -0700 (PDT) From: Simon Tournier To: 63053@debbugs.gnu.org Subject: [PATCH 1/3] guix: import: crate: Fix incorrect returned values. Date: Mon, 24 Apr 2023 17:51:17 +0200 Message-Id: <20230424155119.1540974-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Debbugs-CC: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63053 Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/import/crate.scm (crate->guix-package): Return compatible values with 'recursive-import'. --- guix/import/crate.scm | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 514eca2229..6e10ebb5d4 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2021 Nicolas Goaziou ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -293,32 +294,33 @@ (define (sort-map-dependencies deps) (match-lambda* (((name _) ...) (apply string-ci (crate-version-license version*) - string->license)) - (append cargo-inputs cargo-development-inputs))))) + (if (and crate version*) + (let* ((dependencies (crate-version-dependencies version*)) + (dep-crates dev-dep-crates (partition normal-dependency? dependencies)) + (cargo-inputs (sort-map-dependencies dep-crates)) + (cargo-development-inputs (if include-dev-deps? + (sort-map-dependencies dev-dep-crates) + '()))) + (values + (make-crate-sexp #:build? include-dev-deps? + #:name crate-name + #:version (crate-version-number version*) + #:cargo-inputs cargo-inputs + #:cargo-development-inputs cargo-development-inputs + #:home-page + (let ((home-page (crate-home-page crate))) + (if (string? home-page) + home-page + (let ((repository (crate-repository crate))) + (if (string? repository) + repository + "")))) + #:synopsis (crate-description crate) + #:description (crate-description crate) + #:license (and=> (crate-version-license version*) + string->license)) + (append cargo-inputs cargo-development-inputs))) + (values #f '()))) (define* (crate-recursive-import crate-name #:key version) (recursive-import crate-name -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 11:51:37 2023 Received: (at 63053) by debbugs.gnu.org; 24 Apr 2023 15:51:37 +0000 Received: from localhost ([127.0.0.1]:50164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyTY-0006ri-RV for submit@debbugs.gnu.org; Mon, 24 Apr 2023 11:51:37 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:40294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyTW-0006qq-B5 for 63053@debbugs.gnu.org; Mon, 24 Apr 2023 11:51:35 -0400 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-2f45377dcc7so687697f8f.1 for <63053@debbugs.gnu.org>; Mon, 24 Apr 2023 08:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682351488; x=1684943488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3PqucVyL7NLugjVizxF6ID+nhURgANRsGXNjQCE+9KE=; b=ouZ8cOyNfCCejxTEKnxj1kkvlRFlDrcoV4U9o8tBzw5w6ORX63VVvSnfzZW16skGdv AKyPhcmusNPwzCijkxH6axK8trb26IHvKxls2nYwwDz20/5cWrJKqiiQ8pJIQJr9yp9n NgAR3YhljmXNP2TQGJSXBOb6mPz4X0qlHrB5NZ0CGGhOGIRQlCZukW/y+r9ilYb96sRO hvk6lnEBBTVBxOplFHSl0pdnHO9/xRshGq3CjywHfJZGU+s/59G/3ftigss7bC/T6/Yo V8MIICieUPQ21vUGC63NJ8ZmnSPbUrYADc2x6I2Q2cjm96PB6miv1tdSP2XD1rAKFDE9 t8nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682351488; x=1684943488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3PqucVyL7NLugjVizxF6ID+nhURgANRsGXNjQCE+9KE=; b=imqzzTXzs/t9n1WBIhS1O+zw7tTZ68jd6hXC1dFRB7HxYTJtqVUjiyB8oRBPPOzbM8 4uqqnA4d2/Q3j9XY9+LIsEGeLz2qI3lG4+zoxnNgaJvqmLSLNCP3NzLl5t7Ib3PFhdRC lBsSkfFG2jzLmfwtBOwUU2gEL/tZofdjMfQ9f/AzH63zaUhryCg2fNOM86jePbXTK/Kt ewHarVeXhYqWT5UH5xSuiJcUli7B8EdVMNHePyyZcdXMWUpMArN2GfM+YiiYGZOBJ7wc b0JIWcdldi5Du50sA73pO+BWxPctltlRUzTriESiT1lqxkw0bErsugpnba6fn8PTJj0Z paOw== X-Gm-Message-State: AAQBX9eRY05KKV7Uy+UjW/Vxy+k5cc/J9frsrhi+Pqz63qwDZ5xLBxpb 2whb8uTETZ+JKmxMKkgWLeqRWk4DRAg= X-Google-Smtp-Source: AKy350aZb4swWO1nxgeJ0q01dcxZS4vKN6Vr9BEj5L2gB2b5U6LaNhUaP6NcAhq4XQDneYCG5thtVQ== X-Received: by 2002:adf:f506:0:b0:2e4:c9ac:c492 with SMTP id q6-20020adff506000000b002e4c9acc492mr2913144wro.1.1682351488569; Mon, 24 Apr 2023 08:51:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id e5-20020a5d5305000000b002cf1c435afcsm11109853wrv.11.2023.04.24.08.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 08:51:28 -0700 (PDT) From: Simon Tournier To: 63053@debbugs.gnu.org Subject: [PATCH 3/3] gnu: guix: Add guile-semver. Date: Mon, 24 Apr 2023 17:51:19 +0200 Message-Id: <20230424155119.1540974-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230424155119.1540974-1-zimon.toutoune@gmail.com> References: <20230424155119.1540974-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63053 Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add guile-semver. --- gnu/packages/package-management.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5d2416f35b..65baf4093c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -476,6 +476,7 @@ (define code ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) ("guile-lib" ,guile-lib) + ("guile-semver" ,guile-semver) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 11:51:37 2023 Received: (at 63053) by debbugs.gnu.org; 24 Apr 2023 15:51:37 +0000 Received: from localhost ([127.0.0.1]:50166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyTZ-0006rr-5h for submit@debbugs.gnu.org; Mon, 24 Apr 2023 11:51:37 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:40292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqyTW-0006qm-7j for 63053@debbugs.gnu.org; Mon, 24 Apr 2023 11:51:35 -0400 Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-2f45377dcc7so687695f8f.1 for <63053@debbugs.gnu.org>; Mon, 24 Apr 2023 08:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682351488; x=1684943488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mrsont0v00oPoNeY3cFDzUsCBq0kgs8M2JzhiDFSfQM=; b=F2T6vF1oB+j3ljPa7JeM7dVPwcGyEhaXz7XygtmCfN3vtqZ28C+7F0q3gzsGYnIMvC g2wepuGeAp2L/rZ1OMMkFs8qIRhHauTVqtjeXOe8nhrnZOWO4H99EKPV3Pl2nwL59Hvb QTppbtXM+RyQBxjgoom42BTL9KDKi2nOlE0Z3zrdUDlRA+5G41IHyajBw20ciU6P0Ftw XTopunoFrjthuAQCx+ArzpALtf6HeXBJzg9+PBOPeDqmKVPe71JS9tOE1Mf4bhJ3z+LQ xYDEp6gBS4Dd/mZDRAH1omHexvaLaIa5mlekQsDQxHzWGxyxO4HYFbYGAlL1krRuuYLO qhrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682351488; x=1684943488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mrsont0v00oPoNeY3cFDzUsCBq0kgs8M2JzhiDFSfQM=; b=SKWfu7qHRJfyGnRuR7QRTQ2c6i9iRbJxlB8Ist5B0e3C6muGzMDIJ73qpBS08iRGwS 2meuiwhtdLJe8mJ/jYPi6ZjM4WU4E71baYDtXlUaenybw4U9asX/w7vQWlA96uG0bNI1 atXszYsOVth9QkdvUedospU+sNxnEsCdhZThUzJP6TC2qCu7bKdBCHrUP3SwnN5vvuqR pR4gHe6pjG7LKDw9EfvBO3cAd/hTGLnJmDw5Gepd2sJy7fO3AFhOceqggi0hLQCnPHNj zKmS/j61BK0fH54YzAgnnICZhqXHvnK+KJzZInjy+wmsBll+QDmrC9v4bxn4L7kriWz9 0vGQ== X-Gm-Message-State: AAQBX9dQo0tHnKdMxYMyiX6BFONJIWpqHNJyLXa5FFbR1A4xdS34bmIE uemqIporKd9orm+4vCB4Jivls8FBXks= X-Google-Smtp-Source: AKy350YT4YSx9PSeXrsBDkbCXyhkardKyaJlAPNxXhH98EMWm0f/yZLxCUXSZzvwbZmFRq+WD7h6WA== X-Received: by 2002:a5d:56cb:0:b0:2fc:1d2e:dc91 with SMTP id m11-20020a5d56cb000000b002fc1d2edc91mr7495247wrw.0.1682351488123; Mon, 24 Apr 2023 08:51:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id e5-20020a5d5305000000b002cf1c435afcsm11109853wrv.11.2023.04.24.08.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 08:51:27 -0700 (PDT) From: Simon Tournier To: 63053@debbugs.gnu.org Subject: [PATCH 2/3] scripts: import: crate: Handle non-existent package. Date: Mon, 24 Apr 2023 17:51:18 +0200 Message-Id: <20230424155119.1540974-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230424155119.1540974-1-zimon.toutoune@gmail.com> References: <20230424155119.1540974-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63053 Cc: Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * guix/scripts/import/crate.scm (guix-import-crate): Handle non-existent package input. --- guix/scripts/import/crate.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 97152904ac..038faa87db 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,15 +91,16 @@ (define (parse-options) (define-values (name version) (package-name->name+version spec)) - (if (assoc-ref opts 'recursive) - (crate-recursive-import name #:version version) - (let ((sexp (crate->guix-package name #:version version #:include-dev-deps? #t))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - (if version - (string-append name "@" version) - name))) - (list sexp)))) + (match (if (assoc-ref opts 'recursive) + (crate-recursive-import name #:version version) + (crate->guix-package name #:version version #:include-dev-deps? #t)) + ((or #f '()) + (leave (G_ "failed to download meta-data for package '~a'~%") + (if version + (string-append name "@" version) + name))) + ((? list? sexps) sexps) + (sexp (list sexp)))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 17:10:08 2023 Received: (at 63053-done) by debbugs.gnu.org; 30 Apr 2023 21:10:08 +0000 Received: from localhost ([127.0.0.1]:38457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptEJ5-0006qA-Qc for submit@debbugs.gnu.org; Sun, 30 Apr 2023 17:10:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptEJ3-0006pZ-TR for 63053-done@debbugs.gnu.org; Sun, 30 Apr 2023 17:10:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptEIx-00005O-K1; Sun, 30 Apr 2023 17:10:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=38SEBvmmdfinbMQg74CiuSeJ6jgAJIo7uWK4lzApsj0=; b=rIoErEav2i3Adozgqxqy nvzapStoMPdCq4svMkBn77tCRnQRCt4Vm67PsAwldnCIfAKGB8i48us5OYx5b3ZjuXHGCe3jqyRlL 8ZPDNHdDRc0MXwwbOeD2GWvgsaS6I71xQ7GgvW+0pQ5qQRwrqXpUEWU4vaZHLOs+yj/yg2uw12yeF s6o3SaYlAjFGzs5QjekRkRlKYO5jtXv8ZoEZLw/FfaldaZbvJOpzvV9qbN1W6oKo2hwWT1KQJRbtA HoKuZQrknEdl8XAQmy9Y4NNagfw8wnYKAJiWp9T3iu/JNwVgR6GGjh3k6Qh3heVZX68c9CZ+O3PdR 7b34HxhL7vQkpg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptEIs-0006i9-Nl; Sun, 30 Apr 2023 17:09:59 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Tournier Subject: Re: bug#63053: [PATCH 0/3] Fix "guix import crate" References: <20230424154801.1539772-1-zimon.toutoune@gmail.com> Date: Sun, 30 Apr 2023 23:09:51 +0200 In-Reply-To: <20230424154801.1539772-1-zimon.toutoune@gmail.com> (Simon Tournier's message of "Mon, 24 Apr 2023 17:48:01 +0200") Message-ID: <87lei9oz4w.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63053-done Cc: 63053-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Simon Tournier skribis: > guix: import: crate: Fix incorrect returned values. > scripts: import: crate: Handle non-existent package. > gnu: guix: Add guile-semver. Applied, thanks! :-) Ludo=E2=80=99. From unknown Sun Jun 22 22:42:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 29 May 2023 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator