diff options
| author | Sarah Morgensen <iskarian@mgsn.dev> | 2021-09-16 18:24:40 -0700 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-18 23:08:32 +0200 |
| commit | b3907e304d6e66fbd3cffd71446ac8c46d26d849 (patch) | |
| tree | 97c210bd915707166f5f9e009762d79024fa576f /guix | |
| parent | 7bae88b5b9dcacad4dcd11b353b486dc2f8a78e2 (diff) | |
| download | guix-patches-b3907e304d6e66fbd3cffd71446ac8c46d26d849.tar guix-patches-b3907e304d6e66fbd3cffd71446ac8c46d26d849.tar.gz | |
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>
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/import/go.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/import/go.scm b/guix/import/go.scm index c6ecdbaffd..fe7387dec2 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -619,7 +619,7 @@ hint: use one of the following available versions ~a\n" (meta-data (fetch-module-meta-data root-module-path)) (vcs-type (module-meta-vcs meta-data)) (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)) (licenses (go-package-licenses module-path))) (values @@ -630,7 +630,10 @@ hint: use one of the following available versions ~a\n" ,(vcs->origin vcs-type vcs-repo-url version*)) (build-system go-build-system) (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 (map (match-lambda ((name version) |