derivations: Deprecate the previous calling convention.
We will eventually require #:inputs to be a list of <derivation-input>; store items will have to be passed as #:sources, already interned. * guix/derivations.scm (warn-about-derivation-deprecation): New procedure. (derivation): Add #:%deprecation-warning? parameter. [warn-deprecation]: New macro. [input->derivation-input, input->source]: Use it. (build-expression->derivation): Pass #:%deprecation-warning?. * po/guix/POTFILES.in: Add guix/derivations.scm.
This commit is contained in:
parent
9e64302d68
commit
93c2a00739
|
@ -36,6 +36,8 @@
|
||||||
#:use-module (guix memoization)
|
#:use-module (guix memoization)
|
||||||
#:use-module (guix combinators)
|
#:use-module (guix combinators)
|
||||||
#:use-module (guix deprecation)
|
#:use-module (guix deprecation)
|
||||||
|
#:use-module (guix diagnostics)
|
||||||
|
#:use-module (guix i18n)
|
||||||
#:use-module (guix monads)
|
#:use-module (guix monads)
|
||||||
#:use-module (gcrypt hash)
|
#:use-module (gcrypt hash)
|
||||||
#:use-module (guix base32)
|
#:use-module (guix base32)
|
||||||
|
@ -705,6 +707,13 @@ name of each input with that input's hash."
|
||||||
;; character.
|
;; character.
|
||||||
(sha256 (derivation->bytevector (derivation/masked-inputs drv)))))))
|
(sha256 (derivation->bytevector (derivation/masked-inputs drv)))))))
|
||||||
|
|
||||||
|
|
||||||
|
(define (warn-about-derivation-deprecation name)
|
||||||
|
;; TRANSLATORS: 'derivation' must not be translated; it refers to the
|
||||||
|
;; 'derivation' procedure.
|
||||||
|
(warning (G_ "in '~a': deprecated 'derivation' calling convention used~%")
|
||||||
|
name))
|
||||||
|
|
||||||
(define* (derivation store name builder args
|
(define* (derivation store name builder args
|
||||||
#:key
|
#:key
|
||||||
(system (%current-system)) (env-vars '())
|
(system (%current-system)) (env-vars '())
|
||||||
|
@ -715,7 +724,8 @@ name of each input with that input's hash."
|
||||||
allowed-references disallowed-references
|
allowed-references disallowed-references
|
||||||
leaked-env-vars local-build?
|
leaked-env-vars local-build?
|
||||||
(substitutable? #t)
|
(substitutable? #t)
|
||||||
(properties '()))
|
(properties '())
|
||||||
|
(%deprecation-warning? #t))
|
||||||
"Build a derivation with the given arguments, and return the resulting
|
"Build a derivation with the given arguments, and return the resulting
|
||||||
<derivation> object. When HASH and HASH-ALGO are given, a
|
<derivation> object. When HASH and HASH-ALGO are given, a
|
||||||
fixed-output derivation is created---i.e., one whose result is known in
|
fixed-output derivation is created---i.e., one whose result is known in
|
||||||
|
@ -832,19 +842,28 @@ derivation. It is kept as-is, uninterpreted, in the derivation."
|
||||||
e
|
e
|
||||||
outputs)))
|
outputs)))
|
||||||
|
|
||||||
|
(define-syntax-rule (warn-deprecation name)
|
||||||
|
(when %deprecation-warning?
|
||||||
|
(warn-about-derivation-deprecation name)))
|
||||||
|
|
||||||
(define input->derivation-input
|
(define input->derivation-input
|
||||||
(match-lambda
|
(match-lambda
|
||||||
((? derivation-input? input)
|
((? derivation-input? input)
|
||||||
input)
|
input)
|
||||||
(((? derivation? drv))
|
(((? derivation? drv))
|
||||||
|
(warn-deprecation name)
|
||||||
(make-derivation-input drv '("out")))
|
(make-derivation-input drv '("out")))
|
||||||
(((? derivation? drv) sub-drvs ...)
|
(((? derivation? drv) sub-drvs ...)
|
||||||
|
(warn-deprecation name)
|
||||||
(make-derivation-input drv sub-drvs))
|
(make-derivation-input drv sub-drvs))
|
||||||
(_ #f)))
|
(_
|
||||||
|
(warn-deprecation name)
|
||||||
|
#f)))
|
||||||
|
|
||||||
(define input->source
|
(define input->source
|
||||||
(match-lambda
|
(match-lambda
|
||||||
(((? string? input) . _)
|
(((? string? input) . _)
|
||||||
|
(warn-deprecation name)
|
||||||
(if (direct-store-path? input)
|
(if (direct-store-path? input)
|
||||||
input
|
input
|
||||||
(add-to-store store (basename input)
|
(add-to-store store (basename input)
|
||||||
|
@ -1320,6 +1339,10 @@ and PROPERTIES."
|
||||||
,@(if mod-dir `("-L" ,mod-dir) '())
|
,@(if mod-dir `("-L" ,mod-dir) '())
|
||||||
,builder)
|
,builder)
|
||||||
|
|
||||||
|
;; 'build-expression->derivation' is somewhat deprecated so
|
||||||
|
;; don't bother warning here.
|
||||||
|
#:%deprecation-warning? #f
|
||||||
|
|
||||||
#:system system
|
#:system system
|
||||||
|
|
||||||
#:inputs `((,(or guile-for-build (%guile-for-build)))
|
#:inputs `((,(or guile-for-build (%guile-for-build)))
|
||||||
|
|
|
@ -80,6 +80,7 @@ guix/channels.scm
|
||||||
guix/profiles.scm
|
guix/profiles.scm
|
||||||
guix/git.scm
|
guix/git.scm
|
||||||
guix/deprecation.scm
|
guix/deprecation.scm
|
||||||
|
guix/derivations.scm
|
||||||
gnu/build/bootloader.scm
|
gnu/build/bootloader.scm
|
||||||
nix/nix-daemon/guix-daemon.cc
|
nix/nix-daemon/guix-daemon.cc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue