aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-09-28 16:32:24 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-09-28 16:34:12 +0200
commit07f80c27fdf8d2d7711e6192c70f27bfda75c8c2 (patch)
treef545e84fec26c217a50d30ade7584917b7108073
parenta6edcfaf7882311ec718a07494d1aad2655e1698 (diff)
downloadguix-07f80c27fdf8d2d7711e6192c70f27bfda75c8c2.tar
guix-07f80c27fdf8d2d7711e6192c70f27bfda75c8c2.tar.gz
guix: Revert accidentally committed changes.
This is a follow-up to commit fb1db385476bc4548d3eadea93b5dd6a346839f2. * guix/scripts/build.scm (lazy-util): Remove procedure. (options->things-to-build): Remove special case for files with ".json" extension.
-rw-r--r--guix/scripts/build.scm18
1 files changed, 1 insertions, 17 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 3cc679c70a..0571b874f1 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -1,7 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,11 +31,9 @@
#:use-module (guix monads)
#:use-module (guix gexp)
- #:autoload (json) (json-string->scm)
#:autoload (guix http-client) (http-fetch http-get-error?)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
- #:use-module (ice-9 rdelim)
#:use-module (ice-9 vlist)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
@@ -58,10 +55,6 @@
register-root
register-root*))
-;; Lazy reference to import utils to avoid cycle
-(define (lazy-util sym)
- (module-ref (resolve-interface '(guix import utils)) sym))
-
(define %default-log-urls
;; Default base URLs for build logs.
'("http://hydra.gnu.org/log"))
@@ -613,16 +606,7 @@ build---packages, gexps, derivations, and so on."
(else
(list (specification->package spec)))))
(('file . file)
- (if (string-suffix? ".json" file)
- (begin
- ;; Load (json) lazily to avoid hard dependency.
- ;; TODO: doesn't work
- (let* ((json (json-string->scm
- (with-input-from-file file read-string)))
- (pkg ((lazy-util 'data->guix-package)
- ((lazy-util 'hash-table->alist) json))))
- (ensure-list pkg)))
- (ensure-list (load* file (make-user-module '())))))
+ (ensure-list (load* file (make-user-module '()))))
(('expression . str)
(ensure-list (read/eval str)))
(('argument . (? derivation? drv))