me
/
guix
Archived
1
0
Fork 0
Code

channels: Remove unneeded 'version' field of <channel-metadata>. 

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.
master
Ludovic Courtès 2019-07-17 00:24:56 +02:00
parent 45b903323e
commit 5d9daa85b0
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/channels.scm
View File

@ -108,9 +108,8 @@
(checkout channel-instance-checkout)) (checkout channel-instance-checkout))
(define-record-type <channel-metadata> (define-record-type <channel-metadata>
(channel-metadata version directory dependencies) (channel-metadata directory dependencies)
channel-metadata? channel-metadata?
(version channel-metadata-version)
(directory channel-metadata-directory) (directory channel-metadata-directory)
(dependencies channel-metadata-dependencies)) (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)) (let ((directory (and=> (assoc-ref properties 'directory) first))
(dependencies (or (assoc-ref properties 'dependencies) '()))) (dependencies (or (assoc-ref properties 'dependencies) '())))
(channel-metadata (channel-metadata
version
directory directory
(map (lambda (item) (map (lambda (item)
(let ((get (lambda* (key #:optional default) (let ((get (lambda* (key #:optional default)
@ -180,7 +178,7 @@ file."
channel INSTANCE." channel INSTANCE."
(match (channel-instance-metadata instance) (match (channel-instance-metadata instance)
(#f '()) (#f '())
(($ <channel-metadata> version directory dependencies) (($ <channel-metadata> directory dependencies)
dependencies))) dependencies)))
(define* (latest-channel-instances store channels #:optional (previous-channels '())) (define* (latest-channel-instances store channels #:optional (previous-channels '()))