05/07: packages: Refer to the native tools when handling sources and downloads.

[Ludovic Courtès]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit 3c528f13ef9f9e06d99242d6ba7efe0c61ac0033
Author: Ludovic Courtès <address@hidden>
Date:   Sat Mar 28 17:56:27 2015 +0100

    packages: Refer to the native tools when handling sources and downloads.
    
    * guix/packages.scm (patch-and-repack)[build]: Change most #$ to #+.
    * guix/cvs-download.scm (cvs-fetch)[build]: Likewise.
    * guix/download.scm (url-fetch)[builder]: Likewise.
    * guix/git-download.scm (git-fetch)[build]: Likewise.
    * guix/svn-download.scm (svn-fetch)[build]: Likewise.
---
 guix/cvs-download.scm |    2 +-
 guix/download.scm     |    4 ++--
 guix/git-download.scm |    4 ++--
 guix/packages.scm     |   36 ++++++++++++++++++------------------
 guix/svn-download.scm |    2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/guix/cvs-download.scm b/guix/cvs-download.scm
index 8a0d479..72478dd 100644
--- a/guix/cvs-download.scm
+++ b/guix/cvs-download.scm
@@ -66,7 +66,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
                    '#$(cvs-reference-module ref)
                    '#$(cvs-reference-revision ref)
                    #$output
-                   #:cvs-command (string-append #$cvs "/bin/cvs"))))
+                   #:cvs-command (string-append #+cvs "/bin/cvs"))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "cvs-checkout") build
diff --git a/guix/download.scm b/guix/download.scm
index d87d02e..3e4024f 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -241,12 +241,12 @@ in the store."
 
   (define builder
     #~(begin
-        #$(if need-gnutls?
+        #+(if need-gnutls?
 
               ;; Add GnuTLS to the inputs and to the load path.
               #~(eval-when (load expand eval)
                   (set! %load-path
-                        (cons (string-append #$(gnutls-package)
+                        (cons (string-append #+(gnutls-package)
                                              "/share/guile/site/"
                                              (effective-version))
                               %load-path)))
diff --git a/guix/git-download.scm b/guix/git-download.scm
index 94a1245..f4b48d7 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -76,7 +76,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
         ;; The 'git submodule' commands expects Coreutils, sed,
         ;; grep, etc. to be in $PATH.
         (set-path-environment-variable "PATH" '("bin")
-                                       (match '#$inputs
+                                       (match '#+inputs
                                          (((names dirs) ...)
                                           dirs)))
 
@@ -84,7 +84,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
                    '#$(git-reference-commit ref)
                    #$output
                    #:recursive? '#$(git-reference-recursive? ref)
-                   #:git-command (string-append #$git "/bin/git"))))
+                   #:git-command (string-append #+git "/bin/git"))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "git-checkout") build
diff --git a/guix/packages.scm b/guix/packages.scm
index 99fbd24..af84310 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -435,8 +435,8 @@ IMPORTED-MODULES specify modules to use/import for use by 
SNIPPET."
 
             ;; Use '--force' so that patches that do not apply perfectly are
             ;; rejected.
-            (zero? (system* (string-append #$patch "/bin/patch")
-                            "--force" address@hidden "--input" patch)))
+            (zero? (system* (string-append #+patch "/bin/patch")
+                            "--force" address@hidden "--input" patch)))
 
           (define (first-file directory)
             ;; Return the name of the first file in DIRECTORY.
@@ -447,49 +447,49 @@ IMPORTED-MODULES specify modules to use/import for use by 
SNIPPET."
           ;; Encoding/decoding errors shouldn't be silent.
           (fluid-set! %default-port-conversion-strategy 'error)
 
-          (when #$locales
+          (when #+locales
             ;; First of all, install a UTF-8 locale so that UTF-8 file names
             ;; are correctly interpreted.  During bootstrap, LOCALES is #f.
-            (setenv "LOCPATH" (string-append #$locales "/lib/locale"))
+            (setenv "LOCPATH" (string-append #+locales "/lib/locale"))
             (setlocale LC_ALL "en_US.UTF-8"))
 
-          (setenv "PATH" (string-append #$xz "/bin" ":"
-                                        #$decomp "/bin"))
+          (setenv "PATH" (string-append #+xz "/bin" ":"
+                                        #+decomp "/bin"))
 
           ;; SOURCE may be either a directory or a tarball.
-          (and (if (file-is-directory? #$source)
+          (and (if (file-is-directory? #+source)
                    (let* ((store     (or (getenv "NIX_STORE") "/gnu/store"))
                           (len       (+ 1 (string-length store)))
-                          (base      (string-drop #$source len))
+                          (base      (string-drop #+source len))
                           (dash      (string-index base #\-))
                           (directory (string-drop base (+ 1 dash))))
                      (mkdir directory)
-                     (copy-recursively #$source directory)
+                     (copy-recursively #+source directory)
                      #t)
-                   #$(if (string=? decompression-type "unzip")
-                         #~(zero? (system* "unzip" #$source))
-                         #~(zero? (system* (string-append #$tar "/bin/tar")
-                                           "xvf" #$source))))
+                   #+(if (string=? decompression-type "unzip")
+                         #~(zero? (system* "unzip" #+source))
+                         #~(zero? (system* (string-append #+tar "/bin/tar")
+                                           "xvf" #+source))))
                (let ((directory (first-file ".")))
                  (format (current-error-port)
                          "source is under '~a'~%" directory)
                  (chdir directory)
 
-                 (and (every apply-patch '#$patches)
-                      #$@(if snippet
+                 (and (every apply-patch '#+patches)
+                      #+@(if snippet
                              #~((let ((module (make-fresh-user-module)))
                                   (module-use-interfaces! module
                                                           (map 
resolve-interface
-                                                               '#$modules))
+                                                               '#+modules))
                                   ((@ (system base compile) compile)
-                                   '#$snippet
+                                   '#+snippet
                                    #:to 'value
                                    #:opts %auto-compilation-options
                                    #:env module)))
                              #~())
 
                       (begin (chdir "..") #t)
-                      (zero? (system* (string-append #$tar "/bin/tar")
+                      (zero? (system* (string-append #+tar "/bin/tar")
                                       "cvfa" #$output directory)))))))
 
     (let ((name    (tarxz-name original-file-name))
diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 92b03d1..d6853ca 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -62,7 +62,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
         (svn-fetch '#$(svn-reference-url ref)
                    '#$(svn-reference-revision ref)
                    #$output
-                   #:svn-command (string-append #$svn "/bin/svn"))))
+                   #:svn-command (string-append #+svn "/bin/svn"))))
 
   (mlet %store-monad ((guile (package->derivation guile system)))
     (gexp->derivation (or name "svn-checkout") build