* guix/import/utils.scm (json-fetch): Move json-fetch from (guix import json). --- guix/import/cpan.scm | 1 - guix/import/gem.scm | 1 - guix/import/json.scm | 32 -------------------------------- guix/import/pypi.scm | 1 - guix/import/utils.scm | 12 ++++++++++++ 5 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 guix/import/json.scm
diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 5b7c475..0769064 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -31,7 +31,6 @@ #:use-module (guix base32) #:use-module ((guix download) #:select (download-to-store)) #:use-module (guix import utils) - #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix derivations) #:use-module (gnu packages perl) diff --git a/guix/import/gem.scm b/guix/import/gem.scm index fc06b0d..b3a50ac 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -26,7 +26,6 @@ #:use-module (web uri) #:use-module ((guix download) #:prefix download:) #:use-module (guix import utils) - #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix licenses) diff --git a/guix/import/json.scm b/guix/import/json.scm deleted file mode 100644 index c3092a5..0000000 --- a/guix/import/json.scm +++ /dev/null @@ -1,32 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 David Thompson <da...@gnu.org> -;;; Copyright © 2015 Eric Bavier <bav...@member.fsf.org> -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. - -(define-module (guix import json) - #:use-module (json) - #:use-module (guix utils) - #:use-module (guix import utils) - #:export (json-fetch)) - -(define (json-fetch url) - "Return an alist representation of the JSON resource URL, or #f on failure." - (call-with-temporary-output-file - (lambda (temp port) - (and (url-fetch url temp) - (hash-table->alist - (call-with-input-file temp json->scm)))))) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 343445a..3f24014 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -38,7 +38,6 @@ . hyphen-package-name->name+version))) #:use-module (guix import utils) #:use-module ((guix download) #:prefix download:) - #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix licenses) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 93cd0f0..d19a6df 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -1,5 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013 Ludovic Courtès <l...@gnu.org> +;;; Copyright © 2014 David Thompson <da...@gnu.org> +;;; Copyright © 2015 Eric Bavier <bav...@member.fsf.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +27,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module ((guix build download) #:prefix build:) + #:use-module (json) #:export (factorize-uri hash-table->alist @@ -32,6 +35,7 @@ assoc-ref* url-fetch + json-fetch guix-hash-url string->license @@ -148,3 +152,11 @@ into a proper sentence and by using two spaces between sentences." ;; Use double spacing between sentences (regexp-substitute/global #f "\\. \\b" cleaned 'pre ". " 'post))) + +(define (json-fetch url) + "Return an alist representation of the JSON resource URL, or #f on failure." + (call-with-temporary-output-file + (lambda (temp port) + (and (url-fetch url temp) + (hash-table->alist + (call-with-input-file temp json->scm)))))) -- 2.9.0