[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: gexp: Slightly simplify 'gexp-inputs'.
From: |
Ludovic Courtès |
Subject: |
06/07: gexp: Slightly simplify 'gexp-inputs'. |
Date: |
Mon, 19 Dec 2016 16:53:08 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit d343a60f93cecb789f3366bac1f068f281c38d9f
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 19 17:13:21 2016 +0100
gexp: Slightly simplify 'gexp-inputs'.
* guix/gexp.scm (gexp-inputs)[add-reference-inputs]: Remove unneeded
'if' in the non-native nested gexp case.
---
guix/gexp.scm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 5021688..6f63afe 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -669,11 +669,8 @@ references; otherwise, return only non-native references."
result)
result))
(($ <gexp-input> (? gexp? exp) _ #f)
- (if native?
- (append (gexp-inputs exp #:native? #t)
- result)
- (append (gexp-inputs exp)
- result)))
+ (append (gexp-inputs exp #:native? native?)
+ result))
(($ <gexp-input> (? string? str))
(if (direct-store-path? str)
(cons `(,str) result)
- branch master updated (43686dc -> 834d122), Ludovic Courtès, 2016/12/19
- 01/07: doc: Mention 'swapon'., Ludovic Courtès, 2016/12/19
- 05/07: gexp: Native inputs of nested gexps are properly accounted for., Ludovic Courtès, 2016/12/19
- 04/07: services: Use 'file-append' in more places., Ludovic Courtès, 2016/12/19
- 03/07: doc: Mention 'grub' field of 'grub-configuration'., Ludovic Courtès, 2016/12/19
- 02/07: doc: Make 'guix pull' more visible., Ludovic Courtès, 2016/12/19
- 06/07: gexp: Slightly simplify 'gexp-inputs'.,
Ludovic Courtès <=
- 07/07: gnu: kdbusaddons: Embed kinit store dir, avoid dependency cycles., Ludovic Courtès, 2016/12/19