16/38: Revert "build-system/asdf: Fix normalize-string to support versioned dependencies"

[Pierre Neidhardt]

ambrevar pushed a commit to branch wip-next-browser
in repository guix.

commit fe99530a0f4405ce55c2093beb0df090cb006aaa
Author: Pierre Neidhardt <address@hidden>
Date:   Mon Oct 1 15:33:57 2018 +0200

    Revert "build-system/asdf: Fix normalize-string to support versioned 
dependencies"
    
    This reverts commit 06f1a4b0d75a596b0dfa171ed5e5a9e6303655f0.
---
 guix/build/lisp-utils.scm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm
index 5bc9ed7..21cb620 100644
--- a/guix/build/lisp-utils.scm
+++ b/guix/build/lisp-utils.scm
@@ -77,15 +77,9 @@
   (string->char-set
    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+-._?="))
 
-(define (normalize-string str-or-list)
-  "Replace invalid characters in STR-OR-LIST with a hyphen."
-  ;; Dependencies can be either strings or list with properties, e.g.
-  ;; (:version "bar" "0.1.2")
-  (if (string? str-or-list)
-      (string-join (string-tokenize str-or-list valid-char-set) "-")
-      (map (lambda (e) (if (string? e)
-                           (normalize-string e)
-                           e)) str-or-list)))
+(define (normalize-string str)
+  "Replace invalid characters in STR with a hyphen."
+  (string-join (string-tokenize str valid-char-set) "-"))
 
 (define (inputs->asd-file-map inputs)
   "Produce a hash table of the form (system . asd-file), where system is the