[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/11: gnu: guile-bootstrap: Use the new 'derivation' calling convention
From: |
guix-commits |
Subject: |
05/11: gnu: guile-bootstrap: Use the new 'derivation' calling convention. |
Date: |
Mon, 15 Jul 2019 04:18:16 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 266e54e2acebf7a5ba51422269a0af677c9934a4
Author: Ludovic Courtès <address@hidden>
Date: Tue Jul 9 23:21:20 2019 +0200
gnu: guile-bootstrap: Use the new 'derivation' calling convention.
* gnu/packages/bootstrap.scm (raw-build): In 'derivation' call,
distinguish #:inputs from #:sources, passing a list of
<derivation-input> as #:inputs.
---
gnu/packages/bootstrap.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index e8b2120..5030b81 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;;
@@ -29,7 +29,7 @@
#:use-module ((guix store)
#:select (run-with-store add-to-store add-text-to-store))
#:use-module ((guix derivations)
- #:select (derivation derivation->output-path))
+ #:select (derivation derivation-input derivation->output-path))
#:use-module ((guix utils) #:select (gnu-triplet->nix-system))
#:use-module (guix memoization)
#:use-module (srfi srfi-1)
@@ -312,7 +312,8 @@ $out/bin/guile --version~%"
(derivation store name
bash `(,builder)
#:system system
- #:inputs `((,bash) (,builder) (,guile))
+ #:inputs (list (derivation-input guile))
+ #:sources (list bash builder)
#:env-vars `(("GUILE_TARBALL"
. ,(derivation->output-path guile))))))
- branch master updated (2f3c0fb -> 9af75a2), guix-commits, 2019/07/15
- 02/11: syscalls: Use 'define-as-needed' for 'AT_' constants introduced in Guile 2.2.5., guix-commits, 2019/07/15
- 01/11: compile: Report the name of the file that cannot be compiled., guix-commits, 2019/07/15
- 06/11: download: Use the new 'derivation' calling convention., guix-commits, 2019/07/15
- 03/11: derivations: 'derivation' primitive accepts <derivation> and #:sources., guix-commits, 2019/07/15
- 05/11: gnu: guile-bootstrap: Use the new 'derivation' calling convention.,
guix-commits <=
- 07/11: derivations: 'map-derivation' uses the new 'derivation' calling convention., guix-commits, 2019/07/15
- 10/11: gexp: 'lowered-gexp-guile' now returns a <derivation-input>., guix-commits, 2019/07/15
- 04/11: gexp: <lowered-gexp> separates sources from derivation inputs., guix-commits, 2019/07/15
- 09/11: derivations: Deprecate the previous calling convention., guix-commits, 2019/07/15
- 11/11: channels: Avoid use of 'derivation-input-path'., guix-commits, 2019/07/15
- 08/11: derivations: Update tests to use new calling convention., guix-commits, 2019/07/15