diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2019-07-14 20:16:19 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2019-07-14 20:18:07 +0200 |
| commit | a4bb18921099b2ec8c1699e08a73ca0fa78d0486 (patch) | |
| tree | f4ebaf59f4aca03bfbc20b3415f832a76f3b8570 /guix/build-system | |
| parent | 3c6d7fa84274ab357b5e43dd412486b35872ab36 (diff) | |
| download | guix-patches-a4bb18921099b2ec8c1699e08a73ca0fa78d0486.tar guix-patches-a4bb18921099b2ec8c1699e08a73ca0fa78d0486.tar.gz | |
Revert "guix: node-build-system: Use guile-json instead of a custom parser."
The effect of this change was to import the (json parser) from the host
side into the build side. The solution here would be to do the equivalent
of ‘with-extensions’ for gexps. Since we don't use gexps for build
systems just yet, revert this for now.
This reverts commit 8eb0ba532ebbebef23180e666e0607ea735f9c1a.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/node.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index dad492dc95..05c24c47d5 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -18,6 +18,7 @@ (define-module (guix build-system node) #:use-module (guix store) + #:use-module (guix build json) #:use-module (guix build union) #:use-module (guix utils) #:use-module (guix packages) @@ -26,7 +27,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (ice-9 match) - #:use-module (json parser) #:export (npm-meta-uri %node-build-system-modules node-build @@ -40,8 +40,8 @@ registry." (define %node-build-system-modules ;; Build-side modules imported by default. `((guix build node-build-system) + (guix build json) (guix build union) - (json parser) ,@%gnu-build-system-modules)) ;; TODO: Might be not needed (define (default-node) @@ -88,9 +88,9 @@ registry." (guile #f) (imported-modules %node-build-system-modules) (modules '((guix build node-build-system) - (guix build union) - (guix build utils) - (json parser)))) + (guix build json) + (guix build union) + (guix build utils)))) "Build SOURCE using NODE and INPUTS." (define builder `(begin |