From 578dfbe07bcd1bdef9129c6ce8529332a0abcba6 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 17 Jul 2017 23:21:55 +0200
Subject: gexp: 'ungexp-splicing' properly accounts for nested native inputs.

Previously, (gexp-native-inputs #~#$@(list #~#+foo)) would return '().

This is a followup to 5b14a7902c58d9fb7923f9e16871f549fbe59b6e.

* guix/gexp.scm (gexp-inputs)[add-reference-inputs]: In the list case,
remove 'if' around 'fold-right'.  In 'map' lambda, always inherit N?.
* tests/gexp.scm ("gexp list splicing + ungexp-splicing"): New test.
---
 tests/gexp.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests/gexp.scm')

diff --git a/tests/gexp.scm b/tests/gexp.scm
index cf88a9db80..5873abdd41 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -355,6 +355,14 @@
          (equal? (gexp->sexp* exp)                ;native
                  (gexp->sexp* exp "mips64el-linux")))))
 
+(test-assert "gexp list splicing + ungexp-splicing"
+  (let* ((inner (gexp (ungexp-native glibc)))
+         (exp   (gexp (list (ungexp-splicing (list inner))))))
+    (and (equal? `((,glibc "out")) (gexp-native-inputs exp))
+         (null? (gexp-inputs exp))
+         (equal? (gexp->sexp* exp)                ;native
+                 (gexp->sexp* exp "mips64el-linux")))))
+
 (test-equal "output list"
   2
   (let ((exp (gexp (begin (mkdir (ungexp output))
-- 
cgit v1.2.3

b2b49115c184986ccf7'>tree</a><a href='/guix/commit/gnu/packages/icu4c.scm?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7'>commit</a><a href='/guix/diff/gnu/packages/icu4c.scm?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/icu4c.scm'>
<input type='hidden' name='id' value='8b53495dfb50cda6b2c73b2b49115c184986ccf7'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7'>root</a>/<a href='/guix/log/gnu?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7'>gnu</a>/<a href='/guix/log/gnu/packages?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7'>packages</a>/<a href='/guix/log/gnu/packages/icu4c.scm?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7'>icu4c.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/icu4c.scm?id=8b53495dfb50cda6b2c73b2b49115c184986ccf7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-14 12:02:52 +0100'>2020-03-14</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=8d425d74d25ec9d8eda74d3b70dc21b5e71537e2'>gnu: icu4c: Update to 66.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-12-05 17:59:01 +0100'>2019-12-05</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=e8acfd1a9fcb5d947f023293852373758784d15f'>gnu: icu4c: Update to 65.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-11-15 17:32:25 +0100'>2019-11-15</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=63eb30c1915e774d1384c9c74feff28b2fbad744'>gnu: icu4c: Fix cross-compilation.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2019-07-31 14:41:35 +0200'>2019-07-31</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=f73fe13ccd1ef3fe6f6e0409fa817e5feb612e40'>gnu: icu4c: Make 'libicudata.so' behave the same on all architectures.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-31 14:41:35 +0200'>2019-07-31</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=7999d317bcc12d9c1ebc63bd519145ee4954e410'>gnu: icu4c: Add upstream patches.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-07 16:55:10 +0200'>2019-07-07</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=ac135287d21e098b8940fcacd5bf82537e71d100'>gnu: icu4c: Enable tests on i686.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-07 16:54:15 +0200'>2019-07-07</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=a4c38f812c3eae757e4980f8f6131ff3a608e6aa'>gnu: icu4c: Use 'python-minimal' for tests.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-02 20:21:13 +0200'>2019-07-02</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=fb82d3472d8bf5c5690d943a82b1bfa93eea58dd'>gnu: Remove redundant icu4c@64 package.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-02 20:18:16 +0200'>2019-07-02</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=4fb916551579d336ebea0dbe968314febb3a99d4'>Merge branch 'staging' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-06-30 14:11:00 +0200'>2019-06-30</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=ff68ddb032774c65279372c6d4bfab5d8825977e'>gnu: ungoogled-chromium: Build against ICU 64.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-05-04 16:25:52 +0200'>2019-05-04</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=27ed6960beda88e823790f3ab4cd9af9772c00ae'>gnu: icu4c: Update to 64.2.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-12-12 20:49:13 +0100'>2018-12-12</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=c3c7e0941ebdb476b534224e38474e47b2d38d9b'>gnu: icu4c: Update to 63.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-10-05 19:05:39 +0200'>2018-10-05</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=e65b2181e8b436278e3dd0b405602a400fbd0a75'>gnu: icu4c: Skip tests on i686.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-07-28 15:02:38 +0200'>2018-07-28</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=fbd2b8da5d7e6edb16ba7128324f6bc48ac68569'>gnu: icu4c: Don't keep a reference to coreutils.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-07-24 20:53:18 +0200'>2018-07-24</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f'>gnu: icu4c: Update to 62.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-29 02:54:09 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=7a0815042957789ada8f6f3aad4c2abd6910b5e2'>gnu: icu4c: Update to 61.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-12-19 23:34:10 +0100'>2017-12-19</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=1b0f65dc99fc64e572197e36f66a44a597ab3150'>gnu: icu4c: Update to 60.2.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-11-02 09:08:02 +0200'>2017-11-02</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=4e080fbb0bb73e4444181599676f4e1ef5fdc2ba'>gnu: icu4c: Update to 60.1.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-11-01 10:32:00 +0200'>2017-11-01</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=e2ffdd83b977314eb77cc0691f7296e720be9003'>gnu: icu4c: Incorporate grafted changes.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-10-24 13:10:35 -0400'>2017-10-24</span></td><td><a href='/guix/commit/gnu/packages/icu4c.scm?id=6dcc8239be807d7e96b3425310e0f565ed5218b8'>gnu: icu4c: Fix CVE-2017-14952.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>