me
/
guix
Archived
1
0
Fork 0
Code

channels: Address test failure. 

Fixes <https://bugs.gnu.org/43940>.
Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>.

The "channel-instances->manifest" test would fail since
1d4ab335b22a93e01c2eb1eb3e93fc6534157040: 'quiet-guile' would be passed #f
as GUILE, and thus 'package-version' would fail with wrong-type-arg.

* guix/channels.scm (whole-package-for-legacy): Pass #:guile to
'whole-package'.
* tests/channels.scm ("channel-instances->manifest"): Remove 'test-expect-fail'.
master
Ludovic Courtès 2020-10-12 10:10:03 +02:00
parent 8608d40b2a
commit 6c46e477eb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/channels.scm
View File

@ -783,7 +783,8 @@ modules in the old ~/.config/guix/latest style."
;; derivation that builds modules. We have to infer what the
;; dependencies of these modules were.
(list guile-json-3 guile-git guile-bytestructures
(ssh -> guile-ssh) (tls -> gnutls)))))
(ssh -> guile-ssh) (tls -> gnutls))
#:guile (default-guile))))
(define (old-style-guix? drv)
"Return true if DRV corresponds to a ~/.config/guix/latest style of

1
tests/channels.scm
View File

@ -230,7 +230,6 @@
#:current-channels (list new)
#:validate-pull validate-pull)))))))
(test-expect-fail 1) ;see: https://issues.guix.gnu.org/43940
(test-assert "channel-instances->manifest"
;; Compute the manifest for a graph of instances and make sure we get a
;; derivation graph that mirrors the instance graph. This test also ensures