From 90c090fbf3da162e94e5467de897aa5cf1eb8c4c Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 30 Aug 2021 17:03:03 +0200 Subject: [PATCH 2/3] Remove conflicting SRFI-71 imports. Don't import both (guix packages) and (srfi srfi-71), as the let and let* bindings of one will replace the ones of the other. * guix/import/crate.scm: Don't import (srfi srfi-71). * guix/import/egg.scm: Likewise. * guix/import/utils.scm: Likewise. * guix/scripts/pull.scm: Likewise. * tests/packages.scm: Likewise. --- guix/import/crate.scm | 1 - guix/import/egg.scm | 1 - guix/import/utils.scm | 1 - guix/scripts/pull.scm | 1 - tests/packages.scm | 1 - 5 files changed, 5 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 287ffd2536..eb2fa1e1c4 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -40,7 +40,6 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-71) #:export (crate->guix-package guix-package->crate-name string->license diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 107894ddcf..a7535be8a6 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -21,7 +21,6 @@ #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-71) #:use-module (gcrypt hash) #:use-module (guix git) #:use-module (guix i18n) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index d1b8076ddd..e433449d18 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -47,7 +47,6 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-71) #:export (factorize-uri flatten diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index fb8ce50fa7..f81df47a0e 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -55,7 +55,6 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) - #:use-module (srfi srfi-71) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (ice-9 format) diff --git a/tests/packages.scm b/tests/packages.scm index 50fb3d0718..5ff71b7af1 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -57,7 +57,6 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-64) - #:use-module (srfi srfi-71) #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (ice-9 vlist) -- 2.33.0