From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SNU2EB/6wGVwcAAAqHPOHw:P1 (envelope-from ) for ; Mon, 05 Feb 2024 16:09:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id SNU2EB/6wGVwcAAAqHPOHw (envelope-from ) for ; Mon, 05 Feb 2024 16:09:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=rEwOJijs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707145759; a=rsa-sha256; cv=none; b=CDOweY4OvEpg1Yp7teywbMrEWzVHxIPqhhj1kpQPYXLABDD6sOCStWaVnLNqMt8CHHK+G8 phcdfC8eMShfuN1qvSqtLk32wyiEqc9jRKAsnTjIVKYvxqjqVD38XB271pLt/m8PzuAy3A FPCOkf30WAnWCINRPffd9Y/F5v2CGshsL7bApyQJ0wsHjEFKYG2vb2EX8dw7v+rzDtk5nZ eyTCOcChalsD5bvW+MFgtvTRn+y5EjaqwNuTIeGaclsl7Q7/AysCsDaS1oYB5CPfOORvFj doyRLBiTA7w7zEZDSoBn1llvMEnX2wxoe7A/WSZYcCYeQgVsik6sc4ooGhpbSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=rEwOJijs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707145759; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=D3zUN2GJzMX0yBFtuIidLr6HXh+Sv2QSl0hP9C5ux0Y=; b=pTtLwkLCfFnmBdaSfpGapeEw7MHi6QxEajvhjr06POkRl98k8n8KxaZWW13jkMViNPHjmm Uw1I6PdsR0RXdlhcrKmKSdyG6SKwOXEs93VML8TPWb3AWZiYZNED7kZCxAkW/9Kq0XaN9l LTy5hr7dQMX6iHb5zEfTq+Rcy/j/q2h1CB/R0CgJoDoWkjJ4sBpTZYUjyoVAdnSpzPcklW sfq//eZ31ekOT2wdiYNYoZc4ak7hKbrRw8hqoo36BnI7lxytlOm8ngYMCRmdIr0+AUtDMC 47LAyIrApTOL9ITeVm87SyadzREg7VKXDLglZGrbqhsNZaWIvPNJfGQYbSFo6A== 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 0EE9A6EC1F for ; Mon, 5 Feb 2024 16:09:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX0ag-000107-CQ; Mon, 05 Feb 2024 10:08:58 -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 1rX0ad-0000yx-M0 for guix-patches@gnu.org; Mon, 05 Feb 2024 10:08:55 -0500 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 1rX0ab-0006zb-Ra; Mon, 05 Feb 2024 10:08:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX0ak-0004qb-LZ; Mon, 05 Feb 2024 10:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68935] [PATCH 3/3] guix: import: Put packages into modules in alphabetical order. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68935@debbugs.gnu.org Cc: Herman Rimm , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 68935-submit@debbugs.gnu.org id=B68935.170714569918561 (code B ref 68935); Mon, 05 Feb 2024 15:09:02 +0000 Received: (at 68935) by debbugs.gnu.org; 5 Feb 2024 15:08:19 +0000 Received: from localhost ([127.0.0.1]:52047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX0a3-0004pI-2C for submit@debbugs.gnu.org; Mon, 05 Feb 2024 10:08:19 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:43109 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX0Zy-0004od-Pp for 68935@debbugs.gnu.org; Mon, 05 Feb 2024 10:08:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1707145677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D3zUN2GJzMX0yBFtuIidLr6HXh+Sv2QSl0hP9C5ux0Y=; b=rEwOJijsGDNxnmmbtCVFpW5O/dlHWSxKPwZmKdHfZ6dtAjEOzpbZAGRssejpTyHU+TjTze aZhFYZSblZXPKI6rhDEF3ulsafqJrmJwXawTM//9jjn3lnAuUjKctq5aEHeHAb0+fv/0XL HvMWDK0juD2koiEZ0HihA1GTdku89kpJovsiDyxy6YrWrhJix8GUV8zPuXDubfiHcD3wRk qiJgHLwM/D+zj9Ypq+mF5qARr2L7vG6iEjs0ZnjcbjMnNefdRuGrdloeh5GTU3fXsroISt kps5BQfQdPRq8nUu6it5HxNcQOhx2IHUxZFT8k+ZYVcRIYD3zGhybJufVNxfZQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 91e67915 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 5 Feb 2024 15:07:57 +0000 (UTC) Date: Mon, 5 Feb 2024 16:07:14 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -5.17 X-Migadu-Queue-Id: 0EE9A6EC1F X-Migadu-Spam-Score: -5.17 X-TUID: J0S+59C30IbY * guix/scripts/import.scm (guix-import): Add 'put' option. (try-import): Add variable. * doc/guix.texi (Invoking guix import): Describe 'put' option. Change-Id: Ied4fc95899c31fb2523a01139780fc9744aa63cb --- doc/guix.texi | 14 +++++- guix/scripts/import.scm | 100 +++++++++++++++++++++++++++------------- 2 files changed, 81 insertions(+), 33 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b76df868f8..5ab4c0d2a8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -124,6 +124,7 @@ Copyright @copyright{} 2023 Saku Laesvuori@* Copyright @copyright{} 2023 Graham James Addis@* Copyright @copyright{} 2023 Tomas Volf@* +Copyright @copyright{} 2024 Herman Rimm@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -14178,12 +14179,21 @@ Invoking guix import The general syntax is: @example -guix import @var{importer} @var{options}@dots{} +guix import @var{option} @var{importer} @var{options}@dots{} @end example @var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other -options specific to @var{importer}. +options specific to @var{importer}. @command{guix import} itself has the +following options: + +@table @code +@item --put=@var{file} +@itemx -p @var{file} +Insert the package definition(s) that the @var{importer} generated into the +specified @var{file}, either in alphabetical order among existing package +definitions, or at the end of the file otherwise. +@end table Some of the importers rely on the ability to run the @command{gpgv} command. For these, GnuPG must be installed and in @code{$PATH}; run @code{guix install diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 80b1bec7fc..0d83483c4e 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -24,6 +24,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix scripts import) + #:use-module (guix build utils) #:use-module (guix import utils) #:use-module (guix ui) #:use-module (guix scripts) @@ -67,10 +68,37 @@ (define (show-help) (display (G_ " -h, --help display this help and exit")) (display (G_ " + -p, --put put the import in a package module")) + (display (G_ " -V, --version display version information and exit")) (newline) (show-bug-report-information)) +(define (try-import importer args finish) + (if (member importer importers) + (match (apply (resolve-importer importer) args) + ((and expr ('package _ ...)) + (finish (package->definition expr))) + ((and expr (or ('let _ ...) + ('define-public _ ...))) + (finish expr)) + ((? list? expressions) + (for-each (lambda (expr) + (match expr + ((and expr ('package _ ...)) + (finish (package->definition expr))) + ((and expr (or ('let _ ...) + ('define-public _ ...))) + (finish expr)))) + expressions)) + (x + (leave (G_ "'~a' import failed~%") importer))) + (let ((hint (string-closest importer importers #:threshold 3))) + (report-error (G_ "~a: invalid importer~%") importer) + (when hint + (display-hint (G_ "Did you mean @code{~a}?~%") hint)) + (exit 1)))) + (define-command (guix-import . args) (category packaging) (synopsis "import a package definition from an external repository") @@ -79,38 +107,48 @@ (define-command (guix-import . args) (() (format (current-error-port) (G_ "guix import: missing importer name~%"))) - ((or ("-h") ("--help")) + ((or ("-h" _ ...) ("--help" _ ...)) (leave-on-EPIPE (show-help)) (exit 0)) - ((or ("-V") ("--version")) + ((or ("-V" _ ...) ("--version" _ ...)) (show-version-and-exit "guix import")) + ((or ("-p" module importer args ...) + ("--put" module importer args ...)) + (let ((put (lambda (expr) + (let ((line + (call-with-input-file module + (lambda (port) + (do ((se (read-syntax port) + (read-syntax port))) + ((match (syntax->datum se) + (('define-public symbol _ ...) + (string> (symbol->string symbol) + (symbol->string (cadr expr)))) + ((? eof-object?) #t) + (_ #f)) + (if (eof-object? se) + #f + (car (string-split + (object->string* + (syntax->datum se) 0) + #\newline))))))))) + (if line + (substitute* module + (((string-append "\\" line)) + (string-append + (object->string* expr 0) + "\n\n" line))) + (let ((port (open-file module "a"))) + (pretty-print-with-comments port expr) + (newline port) + (close-port port))))))) + (try-import importer args put))) ((importer args ...) - (if (member importer importers) - (let ((print (lambda (expr) - (leave-on-EPIPE - (pretty-print-with-comments (current-output-port) expr))))) - (match (apply (resolve-importer importer) args) - ((and expr ('package _ ...)) - (print (package->definition expr))) - ((and expr (or ('let _ ...) - ('define-public _ ...))) - (print expr)) - ((? list? expressions) - (for-each (lambda (expr) - (match expr - ((and expr ('package _ ...)) - (print (package->definition expr))) - ((and expr (or ('let _ ...) - ('define-public _ ...))) - (print expr))) - ;; Two newlines: one after the closing paren, and - ;; one to leave a blank line. - (newline) (newline)) - expressions)) - (x - (leave (G_ "'~a' import failed~%") importer)))) - (let ((hint (string-closest importer importers #:threshold 3))) - (report-error (G_ "~a: invalid importer~%") importer) - (when hint - (display-hint (G_ "Did you mean @code{~a}?~%") hint)) - (exit 1)))))) + (let ((print (lambda (expr) + (leave-on-EPIPE + (pretty-print-with-comments + (current-output-port) expr) + ;; Two newlines: one after the closing paren, + ;; and one to leave a blank line. + (newline) (newline))))) + (try-import importer args print))))) -- 2.41.0