nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

store: Remove 'build-derivations'. 

* guix/store.scm (build-derivations): Remove.
* guix/derivations.scm (build-derivations): Write in terms of
  'build-things'.
* doc/guix.texi (Invoking guix build): Adjust text accordingly.
This commit is contained in:
Ludovic Courtès 2015-02-02 12:46:09 +01:00
parent bd98ad1fbc
commit 01d8ac64ab
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -2879,7 +2879,7 @@ equivalent @command{guix-daemon} option.
Behind the scenes, @command{guix build} is essentially an interface to Behind the scenes, @command{guix build} is essentially an interface to
the @code{package-derivation} procedure of the @code{(guix packages)} the @code{package-derivation} procedure of the @code{(guix packages)}
module, and to the @code{build-derivations} procedure of the @code{(guix module, and to the @code{build-derivations} procedure of the @code{(guix
store)} module. derivations)} module.
In addition to options explicitly passed on the command line, In addition to options explicitly passed on the command line,
@command{guix build} and other @command{guix} commands that support @command{guix build} and other @command{guix} commands that support

16
guix/derivations.scm
View File

@ -94,6 +94,7 @@
map-derivation map-derivation
build-derivations
built-derivations built-derivations
imported-modules imported-modules
compiled-modules compiled-modules
@ -102,9 +103,7 @@
imported-files) imported-files)
;; Re-export it from here for backward compatibility. ;; Re-export it from here for backward compatibility.
#:re-export (%guile-for-build) #:re-export (%guile-for-build))
#:replace (build-derivations))
;;; ;;;
;;; Error conditions. ;;; Error conditions.
@ -916,12 +915,11 @@ recursively."
(define (build-derivations store derivations) (define (build-derivations store derivations)
"Build DERIVATIONS, a list of <derivation> objects or .drv file names." "Build DERIVATIONS, a list of <derivation> objects or .drv file names."
(let ((build (@ (guix store) build-derivations))) (build-things store (map (match-lambda
(build store (map (match-lambda ((? string? file) file)
((? string? file) file) ((and drv ($ <derivation>))
((and drv ($ <derivation>)) (derivation-file-name drv)))
(derivation-file-name drv))) derivations)))
derivations))))
;;; ;;;

4
guix/store.scm
View File

@ -64,7 +64,6 @@
add-to-store add-to-store
build-things build-things
build build
build-derivations
add-temp-root add-temp-root
add-indirect-root add-indirect-root
add-permanent-root add-permanent-root
@ -582,9 +581,6 @@ that are not derivations can only be substituted and not built locally.
Return #t on success." Return #t on success."
boolean) boolean)
;; Deprecated name for 'build-things'.
(define build-derivations build-things)
(define-operation (add-temp-root (store-path path)) (define-operation (add-temp-root (store-path path))
"Make PATH a temporary root for the duration of the current session. "Make PATH a temporary root for the duration of the current session.
Return #t." Return #t."