diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-03-11 19:43:29 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-03-16 18:37:01 +0000 |
| commit | b59f89cf18fbad9ee95521c4cadc6642c580feb8 (patch) | |
| tree | 5ee4ab9f443a4ab094f71298ec910e684e574e6b /guix/android-repo-download.scm | |
| parent | b68d4118e7233586ad1e5746b2ebc594977db1e3 (diff) | |
| download | guix-b59f89cf18fbad9ee95521c4cadc6642c580feb8.tar guix-b59f89cf18fbad9ee95521c4cadc6642c580feb8.tar.gz | |
guix: Improve download-nar.
Previously download-nar worked with gzipped nars and queried
berlin.guix.gnu.org (also known as ci.guix.gnu.org). ci.guix.gnu.org no longer
serves gzipped nars so this is of limited use.
This commit changes download-nar to query both the default substitute servers,
and queries for lzipped rather than gzipped nars, since those are available
from both.
* guix/build/download-nar.scm (urls-for-item): Return urls for lzip rather
than gzip compression, and from both default substitute servers. The comment
about CDN's is no longer relevant.
(restore-gzipped-nar): Rename to restore-lzipped-nar and reimplement
accordingly.
(download-nar): Add progress reporting and switch to use lzip rather than
gzip.
* guix/cvs-download.scm (cvs-fetch): Replace guile-zlib with guile-lzlib.
* guix/git-download.scm (git-fetch): Replace guile-zlib with guile-lzlib.
* guix/hg-download.scm (hg-fetch): Replace guile-zlib with guile-lzlib.
* guix/android-repo-download.scm (android-repo-fetch): Add guile-lzlib for
download-nar.
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'guix/android-repo-download.scm')
| -rw-r--r-- | guix/android-repo-download.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/android-repo-download.scm b/guix/android-repo-download.scm index e224cdd295..1d1b9e2f09 100644 --- a/guix/android-repo-download.scm +++ b/guix/android-repo-download.scm @@ -78,6 +78,9 @@ generic name if unset." (define guile-json (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) + (define guile-lzlib + (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib)) + (define gnutls (module-ref (resolve-interface '(gnu packages tls)) 'gnutls)) @@ -99,7 +102,8 @@ generic name if unset." (define build (with-imported-modules modules - (with-extensions (list gnutls guile-json) ;for (guix swh) + (with-extensions (list gnutls guile-json ;for (guix swh) + guile-lzlib) #~(begin (use-modules (guix build android-repo) (guix build utils) |