diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-10-12 10:10:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-10-12 11:28:56 +0200 |
| commit | 6c46e477eb50c6ee7c9b7c8199bdfb3708dc32b5 (patch) | |
| tree | 770391451cbb51acfc72befe84d8dff7f7c08c93 | |
| parent | 8608d40b2aeae69a6054b8e053b0474a58932ee0 (diff) | |
| download | guix-6c46e477eb50c6ee7c9b7c8199bdfb3708dc32b5.tar.gz | |
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'.
| -rw-r--r-- | guix/channels.scm | 3 | ||||
| -rw-r--r-- | tests/channels.scm | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index ad2442f50e..916d663e9f 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -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 diff --git a/tests/channels.scm b/tests/channels.scm index ba8cfe639e..1b6f640c4a 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -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 |