[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel'.
From: |
Ludovic Courtès |
Subject: |
[bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel'. |
Date: |
Sat, 16 Jan 2021 19:34:07 +0100 |
* guix/channels.scm (manifest-entry-channel): Export.
* guix/scripts/describe.scm (display-profile-content): Use it.
---
guix/channels.scm | 1 +
guix/scripts/describe.scm | 30 ++++++++++++------------------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 6449221c3f..743b4a25b7 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -91,6 +91,7 @@
ensure-forward-channel-update
profile-channels
+ manifest-entry-channel
channel-news-entry?
channel-news-entry-commit
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index c3667516eb..b7ec029ba8 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
@@ -237,23 +237,17 @@ way and displaying details about the channel's source
code."
(format #t " ~a ~a~%"
(manifest-entry-name entry)
(manifest-entry-version entry))
- (match (assq 'source (manifest-entry-properties entry))
- (('source ('repository ('version 0)
- ('url url)
- ('branch branch)
- ('commit commit)
- _ ...))
- (let ((channel (channel (name 'nameless)
- (url url)
- (branch branch)
- (commit commit))))
- (format #t (G_ " repository URL: ~a~%") url)
- (when branch
- (format #t (G_ " branch: ~a~%") branch))
- (format #t (G_ " commit: ~a~%")
- (if (supports-hyperlinks?)
- (channel-commit-hyperlink channel commit)
- commit))))
+ (match (manifest-entry-channel entry)
+ ((? channel? channel)
+ (format #t (G_ " repository URL: ~a~%")
+ (channel-url channel))
+ (when (channel-branch channel)
+ (format #t (G_ " branch: ~a~%")
+ (channel-branch channel)))
+ (format #t (G_ " commit: ~a~%")
+ (if (supports-hyperlinks?)
+ (channel-commit-hyperlink channel)
+ (channel-commit channel))))
(_ #f)))
;; Show most recently installed packages last.
--
2.30.0
- [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile, Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 8/8] guix package: Add '--export-channels'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel'.,
Ludovic Courtès <=
- [bug#45919] [PATCH 7/8] channels: Add 'channel->code'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile, Ludovic Courtès, 2021/01/27