maint: Require Guile 3.0.

* configure.ac: Require Guile 3.0.
* doc/guix.texi (Requirements): Adjust accordingly.
* gnu/packages/package-management.scm (guile2.2-guix): Remove.
* guix/lint.scm (exception-with-kind-and-args?): Remove 'cond-expand'.
* guix/scripts/deploy.scm (deploy-machine*): Likewise.
* guix/store.scm (call-with-store): Likewise.
* guix/swh.scm (http-get*, http-post*): Likewise.
* guix/ui.scm (without-compiler-optimizations, guard*)
(call-with-error-handling): Likewise.
This commit is contained in:
Ludovic Courtès 2021-05-26 22:30:31 +02:00
parent 49b15701ad
commit 82d8ab01f5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
8 changed files with 32 additions and 109 deletions

View file

@ -148,20 +148,12 @@
url
(string-append url "/")))
(cond-expand
(guile-3
;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would
;; be ignored (<https://bugs.gnu.org/40486>).
(define* (http-get* uri #:rest rest)
(apply http-request uri #:method 'GET rest))
(define* (http-post* uri #:rest rest)
(apply http-request uri #:method 'POST rest)))
(else ;Guile 2.2
;; Guile 2.2 did not have #:verify-certificate? so ignore it.
(define* (http-get* uri #:key verify-certificate? streaming?)
(http-request uri #:method 'GET #:streaming? streaming?))
(define* (http-post* uri #:key verify-certificate? streaming?)
(http-request uri #:method 'POST #:streaming? streaming?))))
;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would
;; be ignored (<https://bugs.gnu.org/40486>).
(define* (http-get* uri #:rest rest)
(apply http-request uri #:method 'GET rest))
(define* (http-post* uri #:rest rest)
(apply http-request uri #:method 'POST rest))
(define %date-regexp
;; Match strings like "2014-11-17T22:09:38+01:00" or