diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-17 01:00:50 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-17 01:00:50 -0400 |
| commit | 539bf8f2c071b53834829259bb3fabf0390c5dc6 (patch) | |
| tree | 16672732afbf4c3f933e67ac677aa1877f6a7657 /guix/gexp.scm | |
| parent | 903874328ed5e5ab766e36cee1b1a0989e8b24a9 (diff) | |
| parent | 2cf8531f360ef390d3ec670cc150b106bab5eff1 (diff) | |
| download | gnu-guix-539bf8f2c071b53834829259bb3fabf0390c5dc6.tar gnu-guix-539bf8f2c071b53834829259bb3fabf0390c5dc6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/gexp.scm')
| -rw-r--r-- | guix/gexp.scm | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index 5ffe505be1..c6d70e4e36 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -664,7 +664,9 @@ The other arguments are as for 'derivation'." (imported-modules %modules #:system system #:module-path module-path - #:guile guile-for-build) + #:guile guile-for-build + #:deprecation-warnings + deprecation-warnings) (return #f))) (compiled (if (pair? %modules) (compiled-modules %modules @@ -974,7 +976,15 @@ environment." (define* (imported-files files #:key (name "file-import") (system (%current-system)) - (guile (%guile-for-build))) + (guile (%guile-for-build)) + + ;; XXX: The only reason we have + ;; #:deprecation-warnings is because (guix build + ;; utils), which we use here, relies on _IO*, which + ;; is deprecated in 2.2. On the next full-rebuild + ;; cycle, we should disable such warnings + ;; unconditionally. + (deprecation-warnings #f)) "Return a derivation that imports FILES into STORE. FILES must be a list of (FINAL-PATH . FILE) pairs. Each FILE is mapped to FINAL-PATH in the resulting store path. FILE can be either a file name, or a file-like object, @@ -1010,13 +1020,25 @@ as returned by 'local-file' for example." (gexp->derivation name build #:system system #:guile-for-build guile - #:local-build? #t))) + #:local-build? #t + + ;; TODO: On the next rebuild cycle, set to "no" + ;; unconditionally. + #:env-vars + (case deprecation-warnings + ((#f) + '(("GUILE_WARN_DEPRECATED" . "no"))) + ((detailed) + '(("GUILE_WARN_DEPRECATED" . "detailed"))) + (else + '()))))) (define* (imported-modules modules #:key (name "module-import") (system (%current-system)) (guile (%guile-for-build)) - (module-path %load-path)) + (module-path %load-path) + (deprecation-warnings #f)) "Return a derivation that contains the source files of MODULES, a list of module names such as `(ice-9 q)'. All of MODULES must be either names of modules to be found in the MODULE-PATH search path, or a module name followed @@ -1041,7 +1063,8 @@ last one is created from the given <scheme-file> object." (cons f (search-path* module-path f)))))) modules))) (imported-files files #:name name #:system system - #:guile guile))) + #:guile guile + #:deprecation-warnings deprecation-warnings))) (define* (compiled-modules modules #:key (name "module-import-compiled") @@ -1058,7 +1081,9 @@ they can refer to each other." #:system system #:guile guile #:module-path - module-path))) + module-path + #:deprecation-warnings + deprecation-warnings))) (define build (gexp (begin |