From patchwork Sun May 12 19:08:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 27422 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 1016E27BBE9; Sun, 12 May 2024 20:10:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4A79427BBE2 for ; Sun, 12 May 2024 20:10:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6EaO-0002Go-4s; Sun, 12 May 2024 15:10:16 -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 1s6EaD-0002F4-CG for guix-patches@gnu.org; Sun, 12 May 2024 15:10:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6EaB-0007vu-AW for guix-patches@gnu.org; Sun, 12 May 2024 15:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6EaB-0008BQ-38; Sun, 12 May 2024 15:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70715] [PATCH v2 2/3] guix: Include a main verb in crate importer descriptions. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 12 May 2024 19:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70715 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70715@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 70715-submit@debbugs.gnu.org id=B70715.171554094831390 (code B ref 70715); Sun, 12 May 2024 19:10:03 +0000 Received: (at 70715) by debbugs.gnu.org; 12 May 2024 19:09:08 +0000 Received: from localhost ([127.0.0.1]:56017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6EZH-0008AC-Q6 for submit@debbugs.gnu.org; Sun, 12 May 2024 15:09:08 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60569 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6EZE-00089M-Vc for 70715@debbugs.gnu.org; Sun, 12 May 2024 15:09:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715540926; 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=/EaQcB+QYq4xkyUFI0hWmGzPhIfJ2GH9aH8BkS7Mpj4=; b=L+404Oe73+NbjgylLQVk/txbHyFg3OajywIL4EaszwcQCj9Rvcx19iPm5ZPAOJK5VvyTA4 E3w12w8zsCZWBGny3Z3h5ax1qEuu6eB8nN7BaeE8STS83R3Rz6fho1bh1wyngk1fozOgEb GUjxXuiX/tK/iGOA16I7zaYUPrb5qzyQ1pNJ2r5KiwHmCGTP4YaNA1n30d2JbcIZnpYhV/ 977SUpNeBk2KapbdPt9Pa8riRaDVr+PlK5PGZei7IMbkEJ2OPQ0e6/SnbrAV3sGl1ykB9C xBu4NnXhZu0tVqsjZgHtCTH9IFFhIo2dInuFlEz2ktQ57avgS8M5NvA2t36NgA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 5f2b917c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70715@debbugs.gnu.org>; Sun, 12 May 2024 19:08:46 +0000 (UTC) Date: Sun, 12 May 2024 21:08:31 +0200 Message-ID: <2fdcf91f2da5f7170dd11daae30e71b3e77c3b1b.1715540349.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * guix/import/crate.scm (make-crate-sexp): Start description with 'This package provides '. * tests/crate.scm: Set descriptions to "This package provides summary". --- guix/import/crate.scm | 6 +++++- tests/crate.scm | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 921e5499da..383a419741 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -187,6 +187,7 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu (guix-name (crate-name->package-name name)) (cargo-inputs (format-inputs cargo-inputs)) (cargo-development-inputs (format-inputs cargo-development-inputs)) + (description (beautify-description description)) (pkg `(package (name ,guix-name) (version ,version) @@ -212,7 +213,10 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu cargo-development-inputs))) (home-page ,home-page) (synopsis ,(beautify-synopsis synopsis)) - (description ,(beautify-description description)) + (description ,(if (string-prefix? "This" description) + description + (string-append "This package provides " + description))) (license ,(match license (() #f) (#f #f) diff --git a/tests/crate.scm b/tests/crate.scm index ce2f08aade..8b5bbc1b03 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -503,7 +503,7 @@ (define have-guile-semver? (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (string=? test-source-hash hash)) @@ -592,7 +592,7 @@ (define have-guile-semver? ('quasiquote (#:skip-build? #t))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-alice-0.7 (package @@ -611,7 +611,7 @@ (define have-guile-semver? (arguments ('quasiquote (#:skip-build? #t))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3 (package @@ -630,7 +630,7 @@ (define have-guile-semver? (arguments ('quasiquote (#:skip-build? #t))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-b-1 (package @@ -653,7 +653,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-a-1 (package @@ -680,7 +680,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-root-1 (package @@ -711,7 +711,7 @@ (define have-guile-semver? ('unquote rust-intermediate-c-1)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0))))) #t) (x @@ -740,7 +740,7 @@ (define have-guile-semver? ('unquote rust-leaf-alice-0.7)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-alice-0.7 (package @@ -758,7 +758,7 @@ (define have-guile-semver? (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3 (package @@ -776,7 +776,7 @@ (define have-guile-semver? (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-b-1 (package @@ -798,7 +798,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-a-1 (package @@ -824,7 +824,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-root-1 (package @@ -855,7 +855,7 @@ (define have-guile-semver? ('unquote rust-intermediate-c-1)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0))))) #t) (x @@ -972,7 +972,7 @@ (define rust-leaf-bob-3.0.2-yanked ('unquote 'rust-leaf-bob-4.0.0-yanked)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0))))) #t) (x @@ -1038,7 +1038,7 @@ (define rust-leaf-bob-3.0.2-yanked (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3.0.2-yanked (package @@ -1058,7 +1058,7 @@ (define rust-leaf-bob-3.0.2-yanked (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3 (package @@ -1076,7 +1076,7 @@ (define rust-leaf-bob-3.0.2-yanked (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0)))) (define-public 'rust-bar-1 (package @@ -1103,7 +1103,7 @@ (define rust-leaf-bob-3.0.2-yanked ('unquote 'rust-leaf-bob-4.0.0-yanked)))))) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "This package provides summary") (license (list license:expat license:asl2.0))))) #t) (x