ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 16:06:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/gnu: 'package-with-explicit-inputs' uses 'package-mapping'.

Browse source 
* guix/build-system/gnu.scm (package-with-explicit-inputs): Rename to...
(package-with-explicit-inputs/deprecated): ... this.
(package-with-explicit-inputs*): New procedure.
(package-with-explicit-inputs): Define as a 'case-lambda*'.
This commit is contained in:
Ludovic Courtès 2019-10-13 23:07:56 +02:00
parent 64855281c1
commit f618134e4c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 52 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
guix/build-system/gnu.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -57,12 +57,16 @@ (define %default-modules
'((guix build gnu-build-system)
(guix build utils)))
(define* (package-with-explicit-inputs p inputs
#:optional
(loc (current-source-location))
#:key (native-inputs '())
guile)
"Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take INPUTS and
(define* (package-with-explicit-inputs/deprecated p inputs
#:optional
(loc (current-source-location))
#:key (native-inputs '())
guile)
"This variant is deprecated because it is inefficient: it memoizes only
temporarily instead of memoizing across all transformations where INPUTS is
the same.
Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take INPUTS and
NATIVE-INPUTS as explicit inputs instead of the implicit default, and return
it. INPUTS and NATIVE-INPUTS can be either input lists or thunks; in the
latter case, they will be called in a context where the `%current-system' and
@ -124,6 +128,47 @@ (define rewritten-input
,@(map rewritten-input
(filtered (package-inputs p)))))))))
(define* (package-with-explicit-inputs* inputs #:optional guile)
"Return a procedure that rewrites the given package and all its dependencies
so that they use INPUTS (a thunk) instead of implicit inputs."
(define (duplicate-filter package-inputs)
(let ((names (match (inputs)
(((name _ ...) ...)
name))))
(fold alist-delete package-inputs names)))
(define (add-explicit-inputs p)
(if (and (eq? (package-build-system p) gnu-build-system)
(not (memq #:implicit-inputs? (package-arguments p))))
(package
(inherit p)
(inputs (append (inputs)
(duplicate-filter (package-inputs p))))
(arguments
(ensure-keyword-arguments (package-arguments p)
`(#:implicit-inputs? #f
#:guile ,guile))))
p))
(define (cut? p)
(and (eq? (package-build-system p) gnu-build-system)
(memq #:implicit-inputs? (package-arguments p))))
(package-mapping add-explicit-inputs cut?))
(define package-with-explicit-inputs
(case-lambda*
((inputs #:optional guile)
(package-with-explicit-inputs* inputs guile))
((p inputs #:optional (loc (current-source-location))
#:key (native-inputs '()) guile)
;; deprecated
(package-with-explicit-inputs/deprecated p inputs
loc
#:native-inputs
native-inputs
#:guile guile))))
(define (package-with-extra-configure-variable p variable value)
"Return a version of P with VARIABLE=VALUE specified as an extra `configure'
flag, recursively. An example is LDFLAGS=-static. If P already has configure