diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-12 23:36:29 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-13 00:29:05 +0100 |
| commit | 9336e5b5e7b05e636b147aba2c97357620711c2a (patch) | |
| tree | e54a9d862b8b5693c464175f47358e069c73d81d /guix/derivations.scm | |
| parent | e387ab7c10b18427b97cd22526f1b135856a083e (diff) | |
| download | gnu-guix-9336e5b5e7b05e636b147aba2c97357620711c2a.tar gnu-guix-9336e5b5e7b05e636b147aba2c97357620711c2a.tar.gz | |
store: Make 'direct-store-path?' public.
* guix/store.scm (direct-store-path?): New procedure.
* guix/derivations.scm (derivation)[direct-store-path?]: Remove.
* tests/store.scm ("direct-store-path?"): New test.
Diffstat (limited to 'guix/derivations.scm')
| -rw-r--r-- | guix/derivations.scm | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index 011f4b778b..b33e835556 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -541,15 +541,6 @@ advance, such as a file download. When REFERENCES-GRAPHS is true, it must be a list of file name/store path pairs. In that case, the reference graph of each store path is exported in the build environment in the corresponding file, in a simple text format." - (define direct-store-path? - (let ((len (+ 1 (string-length (%store-prefix))))) - (lambda (p) - ;; Return #t if P is a store path, and not a sub-directory of a - ;; store path. This predicate is needed because files *under* a - ;; store path are not valid inputs. - (and (store-path? p) - (not (string-index (substring p len) #\/)))))) - (define (add-output-paths drv) ;; Return DRV with an actual store path for each of its output and the ;; corresponding environment variable. |