diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-05-28 18:22:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-01 15:21:28 +0200 |
| commit | 13993c77fec7580f4f10ea07256db9e5f5a7949b (patch) | |
| tree | eb5baa8bef65408d9dd26b0df5599f04d87de8ab /guix/docker.scm | |
| parent | 838e17d8050236a6d3ffde991fb0035412eb3046 (diff) | |
| download | gnu-guix-13993c77fec7580f4f10ea07256db9e5f5a7949b.tar gnu-guix-13993c77fec7580f4f10ea07256db9e5f5a7949b.tar.gz | |
pack: Use 'with-extensions' when referring to (guix docker).
* guix/docker.scm: Use module (json) the normal way.
* guix/scripts/pack.scm (docker-image)[build]: Wrap in
'with-extensions'.
Diffstat (limited to 'guix/docker.scm')
| -rw-r--r-- | guix/docker.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/guix/docker.scm b/guix/docker.scm index a75534c33b..b869901599 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -26,6 +26,7 @@ delete-file-recursively with-directory-excursion invoke)) + #:use-module (json) ;guile-json #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module ((texinfo string-utils) @@ -34,9 +35,6 @@ #:use-module (ice-9 match) #:export (build-docker-image)) -;; Load Guile-JSON at run time to simplify the job of 'imported-modules' & co. -(module-use! (current-module) (resolve-interface '(json))) - ;; Generate a 256-bit identifier in hexadecimal encoding for the Docker image. (define docker-id (compose bytevector->base16-string sha256 string->utf8)) |