[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30657] [PATCH 3/4] services: utils: move 'flatten' from (gnu servic
From: |
Clément Lassieur |
Subject: |
[bug#30657] [PATCH 3/4] services: utils: move 'flatten' from (gnu services web). |
Date: |
Wed, 28 Feb 2018 23:28:20 +0100 |
* gnu/services/web.scm (flatten): Move it...
* gnu/services/utils.scm (flatten): ...to here, and export it.
---
gnu/services/utils.scm | 12 +++++++++++-
gnu/services/web.scm | 9 +--------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/gnu/services/utils.scm b/gnu/services/utils.scm
index a8d7981b2..4b7c9c219 100644
--- a/gnu/services/utils.scm
+++ b/gnu/services/utils.scm
@@ -17,8 +17,10 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu services utils)
+ #:use-module (srfi srfi-1)
#:export (push-tokens
- with-tokens-to-list))
+ with-tokens-to-list
+ flatten))
(define %tokens-stack (make-parameter #f))
@@ -36,6 +38,14 @@ list."
(thunk)
(%tokens-stack)))
+(define (flatten . lst)
+ "Return a list that recursively concatenates all sub-lists of LST."
+ (define (flatten1 head out)
+ (if (list? head)
+ (fold-right flatten1 out head)
+ (cons head out)))
+ (fold-right flatten1 '() lst))
+
;;; Local Variables:
;;; eval: (put 'with-tokens-to-list 'scheme-indent-function 0)
;;; End:
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index beda481b0..38af66367 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -29,6 +29,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages web)
#:use-module (gnu packages php)
+ #:use-module (gnu services utils)
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module ((guix utils) #:select (version-major))
@@ -499,14 +500,6 @@ of index files."
(nginx-upstream-configuration-servers upstream))
" }\n"))
-(define (flatten . lst)
- "Return a list that recursively concatenates all sub-lists of LST."
- (define (flatten1 head out)
- (if (list? head)
- (fold-right flatten1 out head)
- (cons head out)))
- (fold-right flatten1 '() lst))
-
(define (default-nginx-config config)
(match-record config
<nginx-configuration>
--
2.16.2