[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/74: gnu: go-google-golang-org-protobuf: Move to golang-build.
From: |
guix-commits |
Subject: |
12/74: gnu: go-google-golang-org-protobuf: Move to golang-build. |
Date: |
Thu, 25 Jul 2024 18:02:21 -0400 (EDT) |
sharlatan pushed a commit to branch go-team
in repository guix.
commit 3750e11a8dfb0ae9f34db348e4d7cd7ce1e16e26
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Sun Jul 21 12:05:58 2024 +0100
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
---
gnu/packages/golang-build.scm | 51 +++++++++++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 50 ------------------------------------------
2 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index a8f4cbeb20..f66fe16bd0 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -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
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3e30cdf53f..4ca8c87cb2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -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")
- 57/74: gnu: go-github-com-nbrownus-go-metrics-prometheus: Move to prometheus., (continued)
- 57/74: gnu: go-github-com-nbrownus-go-metrics-prometheus: Move to prometheus., guix-commits, 2024/07/25
- 70/74: gnu: go-github-com-bits-and-blooms-bloom: Update to 3.7.0., guix-commits, 2024/07/25
- 62/74: gnu: go-netns: Update to 0.0.4., guix-commits, 2024/07/25
- 39/74: gnu: Add go-github-com-mwitkow-go-conntrack., guix-commits, 2024/07/25
- 50/74: gnu: go-github-com-cespare-xxhash: Rename variable., guix-commits, 2024/07/25
- 66/74: gnu: go-netlink: Update to 1.1.0., guix-commits, 2024/07/25
- 74/74: gnu: yggdrasil: Enable tests., guix-commits, 2024/07/25
- 73/74: gnu: yggdrasil: Adjust inputs., guix-commits, 2024/07/25
- 04/74: gnu: go-github-com-coreos-go-oidc-v3: Update to 3.11.0., guix-commits, 2024/07/25
- 08/74: gnu: go-github-com-google-go-cmp-cmp: Rename variable., guix-commits, 2024/07/25
- 12/74: gnu: go-google-golang-org-protobuf: Move to golang-build.,
guix-commits <=
- 13/74: gnu: go-github-com-golang-protobuf: Move to golang-build., guix-commits, 2024/07/25
- 23/74: gnu: go-github-com-go-test-deep: Update to 1.1.1., guix-commits, 2024/07/25
- 25/74: gnu: go-github-com-burntsushi-toml: Update to 1.4.0., guix-commits, 2024/07/25
- 20/74: gnu: go-go-etcd-io-gofail: Update to 0.2.0., guix-commits, 2024/07/25
- 28/74: gnu: go-github-com-aws-aws-sdk-go: Update to 1.55.2., guix-commits, 2024/07/25
- 27/74: gnu: Remove go-github-com-aws-sdk., guix-commits, 2024/07/25
- 32/74: gnu: nebula: Update to 1.9.3., guix-commits, 2024/07/25
- 35/74: gnu: go-github-com-prometheus-client-model: Move to prometheus., guix-commits, 2024/07/25
- 40/74: gnu: Add go-github-com-go-logfmt-logfmt., guix-commits, 2024/07/25
- 45/74: gnu: go-github-com-prometheus-common: Move to prometheus., guix-commits, 2024/07/25