[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: packages: Add 'file-pattern' field to 'search-path-specification'
From: |
Ludovic Courtès |
Subject: |
04/07: packages: Add 'file-pattern' field to 'search-path-specification'. |
Date: |
Sat, 27 Dec 2014 22:54:54 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 7b21fe538512b452c87389607f569668a7f1a1a4
Author: Ludovic Courtès <address@hidden>
Date: Sat Dec 27 23:15:11 2014 +0100
packages: Add 'file-pattern' field to 'search-path-specification'.
* guix/packages.scm (<search-path-specification>)[file-pattern]: New
field.
(search-path-specification->sexp): Honor it.
---
guix/packages.scm | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index e299962..68fd531 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -171,18 +171,21 @@ representation."
(define-record-type* <search-path-specification>
search-path-specification make-search-path-specification
search-path-specification?
- (variable search-path-specification-variable)
- (files search-path-specification-files)
- (separator search-path-specification-separator (default ":"))
- (file-type search-path-specification-file-type (default 'directory)))
+ (variable search-path-specification-variable) ;string
+ (files search-path-specification-files) ;list of strings
+ (separator search-path-specification-separator ;string
+ (default ":"))
+ (file-type search-path-specification-file-type ;symbol
+ (default 'directory))
+ (file-pattern search-path-specification-file-pattern ;#f | string
+ (default #f)))
(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 files separator type)
- ;; TODO: Add support for PATTERN.
- `(,variable ,files ,separator ,type #f))))
+ (($ <search-path-specification> variable files separator type pattern)
+ `(,variable ,files ,separator ,type ,pattern))))
(define %supported-systems
;; This is the list of system types that are supported. By default, we
- branch core-updates updated (9a224ac -> 2a8d440), Ludovic Courtès, 2014/12/27
- 04/07: packages: Add 'file-pattern' field to 'search-path-specification'.,
Ludovic Courtès <=
- 01/07: build-system/gnu: Strip with '--strip-all' instead of '--strip-debug'., Ludovic Courtès, 2014/12/27
- 06/07: guix package: Use 'search-path-as-list' instead of custom code., Ludovic Courtès, 2014/12/27
- 05/07: utils: Export 'search-path-as-list'., Ludovic Courtès, 2014/12/27
- 07/07: gnu: libxml2: Add search path specification., Ludovic Courtès, 2014/12/27
- 02/07: packages: Add 'file-type' field to 'search-path-specification'., Ludovic Courtès, 2014/12/27
- 03/07: build-support/gnu: Add support for file patterns in search paths., Ludovic Courtès, 2014/12/27