[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36699] [PATCH 2/4] channels: Remove unneeded 'version' field of <ch
From: |
Ludovic Courtès |
Subject: |
[bug#36699] [PATCH 2/4] channels: Remove unneeded 'version' field of <channel-metadata>. |
Date: |
Wed, 17 Jul 2019 01:24:31 +0200 |
The idea is that 'read-channel-metadata' will take care of converting
possibly older versions to the current data type. Thus, storing the
version number is unnecessary.
* guix/channels.scm (<channel-metadata>)[version]: Remove.
(read-channel-metadata, channel-instance-dependencies): Adjust
accordingly.
---
guix/channels.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index e92148abf2..87ad729a70 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -108,9 +108,8 @@
(checkout channel-instance-checkout))
(define-record-type <channel-metadata>
- (channel-metadata version directory dependencies)
+ (channel-metadata directory dependencies)
channel-metadata?
- (version channel-metadata-version)
(directory channel-metadata-directory)
(dependencies channel-metadata-dependencies))
@@ -130,7 +129,6 @@ if valid metadata could not be read from PORT."
(let ((directory (and=> (assoc-ref properties 'directory) first))
(dependencies (or (assoc-ref properties 'dependencies) '())))
(channel-metadata
- version
directory
(map (lambda (item)
(let ((get (lambda* (key #:optional default)
@@ -180,7 +178,7 @@ file."
channel INSTANCE."
(match (channel-instance-metadata instance)
(#f '())
- (($ <channel-metadata> version directory dependencies)
+ (($ <channel-metadata> directory dependencies)
dependencies)))
(define* (latest-channel-instances store channels #:optional
(previous-channels '()))
--
2.22.0
bug#36699: [PATCH 0/4] Strengthen '.guix-channel' file handling, Ludovic Courtès, 2019/07/19