me
/
guix
Archived
1
0
Fork 0
Code

import: go: Improve handling of modules in VCS subdirectories. 

Use the supplied module path (instead of the repository root) as the import
path for everything except source and homepage URLs.  For modules not in the
root of a VCS repository, set #:unpack-path to the repository root by default.

Partly fixes <https://issues.guix.gnu.org/50595>.
Reported by Stephen Paul Weber <singpolyma@singpolyma.net>.

* guix/import/go.scm (go-module->guix-package): Use 'module-path'
instead of 'root-module-path' for #:import-path.  Emit #:unpack-path
when #:import-path is not equal to 'root-module-path'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Sarah Morgensen 2021-09-16 18:24:40 -07:00 committed by Ludovic Courtès
parent 7bae88b5b9
commit b3907e304d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/import/go.scm
View File

@ -619,7 +619,7 @@ hint: use one of the following available versions ~a\n"
(meta-data (fetch-module-meta-data root-module-path)) (meta-data (fetch-module-meta-data root-module-path))
(vcs-type (module-meta-vcs meta-data)) (vcs-type (module-meta-vcs meta-data))
(vcs-repo-url (module-meta-data-repo-url meta-data goproxy)) (vcs-repo-url (module-meta-data-repo-url meta-data goproxy))
(synopsis (go-package-synopsis root-module-path)) (synopsis (go-package-synopsis module-path))
(description (go-package-description module-path)) (description (go-package-description module-path))
(licenses (go-package-licenses module-path))) (licenses (go-package-licenses module-path)))
(values (values
@ -630,7 +630,10 @@ hint: use one of the following available versions ~a\n"
,(vcs->origin vcs-type vcs-repo-url version*)) ,(vcs->origin vcs-type vcs-repo-url version*))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path ,root-module-path)) '(#:import-path ,module-path
,@(if (string=? module-path root-module-path)
'()
`(#:unpack-path ,root-module-path))))
,@(maybe-propagated-inputs ,@(maybe-propagated-inputs
(map (match-lambda (map (match-lambda
((name version) ((name version)