diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-05-26 22:30:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-06-01 23:26:07 +0200 |
| commit | 82d8ab01f5cb6d479e3b82c08067e2442ee7cad8 (patch) | |
| tree | ff54647ca08ed54f418a9ebdaaae721ad3baf1c1 /guix/lint.scm | |
| parent | 49b15701adb758f89bdf4f36f3220851d744c817 (diff) | |
| download | guix-82d8ab01f5cb6d479e3b82c08067e2442ee7cad8.tar guix-82d8ab01f5cb6d479e3b82c08067e2442ee7cad8.tar.gz | |
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.
Diffstat (limited to 'guix/lint.scm')
| -rw-r--r-- | guix/lint.scm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/guix/lint.scm b/guix/lint.scm index a2d6418b85..023a179ea6 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1003,14 +1003,9 @@ descriptions maintained upstream." (origin-uris origin)) '()))) -(cond-expand - (guile-3 - ;; Guile 3.0.0 does not export this predicate. - (define exception-with-kind-and-args? - (exception-predicate &exception-with-kind-and-args))) - (else ;Guile 2 - (define exception-with-kind-and-args? - (const #f)))) +;; Guile 3.0.0 does not export this predicate. +(define exception-with-kind-and-args? + (exception-predicate &exception-with-kind-and-args)) (define* (check-derivation package #:key store) "Emit a warning if we fail to compile PACKAGE to a derivation." |