From unknown Wed Jun 25 05:41:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75878] [PATCH 1/3] scripts: import: crate: show-help: Reformat. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, divya@subvertising.org, efraim@flashner.co.il, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 26 Jan 2025 20:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75878@debbugs.gnu.org Cc: Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.173792405311930 (code B ref -1); Sun, 26 Jan 2025 20:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jan 2025 20:40:53 +0000 Received: from localhost ([127.0.0.1]:58023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tc9R7-00036L-8K for submit@debbugs.gnu.org; Sun, 26 Jan 2025 15:40:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55620) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tc9R4-00035v-JV for submit@debbugs.gnu.org; Sun, 26 Jan 2025 15:40:51 -0500 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 1tc9Qq-0006XE-09 for guix-patches@gnu.org; Sun, 26 Jan 2025 15:40:36 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tc9Qo-00029L-6t for guix-patches@gnu.org; Sun, 26 Jan 2025 15:40:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1737922758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RODWbRXFPlIuGoscJLC2CF75vBGjPdQegQZ6XJPqHFo=; b=sZvMBdAeyn7KfY4WKm2rGfrtIiMfrh6VQlIsWWphyHQQ2fHCaQTVCY/Vj8x92cMXmQ36P1 RAPaL0b5rplOufVEtluXC2lgjXBOdT6Nnx0izyd/s6y9li1SQ+8qenq2t8xp7U8jBSfswy goDrR8yh+wT2QmroTsy2uH0Gv64iXrGnPKx6WZ8IYNtvOQqmZETxq4MXxg2jk9V9RqQgGq JhLFqKFtNxqEbMKOrqxjF1ElTBs+I024f+zCeu8BFkhJDFQE9dxliq8xNhXDuOidz0rbBa lV5+adURCpsTW5OyseDkOvDRO+7pO9uWbjuXyrWO6zherG+yy9dv0IM+X0L+AA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b24a5796 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Sun, 26 Jan 2025 20:19:18 +0000 (UTC) From: Herman Rimm Date: Sun, 26 Jan 2025 21:18:28 +0100 Message-ID: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) * guix/scripts/import/crate.scm (show-help): Reformat and reword --allow-yanked message. Change-Id: I43a50b201be86cd71f6ab51a7161e4009d4918bf --- guix/scripts/import/crate.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index a4adabfeffe..ac11dabaa3b 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -50,10 +50,10 @@ (define (show-help) (display (G_ " --recursive-dev-dependencies include dev-dependencies recursively")) + (newline) (display (G_ " - --allow-yanked - allow importing yanked crates if no alternative - satisfying the version requirement exists")) + --allow-yanked allow importing yanked crates if no alternative + satisfying the version requirement is found")) (newline) (display (G_ " -h, --help display this help and exit")) base-commit: 5481a96417fbf94fc8b6a73abe72a97ce6bc6ec1 -- 2.47.1 From unknown Wed Jun 25 05:41:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75878] [PATCH 2/3] import: crate: Comment out missing dependencies. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, divya@subvertising.org, efraim@flashner.co.il, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 26 Jan 2025 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75878@debbugs.gnu.org Cc: Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 75878-submit@debbugs.gnu.org id=B75878.173792413312146 (code B ref 75878); Sun, 26 Jan 2025 20:43:02 +0000 Received: (at 75878) by debbugs.gnu.org; 26 Jan 2025 20:42:13 +0000 Received: from localhost ([127.0.0.1]:58038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tc9SO-00039o-VI for submit@debbugs.gnu.org; Sun, 26 Jan 2025 15:42:13 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54851 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tc9SL-00039P-8G for 75878@debbugs.gnu.org; Sun, 26 Jan 2025 15:42:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1737924122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XvRD2+k6iYhbajwdZoIDPkXDBHPdk64M2+i2RPocQp0=; b=suyCjGbpDrhn1tu0AohkJvnxo/+2QZ2NayTnWdL8XjdUZ6rR/eeTZiT1rbL6Xb+FC8MlIN K7ikqiJufGCXlcfX5Uec4GhRn+Ae5EesN6e9rJU4XiHTRMnRmViSnw7hyIKP5AMZTIEMhW QEDRz8ZwWA0KWwj1VWX3506huBF/5oachAzhh7aQuNSkwbvKSHn9sGSy91Kud776QdRvdd PwfhEBH689XcDn5ZTEKKLxk58Rt+YcgvojdY8AAV/eYdvWsh0U3S9KMjc/Q7vxcw3Bl8Pq M2UfeehCH/QGo6DUo645sr1unmVxiM+j4GqZ+CHLAX8ZzwKtu2+YXFoJ7XtEYA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7a7ee2ac (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75878@debbugs.gnu.org>; Sun, 26 Jan 2025 20:42:02 +0000 (UTC) From: Herman Rimm Date: Sun, 26 Jan 2025 21:41:16 +0100 Message-ID: <70b0c798dea659dbbf8f3e8bdf07f30d26e8168e.1737922578.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> References: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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 (package-names->package-inputs): Emit comments. (make-crate-sexp): Make input into comment if missing. (crate->guix-package): Take #:mark-missing? argument. [dependency-name+missing+version+yanked]: Mark as missing. Rename from dependency-name+version+yanked. [sort-map-dependencies]: Adjust. [remove-missing+yanked-info]: Remove missing info. Rename from remove-yanked-info. * guix/scripts/import/crate.scm (show-help): Explain --mark-missing. (%options): Add mark-missing option. (guix-import-crate): Pass mark-missing option as #:mark-missing?. * doc/guix.texi (Invoking guix import): Document --mark-missing. * tests/crate.scm ("crate->guix-package-marks-missing-packages"): Add test. Change-Id: I065d394e1c04fdc332b8f7f8b9fcbd87c14c6512 --- doc/guix.texi | 6 +- guix/import/crate.scm | 41 ++++++++----- guix/scripts/import/crate.scm | 10 +++- tests/crate.scm | 107 ++++++++++++++++++++++++++-------- 4 files changed, 123 insertions(+), 41 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9a53bdcd374..f7d408a234b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -124,7 +124,7 @@ Copyright @copyright{} 2023 Saku Laesvuori@* Copyright @copyright{} 2023 Graham James Addis@* Copyright @copyright{} 2023, 2024 Tomas Volf@* -Copyright @copyright{} 2024 Herman Rimm@* +Copyright @copyright{} 2024, 2025 Herman Rimm@* Copyright @copyright{} 2024 Matthew Trzcinski@* Copyright @copyright{} 2024 Richard Sent@* Copyright @copyright{} 2024 Dariqq@* @@ -14679,6 +14679,10 @@ Invoking guix import @item --allow-yanked If no non-yanked version of a crate is available, use the latest yanked version instead instead of aborting. +@item --mark-missing +If a crate dependency is not (yet) packaged, make the corresponding +input in @code{#:cargo-inputs} or @code{#:cargo-development-inputs} into +a comment. @end table @item elm diff --git a/guix/import/crate.scm b/guix/import/crate.scm index d790126ef6e..cb39f43c4a1 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -156,6 +156,7 @@ (define* (package-names->package-inputs names #:optional (output #f)) (map (match-lambda ((input version) (make-input input version)) + ((? blank? comment) comment) (input (make-input input #f))) names)) @@ -194,11 +195,16 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu (define (format-inputs inputs) (map (match-lambda - ((name version yanked) - (list (crate-name->package-name name) - (if yanked - (string-append version "-yanked") - (version->semver-prefix version))))) + ((name missing version yanked) + (let ((input (list (crate-name->package-name name) + (if yanked + (string-append version "-yanked") + (version->semver-prefix version))))) + (if missing + (comment + (string-append ";; " (string-join input "-") "\n") + #f) + input)))) inputs)) (let* ((port (http-fetch (crate-uri name version))) @@ -318,7 +324,8 @@ (define (find-package-version name range allow-yanked?) (define* (crate->guix-package crate-name - #:key version include-dev-deps? allow-yanked? #:allow-other-keys) + #:key version include-dev-deps? allow-yanked? mark-missing? + #:allow-other-keys) "Fetch the metadata for CRATE-NAME from crates.io, and return the `package' s-expression corresponding to that package, or #f on failure. When VERSION is specified, convert it into a semver range and attempt to fetch @@ -358,13 +365,13 @@ (define* (crate->guix-package ;; If no non-yanked existing package version was found, check the upstream ;; versions. If a non-yanked upsteam version exists, use it instead, ;; otherwise use the existing package version, provided it exists. - (define (dependency-name+version+yanked dep) + (define (dependency-name+missing+version+yanked dep) (let* ((name (crate-dependency-id dep)) (req (crate-dependency-requirement dep)) (existing-version (find-package-version name req allow-yanked?))) (if (and existing-version (not (second existing-version))) - (cons name existing-version) + (cons* name #f existing-version) (let* ((crate (lookup-crate* name)) (ver (find-crate-version crate req))) (if existing-version @@ -374,14 +381,15 @@ (define* (crate->guix-package (begin (warning (G_ "~A: version ~a is no longer yanked~%") name (first existing-version)) - (cons name existing-version)) + (cons* name #f existing-version)) (list name + #f (crate-version-number ver) (crate-version-yanked? ver))) (begin (warning (G_ "~A: using existing version ~a, which was yanked~%") name (first existing-version)) - (cons name existing-version))) + (cons* name #f existing-version))) (begin (unless ver (leave (G_ "~A: no version found for requirement ~a~%") name req)) @@ -389,6 +397,7 @@ (define* (crate->guix-package (warning (G_ "~A: imported version ~a was yanked~%") name (crate-version-number ver))) (list name + mark-missing? (crate-version-number ver) (crate-version-yanked? ver)))))))) @@ -400,14 +409,14 @@ (define* (crate->guix-package ;; sort and map the dependencies to a list containing ;; pairs of (name version) (define (sort-map-dependencies deps) - (sort (map dependency-name+version+yanked + (sort (map dependency-name+missing+version+yanked deps) - (match-lambda* (((name _ _) ...) + (match-lambda* (((name _ _ _) ...) (apply string-ciguix-package #:license (and=> (crate-version-license version*) string->license)) (append - (remove-yanked-info cargo-inputs) - (remove-yanked-info cargo-development-inputs)))) + (remove-missing+yanked-info cargo-inputs) + (remove-missing+yanked-info cargo-development-inputs)))) (values #f '()))) (define* (crate-recursive-import diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index ac11dabaa3b..9d403ce0ec0 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2023 Simon Tournier ;;; Copyright © 2023 David Elsing +;;; Copyright © 2025 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,9 @@ (define (show-help) (display (G_ " --allow-yanked allow importing yanked crates if no alternative satisfying the version requirement is found")) + (display (G_ " + --mark-missing comment out the desired dependency if no + sufficient package exists for it.")) (newline) (display (G_ " -h, --help display this help and exit")) @@ -80,6 +84,9 @@ (define %options (option '("allow-yanked") #f #f (lambda (opt name arg result) (alist-cons 'allow-yanked #t result))) + (option '("mark-missing") #f #f + (lambda (opt name arg result) + (alist-cons 'mark-missing #t result))) %standard-import-options)) @@ -112,7 +119,8 @@ (define (guix-import-crate . args) #:allow-yanked? (assoc-ref opts 'allow-yanked)) (crate->guix-package name #:version version #:include-dev-deps? #t - #:allow-yanked? (assoc-ref opts 'allow-yanked))) + #:allow-yanked? (assoc-ref opts 'allow-yanked) + #:mark-missing? (assoc-ref opts 'mark-missing))) ((or #f '()) (leave (G_ "failed to download meta-data for package '~a'~%") (if version diff --git a/tests/crate.scm b/tests/crate.scm index 02b708f9d9a..2f1c37633c9 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2023, 2025 Efraim Flashner ;;; Copyright © 2023 David Elsing +;;; Copyright © 2025 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -446,6 +447,29 @@ (define test-source-hash (define have-guile-semver? (false-if-exception (resolve-interface '(semver)))) +(define rust-leaf-bob-3 + (package + (name "rust-leaf-bob") + (version "3.0.1") + (source #f) + (build-system #f) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + +(define rust-leaf-bob-3.0.2-yanked + (package + (name "rust-leaf-bob") + (version "3.0.2") + (source #f) + (properties '((crate-version-yanked? . #t))) + (build-system #f) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + (test-begin "crate") @@ -510,6 +534,66 @@ (define have-guile-semver? (x (pk 'fail x #f))))) +(unless have-guile-semver? (test-skip 1)) +(test-assert "crate->guix-package-marks-missing-packages" + (mock + ((gnu packages) find-packages-by-name + (lambda* (name #:optional version) + (match name + ("rust-leaf-bob" + (list rust-leaf-bob-3.0.2-yanked)) + (_ '())))) + (mock + ((guix http-client) http-fetch + (lambda (url . rest) + (match url + ("https://crates.io/api/v1/crates/intermediate-b" + (open-input-string test-intermediate-b-crate)) + ("https://crates.io/api/v1/crates/intermediate-b/1.2.3/download" + (set! test-source-hash + (bytevector->nix-base32-string + (gcrypt-sha256 (string->bytevector "empty file\n" "utf-8")))) + (open-input-string "empty file\n")) + ("https://crates.io/api/v1/crates/intermediate-b/1.2.3/dependencies" + (open-input-string test-intermediate-b-dependencies)) + ("https://crates.io/api/v1/crates/leaf-bob" + (open-input-string test-leaf-bob-crate)) + ("https://crates.io/api/v1/crates/leaf-bob/3.0.1/download" + (set! test-source-hash + (bytevector->nix-base32-string + (gcrypt-sha256 (string->bytevector "empty file\n" "utf-8")))) + (open-input-string "empty file\n")) + (_ (error "Unexpected URL: " url))))) + (match (crate->guix-package "intermediate-b" #:mark-missing? #t) + ((define-public 'rust-intermediate-b-1 + (package + (name "rust-intermediate-b") + (version "1.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "intermediate-b" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + (? string? hash))))) + (build-system cargo-build-system) + (arguments + ('quasiquote + (#:skip-build? #t + #:cargo-inputs + (($ ";; rust-leaf-bob-3\n" #f))))) + (home-page "http://example.com") + (synopsis "summary") + (description "This package provides summary.") + (license (list license:expat license:asl2.0)))) + #t) + (x + (pk 'fail + (pretty-print-with-comments (current-output-port) x) + #f)))))) + (unless have-guile-semver? (test-skip 1)) (test-assert "crate-recursive-import" ;; Replace network resources with sample data. @@ -883,29 +967,6 @@ (define have-guile-semver? -(define rust-leaf-bob-3 - (package - (name "rust-leaf-bob") - (version "3.0.1") - (source #f) - (build-system #f) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - -(define rust-leaf-bob-3.0.2-yanked - (package - (name "rust-leaf-bob") - (version "3.0.2") - (source #f) - (properties '((crate-version-yanked? . #t))) - (build-system #f) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - (unless have-guile-semver? (test-skip 1)) (test-assert "crate-recursive-import-honors-existing-packages" (mock -- 2.47.1 From unknown Wed Jun 25 05:41:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75878] [PATCH 3/3] tests: crate: Add build dependency. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 26 Jan 2025 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75878@debbugs.gnu.org Cc: Divya Ranjan Pattanaik , Efraim Flashner X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner Received: via spool by 75878-submit@debbugs.gnu.org id=B75878.173792413412152 (code B ref 75878); Sun, 26 Jan 2025 20:43:02 +0000 Received: (at 75878) by debbugs.gnu.org; 26 Jan 2025 20:42:14 +0000 Received: from localhost ([127.0.0.1]:58040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tc9SP-00039s-Tc for submit@debbugs.gnu.org; Sun, 26 Jan 2025 15:42:14 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54851 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tc9SM-00039P-W5 for 75878@debbugs.gnu.org; Sun, 26 Jan 2025 15:42:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1737924122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EUGffUZBowDSxI6dUSKtAS69272gXQLY9SSimx3MzsA=; b=fRXs2I2sVUxr36IW2vnvuPrErd4P8YXee3jQRXpfTeEwOWPwnLOEcvUj6XvVTKsJa5jHyP AZeVdWRpfbnx0Bm5jruVS4YjXrNyl9qNDzMzw4rKdOKCPmLiLMZg+kfVFIuBDbXeaH7dua On0eIYF6aKlUui3worSTtkf0yr1vsX6YlpuL+S4xyJ1bwBgAPgH68jOP27v42vqZTPIB4m pMEbLilGHaMwowHbGqhFOUukTwXhEPFEP+n8S6FRU6+qyezPHofmdhbg8kZRq0DF9Atr1O xNYz1Kepwc4qNhjw5Bj6J+AqQUkFyP6t7wHzg6vfBLeKlOByjFSCKYYzngYVTA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b77a1866 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75878@debbugs.gnu.org>; Sun, 26 Jan 2025 20:42:02 +0000 (UTC) From: Herman Rimm Date: Sun, 26 Jan 2025 21:41:17 +0100 Message-ID: <5308404613fa56e72a3a882abacadc366ebf9bdd.1737922578.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> References: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) 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 (-) * tests/crate.scm ("crate-recursive-import"): Add rust-leaf-bob-3 to rust-root-1 cargo-inputs. (test-root-dependencies): Add leaf-bob 3 build dependency. Change-Id: I1285fc6b36429f754d54def0b14f821306ba366d --- tests/crate.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/crate.scm b/tests/crate.scm index 2f1c37633c9..d0dc779cd2f 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -53,6 +53,7 @@ (define-module (test-crate) ;; intermediate-b ^1.0.0 ;; leaf-alice ^0.7 ;; leaf-bob ^3 +;; leaf-bob 3 (build-dependency) ;; intermediate-c 1 (dev-dependency) ;; ;; intermediate-a-1.0.40 @@ -224,6 +225,11 @@ (define test-root-dependencies \"kind\": \"normal\", \"req\": \"^3\" }, + { + \"crate_id\": \"leaf-bob\", + \"kind\": \"build\", + \"req\": \"3\" + }, { \"crate_id\": \"intermediate-c\", \"kind\": \"dev\", @@ -932,6 +938,8 @@ (define rust-leaf-bob-3.0.2-yanked ('unquote rust-intermediate-b-1)) ("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7)) + ("rust-leaf-bob" + ('unquote rust-leaf-bob-3)) ("rust-leaf-bob" ('unquote rust-leaf-bob-3))) #:cargo-development-inputs -- 2.47.1 From unknown Wed Jun 25 05:41:04 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Herman Rimm Subject: bug#75878: closed (Re: [bug#75878] [PATCH 1/3] scripts: import: crate: show-help: Reformat.) Message-ID: References: <87frknrv9t.fsf@gnu.org> <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> X-Gnu-PR-Message: they-closed 75878 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75878@debbugs.gnu.org Date: Sun, 09 Feb 2025 15:31:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1739115062-11591-1" This is a multi-part message in MIME format... ------------=_1739115062-11591-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #75878: [PATCH 1/3] scripts: import: crate: show-help: Reformat. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 75878@debbugs.gnu.org. --=20 75878: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75878 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1739115062-11591-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 75878-done) by debbugs.gnu.org; 9 Feb 2025 15:30:07 +0000 Received: from localhost ([127.0.0.1]:45813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1th9G3-0002vp-DL for submit@debbugs.gnu.org; Sun, 09 Feb 2025 10:30:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57906) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1th9G1-0002rN-3g for 75878-done@debbugs.gnu.org; Sun, 09 Feb 2025 10:30:05 -0500 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 1th9Fp-0004UG-M3; Sun, 09 Feb 2025 10:29:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=xR6xYHU2icMqOLgzUnJxxqwGkMks7D/5HRJkJQBCe5M=; b=koa+ZABdg1n7gQULjUDs /e9cks9mtP91DNsNpDti9ch/jEAxnLx/MESlxHvzOKihznOshtzDlaMY6yUAG5BEbRh6NBiJQZQ34 vPYlf13uaiyKW71shCKDGQDfBHWHhoWfzsg55u+CVqifDk4cWCqHWOgp9Jv/b0v5EHhsDtlc/mywL WGq1u7muVJR48pN+T6zvoEz37Ihk9gY4u4q+UGzP4nvC+koSQQulpBuLa85aUVCl/b4HO5XcRdSCn tJGmUwixIYWTHLs8P+F/BUSA6t61MnAu+hT9FUVVL2bsuXoTNDAPHGleiCUygMQXXg3cJxROpM8Yi /ID2bzQPvyCpZg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Herman Rimm Subject: Re: [bug#75878] [PATCH 1/3] scripts: import: crate: show-help: Reformat. In-Reply-To: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> (Herman Rimm's message of "Sun, 26 Jan 2025 21:18:28 +0100") References: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> Date: Sun, 09 Feb 2025 16:29:50 +0100 Message-ID: <87frknrv9t.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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: 75878-done Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , 75878-done@debbugs.gnu.org, Divya Ranjan Pattanaik , Christopher Baines 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 Herman, Applied all three patches, thanks! Ludo=E2=80=99. ------------=_1739115062-11591-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Jan 2025 20:40:53 +0000 Received: from localhost ([127.0.0.1]:58023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tc9R7-00036L-8K for submit@debbugs.gnu.org; Sun, 26 Jan 2025 15:40:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55620) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tc9R4-00035v-JV for submit@debbugs.gnu.org; Sun, 26 Jan 2025 15:40:51 -0500 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 1tc9Qq-0006XE-09 for guix-patches@gnu.org; Sun, 26 Jan 2025 15:40:36 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tc9Qo-00029L-6t for guix-patches@gnu.org; Sun, 26 Jan 2025 15:40:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1737922758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RODWbRXFPlIuGoscJLC2CF75vBGjPdQegQZ6XJPqHFo=; b=sZvMBdAeyn7KfY4WKm2rGfrtIiMfrh6VQlIsWWphyHQQ2fHCaQTVCY/Vj8x92cMXmQ36P1 RAPaL0b5rplOufVEtluXC2lgjXBOdT6Nnx0izyd/s6y9li1SQ+8qenq2t8xp7U8jBSfswy goDrR8yh+wT2QmroTsy2uH0Gv64iXrGnPKx6WZ8IYNtvOQqmZETxq4MXxg2jk9V9RqQgGq JhLFqKFtNxqEbMKOrqxjF1ElTBs+I024f+zCeu8BFkhJDFQE9dxliq8xNhXDuOidz0rbBa lV5+adURCpsTW5OyseDkOvDRO+7pO9uWbjuXyrWO6zherG+yy9dv0IM+X0L+AA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b24a5796 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Sun, 26 Jan 2025 20:19:18 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH 1/3] scripts: import: crate: show-help: Reformat. Date: Sun, 26 Jan 2025 21:18:28 +0100 Message-ID: <9630eac9e8bd26aa97620b16fc4d38d5f80fb497.1737922578.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit 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: -0.1 (/) * guix/scripts/import/crate.scm (show-help): Reformat and reword --allow-yanked message. Change-Id: I43a50b201be86cd71f6ab51a7161e4009d4918bf --- guix/scripts/import/crate.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index a4adabfeffe..ac11dabaa3b 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -50,10 +50,10 @@ (define (show-help) (display (G_ " --recursive-dev-dependencies include dev-dependencies recursively")) + (newline) (display (G_ " - --allow-yanked - allow importing yanked crates if no alternative - satisfying the version requirement exists")) + --allow-yanked allow importing yanked crates if no alternative + satisfying the version requirement is found")) (newline) (display (G_ " -h, --help display this help and exit")) base-commit: 5481a96417fbf94fc8b6a73abe72a97ce6bc6ec1 -- 2.47.1 ------------=_1739115062-11591-1--