diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /guix/cvs-download.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'guix/cvs-download.scm')
| -rw-r--r-- | guix/cvs-download.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/guix/cvs-download.scm b/guix/cvs-download.scm index 76b3eac739..943d971622 100644 --- a/guix/cvs-download.scm +++ b/guix/cvs-download.scm @@ -28,7 +28,8 @@ #:use-module (ice-9 match) #:export (cvs-reference cvs-reference? - cvs-reference-url + cvs-reference-root-directory + cvs-reference-module cvs-reference-revision cvs-fetch)) @@ -63,13 +64,20 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (define guile-zlib (module-ref (resolve-interface '(gnu packages guile)) 'guile-zlib)) + (define guile-json + (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) + + (define gnutls + (module-ref (resolve-interface '(gnu packages tls)) 'gnutls)) + (define modules (delete '(guix config) (source-module-closure '((guix build cvs) (guix build download-nar))))) (define build (with-imported-modules modules - (with-extensions (list guile-zlib) + (with-extensions (list guile-json gnutls ;for (guix swh) + guile-zlib) #~(begin (use-modules (guix build cvs) (guix build download-nar)) |