Merge branch 'master' into core-updates

7 files changed, 36 insertions, 27 deletions

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 3582f0e328..578c4446a4 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -29,7 +29,8 @@
   #:use-module (guix build-system gnu)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
-  #:export (cargo-build-system
+  #:export (%cargo-build-system-modules
+            cargo-build-system
             crate-url
             crate-url?
             crate-uri))
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 3f280b0ac0..dd07986b94 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -137,11 +137,15 @@
       ;; (given with `package_dir`). This will by copied to the output, too,
       ;; so we need to remove.
       (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
-        (call-setuppy test-target '() use-setuptools?)
-        (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
-               (inter (lset-difference eqv? after before)))
-          (for-each delete-file-recursively inter)))
-    #t))
+        (if (call-setuppy test-target '() use-setuptools?)
+            (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
+                   (inter (lset-difference eqv? after before)))
+              (for-each delete-file-recursively inter)
+              #t)
+            #f))
+      (begin
+        (format #t "test suite not run~%")
+        #t)))
 
 (define (get-python-version python)
   (let* ((version     (last (string-split python #\-)))
diff --git a/guix/download.scm b/guix/download.scm
index 813f51f489..dda18ff04d 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -103,8 +103,8 @@
        "http://mirror.csclub.uwaterloo.ca/nongnu/"
        "http://nongnu.askapache.com/"
        "http://savannah.c3sl.ufpr.br/"
-       "http://www.centervenus.com/mirrors/nongnu/"
-       "http://download.savannah.gnu.org/releases-noredirect/")
+       "http://download.savannah.gnu.org/releases-noredirect/"
+       "http://download-mirror.savannah.gnu.org/releases/")
       (sourceforge ; https://sourceforge.net/p/forge/documentation/Mirrors/
        "http://downloads.sourceforge.net/project/"
        "http://ufpr.dl.sourceforge.net/project/"
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 1f7fbef0a0..d11ed177fe 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -68,6 +68,9 @@
             file-append-base
             file-append-suffix
 
+            load-path-expression
+            gexp-modules
+
             gexp->derivation
             gexp->file
             gexp->script
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 9e49c53635..cad279fb50 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -268,7 +268,7 @@ resulting archive to the standard output port."
               (let ((system (assoc-ref opts 'system)))
                 (format #t "~a\n"
                         (build-docker-image file #:system system))))
-             (_
+             (x
               ;; TODO: Remove this restriction.
               (leave (_ "only a single item can be exported to Docker~%")))))
           (format
diff --git a/guix/ui.scm b/guix/ui.scm
index 6247944068..3a0a6501d1 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -635,16 +635,17 @@ report what is prerequisites are available for download."
 (define (right-arrow port)
   "Return either a string containing the 'RIGHT ARROW' character, or an ASCII
 replacement if PORT is not Unicode-capable."
-  (with-fluids ((%default-port-encoding (port-encoding port)))
-    (let ((arrow "→"))
-      (catch 'encoding-error
-        (lambda ()
-          (call-with-output-string
-            (lambda (port)
-              (set-port-conversion-strategy! port 'error)
-              (display arrow port))))
-        (lambda (key . args)
-          "->")))))
+  (let ((encoding (port-encoding port))
+        (arrow "→"))
+    (catch 'encoding-error
+      (lambda ()
+        (call-with-output-string
+          (lambda (port)
+            (set-port-encoding! port encoding)
+            (set-port-conversion-strategy! port 'error)
+            (display arrow port))))
+      (lambda (key . args)
+        "->"))))
 
 (define* (show-manifest-transaction store manifest transaction
                                     #:key dry-run?)
@@ -687,7 +688,7 @@ replacement if PORT is not Unicode-capable."
                          "The following packages will be removed:~%~{~a~%~}~%"
                          len)
                      remove))))
-      (_ #f))
+      (x #f))
     (match downgrade
       (((($ <manifest-entry> name old-version)
          . ($ <manifest-entry> _ new-version output item)) ..1)
@@ -705,7 +706,7 @@ replacement if PORT is not Unicode-capable."
                          "The following packages will be downgraded:~%~{~a~%~}~%"
                          len)
                      downgrade))))
-      (_ #f))
+      (x #f))
     (match upgrade
       (((($ <manifest-entry> name old-version)
          . ($ <manifest-entry> _ new-version output item)) ..1)
@@ -723,7 +724,7 @@ replacement if PORT is not Unicode-capable."
                          "The following packages will be upgraded:~%~{~a~%~}~%"
                          len)
                      upgrade))))
-      (_ #f))
+      (x #f))
     (match install
       ((($ <manifest-entry> name version output item _) ..1)
        (let ((len     (length name))
@@ -739,7 +740,7 @@ replacement if PORT is not Unicode-capable."
                          "The following packages will be installed:~%~{~a~%~}~%"
                          len)
                      install))))
-      (_ #f))))
+      (x #f))))
 
 (define-syntax with-error-handling
   (syntax-rules ()
@@ -820,7 +821,7 @@ converted to a space; sequences of more than one line break are preserved."
   (match (string-fold maybe-break
                       `(,column 0 ())
                       str)
-    ((_ _ chars)
+    ((column newlines chars)
      (list->string (reverse chars)))))
 
 
@@ -1024,7 +1025,7 @@ DURATION-RELATION with the current time."
        (valid-generations (iota n 1)))
       ((lst ..1)
        (valid-generations lst))
-      (_ #f)))
+      (x #f)))
 
   (define (filter-by-duration duration)
     (define (time-at-midnight time)
diff --git a/guix/utils.scm b/guix/utils.scm
index 72dc0687a4..b72e3f233f 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -43,7 +43,7 @@
   #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
   #:use-module (ice-9 format)
-  #:use-module ((ice-9 iconv) #:select (bytevector->string))
+  #:use-module ((ice-9 iconv) #:prefix iconv:)
   #:use-module (system foreign)
   #:re-export (memoize)         ; for backwards compatibility
   #:export (bytevector->base16-string
@@ -326,7 +326,7 @@ This procedure returns #t on success."
       (seek in 0 SEEK_SET) ; read from the beginning of the file.
       (let* ((pre-bv  (get-bytevector-n in start))
              ;; The expression in string form.
-             (str     (bytevector->string
+             (str     (iconv:bytevector->string
                        (get-bytevector-n in (- end start))
                        (port-encoding in)))
              (post-bv (get-bytevector-all in))