diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-17 21:46:00 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-17 22:25:55 +0100 |
| commit | 9d8100f4c7d9f44a3623419039ac985be7ba9bb3 (patch) | |
| tree | 2acde3a2bd38fb2e71c988cefa83b6654235f586 | |
| parent | bcb132876370fc2e51ea9ba137b92932e9e956e4 (diff) | |
| download | patches-9d8100f4c7d9f44a3623419039ac985be7ba9bb3.tar patches-9d8100f4c7d9f44a3623419039ac985be7ba9bb3.tar.gz | |
packages: Move grafting parameter to (guix derivations).
* guix/packages.scm (%graft?, set-grafting): Move to...
* guix/derivations.scm: ... here.
| -rw-r--r-- | guix/derivations.scm | 16 | ||||
| -rw-r--r-- | guix/packages.scm | 13 |
2 files changed, 16 insertions, 13 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index e5922365a0..4b0048b54b 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -97,6 +97,9 @@ build-derivations built-derivations + %graft? + set-grafting + build-expression->derivation) ;; Re-export it from here for backward compatibility. @@ -1287,3 +1290,16 @@ ALLOWED-REFERENCES, and LOCAL-BUILD?." (define built-derivations (store-lift build-derivations)) + +;; The following might feel more at home in (guix packages) but since (guix +;; gexp), which is a lower level, needs them, we put them here. + +(define %graft? + ;; Whether to honor package grafts by default. + (make-parameter #t)) + +(define (set-grafting enable?) + "This monadic procedure enables grafting when ENABLE? is true, and disables +it otherwise. It returns the previous setting." + (lambda (store) + (values (%graft? enable?) store))) diff --git a/guix/packages.scm b/guix/packages.scm index fc5264673d..df56286c5b 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -103,7 +103,6 @@ &package-cross-build-system-error package-cross-build-system-error? - %graft? package->bag bag->derivation bag-transitive-inputs @@ -112,9 +111,7 @@ bag-transitive-target-inputs default-guile - set-guile-for-build - set-grafting package-file package->derivation package->cross-derivation @@ -678,10 +675,6 @@ information in exceptions." (package package) (input x))))))) -(define %graft? - ;; Whether to honor package grafts by default. - (make-parameter #t)) - (define* (package->bag package #:optional (system (%current-system)) (target (%current-target-system)) @@ -918,12 +911,6 @@ code of derivations to GUILE, a package object." (let ((guile (package-derivation store guile))) (values (%guile-for-build guile) store)))) -(define (set-grafting enable?) - "This monadic procedure enables grafting when ENABLE? is true, and disables -it otherwise. It returns the previous setting." - (lambda (store) - (values (%graft? enable?) store))) - (define* (package-file package #:optional file #:key |