02/07: packages: Add 'file-type' field to 'search-path-specification'.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit af07095516b56dcdd38bf1874da27de9c4c841f6
Author: Ludovic Courtès <address@hidden>
Date:   Sat Dec 27 23:22:08 2014 +0100

    packages: Add 'file-type' field to 'search-path-specification'.
    
    Fixes <http://bugs.gnu.org/18033>.
    
    * guix/packages.scm (<search-path-specification>): Rename 'directories'
      field to 'files'.  Add 'file-type'.
      (search-path-specification->sexp): Honor 'file-type'.
    * gnu/packages/autotools.scm, gnu/packages/bootstrap.scm,
      gnu/packages/cross-base.scm, gnu/packages/games.scm,
      gnu/packages/gcc.scm, gnu/packages/glib.scm,
      gnu/packages/guile.scm, gnu/packages/man.scm,
      gnu/packages/perl.scm, gnu/packages/pkg-config.scm,
      gnu/packages/python.scm, gnu/packages/ruby.scm,
      gnu/packages/xfce.scm: Change 'directories' to 'files'.
    * tests/packages.scm ("search paths"): Change 'directories' field to
      'files'.
    * guix/scripts/environment.scm (for-each-search-path): Likewise.
---
 gnu/packages/autotools.scm   |    2 +-
 gnu/packages/bootstrap.scm   |    4 ++--
 gnu/packages/cross-base.scm  |    4 ++--
 gnu/packages/games.scm       |    2 +-
 gnu/packages/gcc.scm         |    4 ++--
 gnu/packages/glib.scm        |    4 ++--
 gnu/packages/guile.scm       |    6 +++---
 gnu/packages/man.scm         |    2 +-
 gnu/packages/perl.scm        |    2 +-
 gnu/packages/pkg-config.scm  |    3 +--
 gnu/packages/python.scm      |    4 ++--
 gnu/packages/ruby.scm        |    7 +++----
 gnu/packages/xfce.scm        |    2 +-
 guix/packages.scm            |   10 +++++-----
 guix/scripts/environment.scm |    3 +--
 tests/packages.scm           |    4 ++--
 16 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 0094577..a3afcdc 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -178,7 +178,7 @@ exec ~a --no-auto-compile \"$0\" \"address@hidden"
     (native-search-paths
      (list (search-path-specification
             (variable "ACLOCAL_PATH")
-            (directories '("share/aclocal")))))
+            (files '("share/aclocal")))))
     (arguments
      '(#:modules ((guix build gnu-build-system)
                   (guix build utils)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 854d97b..5a19783 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -409,10 +409,10 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
     (native-search-paths
      (list (search-path-specification
             (variable "CPATH")
-            (directories '("include")))
+            (files '("include")))
            (search-path-specification
             (variable "LIBRARY_PATH")
-            (directories '("lib" "lib64")))))
+            (files '("lib" "lib64")))))
     (synopsis "Bootstrap binaries of the GNU Compiler Collection")
     (description #f)
     (home-page #f)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 74809d0..0f32c9f 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -234,10 +234,10 @@ GCC that does not target a libc; otherwise, target that 
libc."
     (search-paths
      (list (search-path-specification
             (variable "CROSS_CPATH")
-            (directories '("include")))
+            (files '("include")))
            (search-path-specification
             (variable "CROSS_LIBRARY_PATH")
-            (directories '("lib" "lib64")))))
+            (files '("lib" "lib64")))))
     (native-search-paths '())))
 
 (define* (cross-libc target
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index db878b0..99a4a78 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -706,7 +706,7 @@ for common mesh file formats, and collision detection.")
     (native-search-paths
      (list (search-path-specification
             (variable "MINETEST_SUBGAME_PATH")
-            (directories '("share/minetest/games")))))
+            (files '("share/minetest/games")))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 4b715f4..e795f97 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -245,10 +245,10 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
       (native-search-paths
        (list (search-path-specification
               (variable "CPATH")
-              (directories '("include")))
+              (files '("include")))
              (search-path-specification
               (variable "LIBRARY_PATH")
-              (directories '("lib" "lib64")))))
+              (files '("lib" "lib64")))))
 
       (properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
       (synopsis "GNU Compiler Collection")
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 486cdb6..93b465b 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -183,7 +183,7 @@ shared NFS home directories.")
     ;; by 'glib-compile-schemas'.
     (list (search-path-specification
            (variable "XDG_DATA_DIRS")
-           (directories '("share")))))
+           (files '("share")))))
    (search-paths native-search-paths)
 
    (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
@@ -225,7 +225,7 @@ dynamic loading, and an object system.")
     (native-search-paths
      (list (search-path-specification
             (variable "GI_TYPELIB_PATH")
-            (directories '("lib/girepository-1.0")))))
+            (files '("lib/girepository-1.0")))))
     (search-paths native-search-paths)
     (arguments
      `(#:phases
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6a76baf..7e3b5f8 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -95,7 +95,7 @@
    (native-search-paths
     (list (search-path-specification
            (variable "GUILE_LOAD_PATH")
-           (directories '("share/guile/site")))))
+           (files '("share/guile/site")))))
 
    (synopsis "Scheme implementation intended especially for extensions")
    (description
@@ -155,10 +155,10 @@ without requiring the source code to be rewritten.")
    (native-search-paths
     (list (search-path-specification
            (variable "GUILE_LOAD_PATH")
-           (directories '("share/guile/site/2.0")))
+           (files '("share/guile/site/2.0")))
           (search-path-specification
            (variable "GUILE_LOAD_COMPILED_PATH")
-           (directories '("share/guile/site/2.0")))))
+           (files '("share/guile/site/2.0")))))
 
    (synopsis "Scheme implementation intended especially for extensions")
    (description
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 028403c..712622a 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -105,7 +105,7 @@ a flexible and convenient way.")
     (native-search-paths
      (list (search-path-specification
             (variable "MANPATH")
-            (directories '("share/man")))))
+            (files '("share/man")))))
     (home-page "http://man-db.nongnu.org/";)
     (synopsis "Standard Unix documentation system")
     (description
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 03cad3e..699fe75 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -66,7 +66,7 @@
         %standard-phases)))
     (native-search-paths (list (search-path-specification
                                 (variable "PERL5LIB")
-                                (directories '("lib/perl5/site_perl")))))
+                                (files '("lib/perl5/site_perl")))))
     (synopsis "Implementation of the Perl programming language")
     (description
      "Perl 5 is a highly capable, feature-rich programming language with over
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index dc4905a..dd5120c 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -44,8 +44,7 @@
    (native-search-paths
     (list (search-path-specification
            (variable "PKG_CONFIG_PATH")
-           (directories '("lib/pkgconfig" "lib64/pkgconfig"
-                          "share/pkgconfig")))))
+           (files '("lib/pkgconfig" "lib64/pkgconfig" "share/pkgconfig")))))
    (home-page "http://www.freedesktop.org/wiki/Software/pkg-config";)
    (license gpl2+)
    (synopsis "Helper tool used when compiling applications and libraries")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index adb84fc..90e1f89 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -198,7 +198,7 @@
     (native-search-paths
      (list (search-path-specification
             (variable "PYTHONPATH")
-            (directories '("lib/python2.7/site-packages")))))
+            (files '("lib/python2.7/site-packages")))))
     (home-page "http://python.org";)
     (synopsis
      "High-level, dynamically-typed programming language")
@@ -237,7 +237,7 @@ data types.")
     (native-search-paths
      (list (search-path-specification
             (variable "PYTHONPATH")
-            (directories '("lib/python3.3/site-packages")))))))
+            (files '("lib/python3.3/site-packages")))))))
 
 (define-public python-wrapper
   (package (inherit python)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 4b6665c..f8276db 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -77,10 +77,9 @@
     (native-search-paths
      (list (search-path-specification
             (variable "GEM_PATH")
-            (directories
-             (list (string-append "lib/ruby/gems/"
-                                  (version-major+minor version)
-                                  ".0"))))))
+            (files (list (string-append "lib/ruby/gems/"
+                                        (version-major+minor version)
+                                        ".0"))))))
     (synopsis "Programming language interpreter")
     (description "Ruby is a dynamic object-oriented programming language with
 a focus on simplicity and productivity.")
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2b15c3e..17b2b4d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -267,7 +267,7 @@ management D-Bus specification.")
     (native-search-paths
      (list (search-path-specification
             (variable "X_XFCE4_LIB_DIRS")
-            (directories '("lib/xfce4")))))
+            (files '("lib/xfce4")))))
     (home-page "http://www.xfce.org/";)
     (synopsis "Xfce desktop panel")
     (description
diff --git a/guix/packages.scm b/guix/packages.scm
index ed9a565..b375895 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -172,16 +172,16 @@ representation."
   search-path-specification make-search-path-specification
   search-path-specification?
   (variable     search-path-specification-variable)
-  (directories  search-path-specification-directories)
-  (separator    search-path-specification-separator (default ":")))
+  (files        search-path-specification-files)
+  (separator    search-path-specification-separator (default ":"))
+  (file-type    search-path-specification-file-type (default 'directory)))
 
 (define (search-path-specification->sexp spec)
   "Return an sexp representing SPEC, a <search-path-specification>.  The sexp
 corresponds to the arguments expected by `set-path-environment-variable'."
   (match spec
-    (($ <search-path-specification> variable directories separator)
-     ;; TODO: Allow other values of TYPE.  See <http://bugs.gnu.org/18033>.
-     `(,variable ,directories ,separator directory))))
+    (($ <search-path-specification> variable files separator type)
+     `(,variable ,files ,separator ,type))))
 
 (define %supported-systems
   ;; This is the list of system types that are supported.  By default, we
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index c388b0c..412b8be 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -54,8 +54,7 @@ path value is appended."
                             value)))))
               (cons* (search-path-specification
                       (variable "PATH")
-                      (directories '("bin" "sbin"))
-                      (separator ":"))
+                      (files '("bin" "sbin")))
                      (delete-duplicates
                       (append-map package-native-search-paths inputs))))))
 
diff --git a/tests/packages.scm b/tests/packages.scm
index 98fa9b5..b2f09c6 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -335,10 +335,10 @@
                            search-paths)))))))
          (x (list (search-path-specification
                    (variable "GUILE_LOAD_PATH")
-                   (directories '("share/guile/site/2.0")))
+                   (files '("share/guile/site/2.0")))
                   (search-path-specification
                    (variable "GUILE_LOAD_COMPILED_PATH")
-                   (directories '("share/guile/site/2.0")))))
+                   (files '("share/guile/site/2.0")))))
          (a (package (inherit (dummy-package "guile"))
               (build-system s)
               (native-search-paths x)))