Rename go-github-com-golang-protobuf-proto to the Golang module name as
seen in go.mod. Due to lack of support of building submodules in
go-build-system 'build phase is omitted and 'check phase is substituted by
custom one providing nested path tests.
* gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Rename to...
(go-github-com-golang-protobuf): ... this.
<#:unpack-path>: Remove argument.
<#:phases>: Delete 'build phase. Add custom 'check phase and run tests
for all submodules.
(go-github-com-prometheus-common,
go-github-com-matttproud-golang-protobuf-extensions-pbutil)
[propagated-inputs]: Adjust accordingly.
* gnu/packages/golang-check.scm (go-github-com-onsi-gomega)
[propagated-inputs]: Likewise
* gnu/packages/golang-web.scm (go-github-com-golang-groupcache,
go-github-com-quic-go-quic-go)
[propagated-inputs]: Likewise
* gnu/packages/golang-xyz.scm (go-github-com-prometheus-client-model)
[propagated-inputs]: Likewise
* gnu/packages/syncthing.scm (go-github-com-matttproud-golang-protobuf-extensions-pbutil)
[propagated-inputs]: Likewise
Change-Id: I28c11739247a5ebafefd032d04a548a683fa0454
Co-authored-by: Hilton Chain <hako@ultrarare.space>
Go 1.13 introduced[1] a new "trimpath" flag in charge of removing the
references to the go toolchain in the produced ELFs. We used to remove
these references using the "remove-go-reference" function. This function
was executed after go install. By using this new trimpath flag, we don't
have to remove any store path from the ELFs produced by go install.
We're not using any go older than 1.13 anymore, it's safe to remove
these functions.
[1] https://go.dev/doc/go1.13
-trimpath
remove all file system paths from the resulting executable.
Instead of absolute file system paths, the recorded file names
will begin either a module path@version (when using modules),
or a plain import path (when using the standard library, or
GOPATH).
* guix/build/go-build-system.scm (build): Add -trimpath
(%standard-phases): Remove remove-go-references.
(remove-go-references): Remove.
Change-Id: Idcae366d226da5ce095693f81fd33133fd1d70d6
Co-authored-by: Picnoir <picnoir@alternativebit.fr>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This causes build failures on powerpc-linux.
* guix/build/go-build-system.scm (unpack): When the unpack-path is unset
use the import-path but don't redefine the unpack-path.
Change-Id: I2b5a36eb738abb14307941d388038139dbaf2bdf
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
golang.org/x/net is distributed as a single module according to provided
go.mod file. This changes remove the last reference to
golang.org/x/net/html.
* gnu/packages/golang-build.scm (go-golang-org-x-net) [propagated-inputs]: Add
go-golang-org-x-sys, go-golang-org-x-term and go-golang-org-x-text.
(go-golang-org-x-net-html): Remove variable.
* gnu/packages/version-control.scm (ghq) [inputs]: Remove
go-golang-org-x-net-html. Add go-golang-org-x-net.
* gnu/packages/textutils.scm (vale) [inputs]: Remove
go-golang-org-x-net-html. Add go-golang-org-x-net.
Change-Id: Ic275f2f7ccd145edfd376d65bd24599a550e849a
go-go-etcd-io-bbolt and go-etcd-io-bbolt are the same version and source
packages. This change removes go-etcd-io-bbolt and keeps
go-go-etcd-io-bbolt.
* gnu/packages/configuration-management.scm (chezmoi) [native-inputs]:
Add go-go-etcd-io-bbolt. Remove go-etcd-io-bbolt.
* gnu/packages/golang.scm (go-etcd-io-bbolt): Remove variable.
Co-authored-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Change-Id: I482f22b77b61d4761390742db2ced570cd4de3bd
**tl;dr** Applying this patch makes Cabal work in Guix environments
and ensures that Cabal picks up Haskell packages installed via Guix.
Guix makes heavy use of GHC_PACKAGE_PATH to make GHC pickup Haskell
packages installed via the Guix package manager. The environment
variable is set using native-search-paths from the GHC packages.
Unfortunately, upstream Cabal does presently not respect
GHC_PACKAGE_PATH. If this environment variable is set, `cabal build`
and other commands will terminate. For building packages, Guix does
not make much use of cabal-install hence this is not as big of an
issue. However, cabal-install does therefore presently not work
out-of-the-box in environments created by Guix. For example,
in `guix shell` environments. This makes it essentially impossible
to use Guix for setting up development environments for Haskell software.
Cabal upstream is aware of this issue and a patch exists to workaround
this problem. The patch is currently not merged upstream due to issues
related to reconfiguration (changing GHC_PACKAGE_PATH between `cabal
configure` and `cabal build`). However, I would argue that this edge
case is not that relevant for Guix and therefore propose including
this patch with the Cabal Guix package. As outlined above, cabal-install
is not usable by default presently, and I would therefore argue that
this is a major improvement over the current situation. I am willing to
work with Cabal upstream to have this issue fixed upstream eventually.
Note that this requires patching the GHC package instead of the
cabal-install package as Guix uses the version of the Cabal package
<https://hackage.haskell.org/package/Cabal> distributed with GHC.
See: https://github.com/haskell/cabal/issues/3728
* gnu/packages/haskell-apps.scm (cabal-install): Include patch
to support the GHC_PACKAGE_PATH environment variable.
Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
Signed-off-by: Lars-Dominik Braun <lars@6xq.net>
Change-Id: Ib77ffa937b878690d0e2d8964b534842b99da039
* gnu/packages/patches/flatpak-fix-fonts-icons.patch: New patch.
* gnu/packages/package-management.scm(flatpak): Use it.
* gnu/local.mk(dist_patch_DATA): Register it.
Change-Id: I0359d0d9bf10120a8b784c910c50d0e4a9b7a616
* gnu/packages/golang.scm (go-github-com-dlclark-regexp2): Move from
here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I0e355d6d21c604d89c623eaf9c5276c61b40d4c6
* gnu/packages/golang.scm (go-github-com-klauspost-cpuid): Move from
here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I85bc873816f653bf5e4ce2882259708d5f37ca28
* gnu/packages/golang-xyz.scm (go-github-com-masterminds-semver): Rename
to go-github-com-masterminds-semver-v3.
[arguments]: <#:import-path>: Reflect import path as seen in go.mod.
* gnu/packages/golang-xyz.scm (go-github-com-masterminds-sprig)
[propagated-inputs]: Replace go-github-com-masterminds-semver with
go-github-com-masterminds-semver-v3.
Change-Id: I43f2231241f02b6f2f01f89f98a72f29929b9376
* gnu/packages/golang.scm (go-github-com-masterminds-semver): Move from
here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I267210f30143c29fe1927e7fbf9ae8cdff633092
* gnu/packages/golang-xyz.scm (go-github-com-masterminds-sprig): Rename
to go-github-com-masterminds-sprig-v3.
[arguments]: <#:import-path>: Reflect import path as seen in go.mod.
* gnu/packages/configuration-management.scm (chezmoi) [native-inputs]:
Replace go-github-com-masterminds-sprig with
go-github-com-masterminds-sprig-v3.
Change-Id: I2d171ff9f719e6664266723ae0483f73cef343c5
* gnu/packages/configuration-management.scm (chezmoi): Use G-expressions
and list style, re-indent.
[arguments]: <#:go>: Set to go-1.21.
Change-Id: I5a7a4deffcd8b9102614b3f628a7ddd33ee82633
* gnu/packages/golang.scm (go-github-com-masterminds-sprig): Move from
here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I424ea6887286bdaee67b3f367024c6d7982bcbd2
* gnu/packages/golang-compression.scm (go-github-com-nwaples-rardecode-v2):
Rename as seen in go.mod to go-github-com-nwaples-rardecode.
Change-Id: Id492ee6c4e5aebdbec9487b6990e2c5fa5dfe62c
