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/store.scm | |
parent | 49b15701adb758f89bdf4f36f3220851d744c817 (diff) | |
download | guix-patches-82d8ab01f5cb6d479e3b82c08067e2442ee7cad8.tar guix-patches-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/store.scm')
-rw-r--r-- | guix/store.scm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/guix/store.scm b/guix/store.scm index 9d706ae590..cf5d5eeccc 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -648,18 +648,10 @@ connection. Use with care." (close-connection store) (apply values results))))) - (cond-expand - (guile-3 - (with-exception-handler (lambda (exception) - (close-connection store) - (raise-exception exception)) - thunk)) - (else ;Guile 2.2 - (catch #t - thunk - (lambda (key . args) - (close-connection store) - (apply throw key args))))))) + (with-exception-handler (lambda (exception) + (close-connection store) + (raise-exception exception)) + thunk))) (define-syntax-rule (with-store store exp ...) "Bind STORE to an open connection to the store and evaluate EXPs; |