From patchwork Fri Apr 21 19:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Wilken X-Patchwork-Id: 49354 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6C9B527BBEA; Fri, 21 Apr 2023 20:56:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EC8E227BBE2 for ; Fri, 21 Apr 2023 20:56:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppwrU-0001fM-QE; Fri, 21 Apr 2023 15:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppwrS-0001eh-Mz for guix-patches@gnu.org; Fri, 21 Apr 2023 15:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppwrS-0001wm-FD for guix-patches@gnu.org; Fri, 21 Apr 2023 15:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppwrS-0003FR-AI for guix-patches@gnu.org; Fri, 21 Apr 2023 15:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63003] [PATCH 1/3] gnu: Move golang dependencies to (gnu packages golang). References: <20230421195311.9345-1-guix@twilken.net> In-Reply-To: <20230421195311.9345-1-guix@twilken.net> Resent-From: Timo Wilken Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2023 19:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63003 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63003@debbugs.gnu.org Cc: Timo Wilken Received: via spool by 63003-submit@debbugs.gnu.org id=B63003.168210694812427 (code B ref 63003); Fri, 21 Apr 2023 19:56:02 +0000 Received: (at 63003) by debbugs.gnu.org; 21 Apr 2023 19:55:48 +0000 Received: from localhost ([127.0.0.1]:41196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppwrC-0003E2-Lz for submit@debbugs.gnu.org; Fri, 21 Apr 2023 15:55:48 -0400 Received: from mx1.mythic-beasts.com ([46.235.224.141]:48859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppwrA-0003D7-BM for 63003@debbugs.gnu.org; Fri, 21 Apr 2023 15:55:45 -0400 Received: by mailhub-cam-d.mythic-beasts.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ppwr4-001yrJ-1X; Fri, 21 Apr 2023 20:55:38 +0100 From: Timo Wilken Date: Fri, 21 Apr 2023 21:55:13 +0200 Message-Id: <20230421195515.10316-1-guix@twilken.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BlackCat-Spam-Score: 49 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches These packages are needed by syncthing and the new restic-rest-server package, so put them in (gnu packages golang) instead. * gnu/packages/syncthing.scm (go-github-com-prometheus-common, go-github-com-prometheus-procfs, go-github-com-prometheus-client-golang): Delete variables. * gnu/packages/golang.scm (go-github-com-prometheus-common, go-github-com-prometheus-procfs, go-github-com-prometheus-client-golang): Move deleted variables here. --- gnu/packages/golang.scm | 90 ++++++++++++++++++++++++++++++++++++++ gnu/packages/syncthing.scm | 90 -------------------------------------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 24dae34e20..cca5aacdb6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9497,6 +9497,96 @@ (define-public go-github-com-godbus-dbus bindings for the D-Bus message bus system.") (license license:bsd-2))) +(define-public go-github-com-prometheus-common + (package + (name "go-github-com-prometheus-common") + (version "0.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/common") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/common" + #:tests? #f + #:phases + (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (propagated-inputs + (list go-github-com-golang-protobuf-proto + go-github-com-matttproud-golang-protobuf-extensions-pbutil + go-github-com-prometheus-client-model)) + (synopsis "Prometheus metrics") + (description "This package provides tools for reading and writing +Prometheus metrics.") + (home-page "https://github.com/prometheus/common") + (license license:asl2.0))) + +(define-public go-github-com-prometheus-procfs + (package + (name "go-github-com-prometheus-procfs") + (version "0.0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/procfs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/procfs" + ;; The tests require Go modules, which are not yet supported in Guix's + ;; Go build system. + #:tests? #f)) + (synopsis "Go library for reading @file{/proc}") + (description "The @code{procfs} Go package provides functions to retrieve +system, kernel, and process metrics from the @file{/proc} pseudo file system.") + (home-page "https://github.com/prometheus/procfs") + (license license:asl2.0))) + +(define-public go-github-com-prometheus-client-golang + (package + (name "go-github-com-prometheus-client-golang") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/client_golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zs49psk23n9z8wrl02d5vib5wclpym8kaxcy6n5pk696i419065")))) + (build-system go-build-system) + (arguments + '(#:tests? #f + #:import-path "github.com/prometheus/client_golang" + #:phases + (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (propagated-inputs + (list go-github-com-beorn7-perks-quantile + go-github-com-golang-protobuf-proto + go-github-com-prometheus-client-model + go-github-com-prometheus-common + go-github-com-prometheus-procfs + go-github-com-cespare-xxhash)) + (synopsis "HTTP server and client tools for Prometheus") + (description "This package @code{promhttp} provides HTTP client and +server tools for Prometheus metrics.") + (home-page "https://github.com/prometheus/client_golang") + (license license:asl2.0))) + (define-public go-github-com-zalando-go-keyring (package (name "go-github-com-zalando-go-keyring") diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c4204f32fe..dd54100ce6 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -877,96 +877,6 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil (home-page "https://github.com/matttproud/golang_protobuf_extensions") (license asl2.0)))) -(define-public go-github-com-prometheus-common - (package - (name "go-github-com-prometheus-common") - (version "0.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/common") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/common" - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-github-com-golang-protobuf-proto - go-github-com-matttproud-golang-protobuf-extensions-pbutil - go-github-com-prometheus-client-model)) - (synopsis "Prometheus metrics") - (description "This package provides tools for reading and writing -Prometheus metrics.") - (home-page "https://github.com/prometheus/common") - (license asl2.0))) - -(define-public go-github-com-prometheus-procfs - (package - (name "go-github-com-prometheus-procfs") - (version "0.0.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/procfs") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/procfs" - ;; The tests require Go modules, which are not yet supported in Guix's - ;; Go build system. - #:tests? #f)) - (synopsis "Go library for reading @file{/proc}") - (description "The @code{procfs} Go package provides functions to retrieve -system, kernel, and process metrics from the @file{/proc} pseudo file system.") - (home-page "https://github.com/prometheus/procfs") - (license asl2.0))) - -(define-public go-github-com-prometheus-client-golang - (package - (name "go-github-com-prometheus-client-golang") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/client_golang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zs49psk23n9z8wrl02d5vib5wclpym8kaxcy6n5pk696i419065")))) - (build-system go-build-system) - (arguments - '(#:tests? #f - #:import-path "github.com/prometheus/client_golang" - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-github-com-beorn7-perks-quantile - go-github-com-golang-protobuf-proto - go-github-com-prometheus-client-model - go-github-com-prometheus-common - go-github-com-prometheus-procfs - go-github-com-cespare-xxhash)) - (synopsis "HTTP server and client tools for Prometheus") - (description "This package @code{promhttp} provides HTTP client and -server tools for Prometheus metrics.") - (home-page "https://github.com/prometheus/client_golang") - (license asl2.0))) - (define-public go-github-com-go-asn1-ber-asn1-ber (package (name "go-github-com-go-asn1-ber-asn1-ber")