[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68935] [PATCH v3 2/7] import: Wrap package expressions with define-
From: |
Herman Rimm |
Subject: |
[bug#68935] [PATCH v3 2/7] import: Wrap package expressions with define-public. |
Date: |
Tue, 20 Feb 2024 21:45:10 +0100 |
* guix/scripts/import.scm (guix-import): Wrap package expressions.
Change-Id: Ic4d986a4706a692b2fecd6fded8ac72ab6311687
---
guix/scripts/import.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index d2a1cee56e..77fcfe3990 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
+;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +24,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix scripts import)
+ #:use-module (guix import utils)
#:use-module (guix ui)
#:use-module (guix scripts)
#:use-module (guix read-print)
@@ -89,12 +91,18 @@ (define-command (guix-import . args)
(pretty-print-with-comments (current-output-port)
expr)))))
(match (apply (resolve-importer importer) args)
((and expr (or ('package _ ...)
- ('let _ ...)
- ('define-public _ ...)))
+ ('let _ ...)))
+ (print (package->definition expr)))
+ ((and expr ('define-public _ ...))
(print expr))
((? list? expressions)
(for-each (lambda (expr)
- (print expr)
+ (match expr
+ ((and expr (or ('package _ ...)
+ ('let _ ...)))
+ (print (package->definition expr)))
+ ((and expr ('define-public _ ...))
+ (print expr)))
;; Two newlines: one after the closing paren, and
;; one to leave a blank line.
(newline) (newline))
--
2.41.0
- [bug#68935] [PATCH v2 5/6] import: Insert packages into modules alphabetically., (continued)
- [bug#68935] [PATCH v3 0/7] Add insert option to guix import., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 1/7] doc: Note SVN dependency of texlive importer., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 7/7] import: Do not return package name with json importer., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 4/7] utils: Add find-definition-insertion-location procedure., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 3/7] utils: Add insert-expression procedure., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 6/7] import: Discard args after --version and --help., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 5/7] import: Insert packages into modules alphabetically., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 2/7] import: Wrap package expressions with define-public.,
Herman Rimm <=
- [bug#68935] [PATCH v3 0/7] Add insert option to guix import., Ludovic Courtès, 2024/02/23
- bug#68935: [PATCH v3 0/7] Add insert option to guix import., Ludovic Courtès, 2024/02/23