diff options
| -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 ad2442f50ee..916d663e9f2 100644 --- a/guix/channels.scm +++ b/guix/channels.scm | |||
| @@ -783,7 +783,8 @@ modules in the old ~/.config/guix/latest style." | |||
| 783 | ;; derivation that builds modules. We have to infer what the | 783 | ;; derivation that builds modules. We have to infer what the |
| 784 | ;; dependencies of these modules were. | 784 | ;; dependencies of these modules were. |
| 785 | (list guile-json-3 guile-git guile-bytestructures | 785 | (list guile-json-3 guile-git guile-bytestructures |
| 786 | (ssh -> guile-ssh) (tls -> gnutls))))) | 786 | (ssh -> guile-ssh) (tls -> gnutls)) |
| 787 | #:guile (default-guile)))) | ||
| 787 | 788 | ||
| 788 | (define (old-style-guix? drv) | 789 | (define (old-style-guix? drv) |
| 789 | "Return true if DRV corresponds to a ~/.config/guix/latest style of | 790 | "Return true if DRV corresponds to a ~/.config/guix/latest style of |
diff --git a/tests/channels.scm b/tests/channels.scm index ba8cfe639ef..1b6f640c4a5 100644 --- a/tests/channels.scm +++ b/tests/channels.scm | |||
| @@ -230,7 +230,6 @@ | |||
| 230 | #:current-channels (list new) | 230 | #:current-channels (list new) |
| 231 | #:validate-pull validate-pull))))))) | 231 | #:validate-pull validate-pull))))))) |
| 232 | 232 | ||
| 233 | (test-expect-fail 1) ;see: https://issues.guix.gnu.org/43940 | ||
| 234 | (test-assert "channel-instances->manifest" | 233 | (test-assert "channel-instances->manifest" |
| 235 | ;; Compute the manifest for a graph of instances and make sure we get a | 234 | ;; Compute the manifest for a graph of instances and make sure we get a |
| 236 | ;; derivation graph that mirrors the instance graph. This test also ensures | 235 | ;; derivation graph that mirrors the instance graph. This test also ensures |