summaryrefslogtreecommitdiff
path: root/guix/import/utils.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-03-21 23:53:21 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-04-09 22:41:31 -0400
commit6aee902eaf9e38d5f41f568ef787fa0cc5203318 (patch)
tree706c5c64d6a3796a85bef9c99e0d80126408ef2f /guix/import/utils.scm
parent2446a112dfb79e851449b832006c1160bf818504 (diff)
downloadguix-patches-6aee902eaf9e38d5f41f568ef787fa0cc5203318.tar
guix-patches-6aee902eaf9e38d5f41f568ef787fa0cc5203318.tar.gz
import: go: Improve synopsis and description parsing.
* guix/import/go.scm (%strict-tokenizer?): Set parameter to #t. (go-path-escape): Redefine to prevent inlining. (http-get*): Replace by ... (http-fetch*): this ... (json-fetch*): New procedure. (go.pkg.dev-info): Use http-fetch*. (go-package-licenses): Rewrite in terms of go.pkg.dev-info. (go-package-description): Likewise. (go-package-synopsis): Likewise. (fetch-go.mod): Use the memoized http-fetch*. (parse-go.mod): Adjust to receive content as a string. (fetch-module-meta-data): Adjust to use http-fetch*. (go-module->guix-package): Adjust to the modified fetch-go.mod return value. [inputs]: Use propagated inputs, which is the most common situations for Go libraries. [description]: Beautify description. [licenses]: Do no check for #f. The result of the license parsing is always a list. * tests/go.scm: Adjust following above changes.
Diffstat (limited to 'guix/import/utils.scm')
-rw-r--r--guix/import/utils.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index c2db5a323b..adf90f84d7 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -446,8 +446,8 @@ obtain a node's uniquely identifying \"key\"."
"Return a list of package expressions for PACKAGE-NAME and all its
dependencies, sorted in topological order. For each package,
call (REPO->GUIX-PACKAGE NAME :KEYS version repo), which should return a
-package expression and a list of dependencies; call (GUIX-NAME NAME) to
-obtain the Guix package name corresponding to the upstream name."
+package expression and a list of dependencies; call (GUIX-NAME PACKAGE-NAME)
+to obtain the Guix package name corresponding to the upstream name."
(define-record-type <node>
(make-node name version package dependencies)
node?