Revert the #51061 patch series for now.

This reverts commits f63c79bf7674df012517f8e9148f94c611e35f32
..f86f7e24b39928247729020df0134e2e1c4cde62 for more chillax reviewing.

See <https://issues.guix.gnu.org/51061#32>.

2 files changed, 1 insertions, 115 deletions

diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index aaadad4adf..40fa6759ae 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -79,7 +79,7 @@ rather than \\n."
 ;;;
 
 (define importers '("gnu" "pypi" "cpan" "hackage" "stackage" "egg" "elpa"
-                    "gem" "go" "cran" "crate" "texlive" "json" "opam" "hexpm"
+                    "gem" "go" "cran" "crate" "texlive" "json" "opam"
                     "minetest"))
 
 (define (resolve-importer name)
diff --git a/guix/scripts/import/hexpm.scm b/guix/scripts/import/hexpm.scm
deleted file mode 100644
index 95a291f1a8..0000000000
--- a/guix/scripts/import/hexpm.scm
+++ /dev/null
@@ -1,114 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 David Thompson <davet@gnu.org>
-;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
-;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;;
-;;; 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 scripts import hexpm)
-  #:use-module (guix ui)
-  #:use-module (guix utils)
-  #:use-module (guix scripts)
-  #:use-module (guix import hexpm)
-  #:use-module (guix scripts import)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-11)
-  #:use-module (srfi srfi-37)
-  #:use-module (ice-9 match)
-  #:use-module (ice-9 format)
-  #:export (guix-import-hexpm))
-
-
-;;;
-;;; Command-line options.
-;;;
-
-(define %default-options
-  '())
-
-(define (show-help)
-  (display (G_ "Usage: guix import hexpm PACKAGE-NAME
-Import and convert the hex.pm package for PACKAGE-NAME.\n"))
-  (display (G_ "
-  -r, --recursive        import packages recursively"))
-  (newline)
-  (display (G_ "
-  -h, --help             display this help and exit"))
-  (display (G_ "
-  -V, --version          display version information and exit"))
-  (newline)
-  (show-bug-report-information))
-
-(define %options
-  ;; Specification of the command-line options.
-  (cons* (option '(#\h "help") #f #f
-                 (lambda args
-                   (show-help)
-                   (exit 0)))
-         (option '(#\V "version") #f #f
-                 (lambda args
-                   (show-version-and-exit "guix import hexpm")))
-         (option '(#\r "recursive") #f #f
-                 (lambda (opt name arg result)
-                   (alist-cons 'recursive #t result)))
-         %standard-import-options))
-
-
-;;;
-;;; Entry point.
-;;;
-
-(define (guix-import-hexpm . args)
-  (define (parse-options)
-    ;; Return the alist of option values.
-    (args-fold* args %options
-                (lambda (opt name arg result)
-                  (leave (G_ "~A: unrecognized option~%") name))
-                (lambda (arg result)
-                  (alist-cons 'argument arg result))
-                %default-options))
-
-
-  (let* ((opts (parse-options))
-         (args (filter-map (match-lambda
-                             (('argument . value)
-                              value)
-                             (_ #f))
-                           (reverse opts))))
-    (match args
-      ((spec)
-       (define-values (name version)
-         (package-name->name+version spec))
-
-       (if (assoc-ref opts 'recursive)
-           (map (match-lambda
-                  ((and ('package ('name name) . rest) pkg)
-                   `(define-public ,(string->symbol name)
-                      ,pkg))
-                  (_ #f))
-                (hexpm-recursive-import name version))
-           (let ((sexp (hexpm->guix-package name #:version version)))
-             (unless sexp
-               (leave (G_ "failed to download meta-data for package '~a'~%")
-                      (if version
-                          (string-append name "@" version)
-                          name)))
-             sexp)))
-      (()
-       (leave (G_ "too few arguments~%")))
-      ((many ...)
-       (leave (G_ "too many arguments~%"))))))