search-paths: Add 'evaluate-search-paths', from (guix scripts package).

* guix/scripts/package.scm (with-null-error-port,
  evaluate-search-paths): Move to...
* guix/search-paths.scm: ... here.
* guix/utils.scm (string-tokenize*): Move to...
* guix/search-paths.scm: ... here.
* tests/utils.scm ("string-tokenize*"): Adjust accordingly.

1 files changed, 6 insertions, 5 deletions

diff --git a/tests/utils.scm b/tests/utils.scm
index a662c9a8d38..e03a07b2f58 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -82,10 +82,11 @@
     ("foo" "bar" "baz")
     ("foo" "bar" "")
     ("foo" "bar" "baz"))
-  (list (string-tokenize* "foo" ":")
-        (string-tokenize* "foo;bar;baz" ";")
-        (string-tokenize* "foo!bar!" "!")
-        (string-tokenize* "foo+-+bar+-+baz" "+-+")))
+  (let ((string-tokenize* (@@ (guix search-paths) string-tokenize*)))
+    (list (string-tokenize* "foo" ":")
+          (string-tokenize* "foo;bar;baz" ";")
+          (string-tokenize* "foo!bar!" "!")
+          (string-tokenize* "foo+-+bar+-+baz" "+-+"))))
 
 (test-equal "string-replace-substring"
   '("foo BAR! baz"