[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
87/155: gexp: Slightly simplify 'gexp-inputs'.
From: |
John Darrington |
Subject: |
87/155: gexp: Slightly simplify 'gexp-inputs'. |
Date: |
Wed, 21 Dec 2016 20:48:36 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit e84beba55b600e7fd1431c6a3c20db31368dbf34
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)
- 43/155: guix import: Print list of expressions., (continued)
- 43/155: guix import: Print list of expressions., John Darrington, 2016/12/21
- 51/155: gnu: Add attribution line for Raoul Bonnal., John Darrington, 2016/12/21
- 60/155: tests: Adjust cpan tests., John Darrington, 2016/12/21
- 54/155: tests: Mock up http-fetch in import tests., John Darrington, 2016/12/21
- 58/155: build: check-final-inputs-self-contained has an exception for 'bash:include'., John Darrington, 2016/12/21
- 62/155: gnu: python-docutils: Update to 0.13.1, John Darrington, 2016/12/21
- 66/155: build: Add 'guix-publish.*.in' to the distribution., John Darrington, 2016/12/21
- 69/155: gnu: tor: split description into two parts for easier reading., John Darrington, 2016/12/21
- 72/155: gnu: gnumach-headers: Update to 1.8., John Darrington, 2016/12/21
- 75/155: gnu: pcsc-lite: Update to 1.8.19., John Darrington, 2016/12/21
- 87/155: gexp: Slightly simplify 'gexp-inputs'.,
John Darrington <=
- 84/155: doc: Mention 'grub' field of 'grub-configuration'., John Darrington, 2016/12/21
- 80/155: gnu: samba: Update to 4.5.3 [fixes CVE-2016-{2123, 2125, 2126}]., John Darrington, 2016/12/21
- 97/155: install: The list of services is now a plain list., John Darrington, 2016/12/21
- 90/155: gnu: linux-libre: Update to 4.8.15., John Darrington, 2016/12/21
- 95/155: Revert "gnu: grub: Add dependency on efibootmgr.", John Darrington, 2016/12/21
- 108/155: gnu: enlightenment: Update to 0.21.5., John Darrington, 2016/12/21
- 81/155: gnu: openssh: Update to 7.4p1., John Darrington, 2016/12/21
- 105/155: services: guix: Remove dependency on lsh., John Darrington, 2016/12/21
- 123/155: build: Bump version number., John Darrington, 2016/12/21
- 119/155: gnu: cuirass: Make sure 'cuirass' has 'evaluate' in $PATH., John Darrington, 2016/12/21