diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-09-09 11:54:27 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-09-22 22:40:12 +0200 |
| commit | a2b2070b679ff7e92d856c7d6775f5f67ce4792d (patch) | |
| tree | b04f8eb6a1bf8e848b30c8ecdb1b779c4309132b /tests/union.scm | |
| parent | 985d542e028517b2888fa61831233a2b60dc7d48 (diff) | |
| download | patches-a2b2070b679ff7e92d856c7d6775f5f67ce4792d.tar patches-a2b2070b679ff7e92d856c7d6775f5f67ce4792d.tar.gz | |
bootstrap: %bootstrap-inputs: Wrap input lists into thunks.
* gnu/packages/bootstrap.scm (%bootstrap-inputs): Change to procedure. Update
users; prepares for Mes bootstrap.
* gnu/packages/commencement.scm (%boot0-inputs, %boot1-inputs, %boot2-inputs,
%boot3-inputs, %boot4-inputs, %boot5-inputs, %boot-6-inputs): Change to
procedure. Update users.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths): Make a
procedure, filter on package?. Update users.
Diffstat (limited to 'tests/union.scm')
| -rw-r--r-- | tests/union.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/union.scm b/tests/union.scm index 5a6a4033fc..5599625447 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -94,8 +94,9 @@ `(,name ,(package-derivation %store package)))) ;; Purposefully leave duplicate entries. - (append %bootstrap-inputs - (take %bootstrap-inputs 3)))) + (filter (compose package? cadr) + (append (%bootstrap-inputs) + (take (%bootstrap-inputs) 3))))) (builder `(begin (use-modules (guix build union)) (union-build (assoc-ref %outputs "out") |