1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-14 19:10:49 +02:00

gnu: go-google-golang-org-protobuf: Move to golang-build.

* gnu/packages/golang.scm (go-google-golang-org-protobuf): Move from
here ...
* gnu/packages/golang-build.scm: ... to here.

Change-Id: Icf7676ac6288391631e83dc172a82529f1105cb2
This commit is contained in:
Sharlatan Hellseher 2024-07-21 12:05:58 +01:00
parent 4714623e05
commit 3750e11a8d
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
2 changed files with 51 additions and 50 deletions

View file

@ -11,11 +11,13 @@
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
@ -765,6 +767,55 @@ Go programming language.")
1.13 error values.")
(license license:bsd-3))))
(define-public go-google-golang-org-protobuf
(package
(name "go-google-golang-org-protobuf")
(version "1.31.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://go.googlesource.com/protobuf")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"))))
(build-system go-build-system)
(arguments
(list
#:import-path "google.golang.org/protobuf"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda* (#:key tests? unpack-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" unpack-path)
(substitute* (find-files "." "\\_test.go$")
;; XXX Failing on i686-linux:
;; panic: unaligned 64-bit atomic operation
(("TestDynamicTypesExtensionNotFound")
"OffTestDynamicTypesExtensionNotFound")
(("TestDynamicTypesFilesChangeAfterCreation")
"OffTestDynamicTypesFilesChangeAfterCreation")
(("TestDynamicTypesFindExtensionByNameOrNumber")
"OffTestDynamicTypesFindExtensionByNameOrNumber")))))
;; XXX: Workaround for go-build-system's lack of Go modules
;; support.
(delete 'build)
(replace 'check
(lambda* (#:key tests? import-path #:allow-other-keys)
(when tests?
(with-directory-excursion (string-append "src/" import-path)
(invoke "go" "test" "-v" "./..."))))))))
(propagated-inputs (list go-github-com-google-go-cmp))
(home-page "https://google.golang.org/protobuf")
(synopsis "Go library for Protocol Buffers")
(description
"The protobuf package provides a Go implementation of Protocol Buffers, a
language and platform neutral, extensible mechanism for serializing structured
data. It is a successor to @code{go-github-com-golang-protobuf} with an
improved and cleaner API.")
(license license:bsd-3)))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar

View file

@ -6200,56 +6200,6 @@ data serialization format.")
(home-page "https://github.com/golang/protobuf")
(license license:bsd-3)))
(define-public go-google-golang-org-protobuf
(package
(name "go-google-golang-org-protobuf")
(version "1.31.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://go.googlesource.com/protobuf")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"))))
(build-system go-build-system)
(arguments
(list #:import-path "google.golang.org/protobuf"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda* (#:key tests? unpack-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" unpack-path)
(substitute* (find-files "." "\\_test.go$")
;; XXX Failing on i686-linux:
;; panic: unaligned 64-bit atomic operation
(("TestDynamicTypesExtensionNotFound")
"OffTestDynamicTypesExtensionNotFound")
(("TestDynamicTypesFilesChangeAfterCreation")
"OffTestDynamicTypesFilesChangeAfterCreation")
(("TestDynamicTypesFindExtensionByNameOrNumber")
"OffTestDynamicTypesFindExtensionByNameOrNumber")))))
;; XXX: Workaround for go-build-system's lack of Go modules
;; support.
(delete 'build)
(replace 'check
(lambda* (#:key tests? import-path #:allow-other-keys)
(when tests?
(with-directory-excursion (string-append "src/" import-path)
(invoke "go" "test" "-v" "./..."))))))))
(propagated-inputs (list go-github-com-google-go-cmp))
(home-page "https://google.golang.org/protobuf")
(synopsis "Go library for Protocol Buffers")
(description
"The protobuf package provides a Go implementation of Protocol Buffers, a
language and platform neutral, extensible mechanism for serializing structured
data.
This package is a successor to @code{go-github-com-golang-protobuf} with an
improved and cleaner API.")
(license license:bsd-3)))
(define-public go-github-com-macronut-go-tproxy
(package
(name "go-github-com-macronut-go-tproxy")