aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-11-06 18:05:09 +0100
committerLudovic Courtès <ludo@gnu.org>2017-11-07 00:12:10 +0100
commit0ad5f8098292a3ed759b249acd48dc7107086c12 (patch)
tree02f9783f885d88e6d09378c9381db1cf1523acae
parent913027f3831eb21f07de287397bc7857ceadb7b9 (diff)
downloadguix-0ad5f8098292a3ed759b249acd48dc7107086c12.tar.gz
guix-0ad5f8098292a3ed759b249acd48dc7107086c12.zip
Fix ambiguous imports.
* gnu/packages/ocaml.scm: Hide 'zip' from (srfi srfi-1). * guix/git.scm: Select 'mkdir-p' from (guix build utils).
-rw-r--r--gnu/packages/ocaml.scm2
-rw-r--r--guix/git.scm2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5b2536ae67..fbcb1def4d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -65,7 +65,7 @@
#:use-module (guix packages)
#:use-module (guix svn-download)
#:use-module (guix utils)
- #:use-module (srfi srfi-1))
+ #:use-module ((srfi srfi-1) #:hide (zip)))
;; A shortcut for files from ocaml forge. Downloaded files are computed from
;; their number, not their name.
diff --git a/guix/git.scm b/guix/git.scm
index 406c817341..e73f4b9855 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -21,7 +21,7 @@
#:use-module (git object)
#:use-module (guix base32)
#:use-module (guix hash)
- #:use-module (guix build utils)
+ #:use-module ((guix build utils) #:select (mkdir-p))
#:use-module (guix store)
#:use-module (guix utils)
#:use-module (rnrs bytevectors)