From patchwork Sat Feb 10 21:29:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 59984 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 6E81427BBEA; Sat, 10 Feb 2024 22:01:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 5F6BF27BBE9 for ; Sat, 10 Feb 2024 22:01:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYvOz-00051O-LC; Sat, 10 Feb 2024 17:00:49 -0500 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 1rYvOy-00051G-6t for guix-patches@gnu.org; Sat, 10 Feb 2024 17:00:48 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rYvOx-0000Sl-Ua for guix-patches@gnu.org; Sat, 10 Feb 2024 17:00:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rYvPD-000661-Kq for guix-patches@gnu.org; Sat, 10 Feb 2024 17:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69015] [PATCH 2/3] gnu: go-etcd-io-bbolt: Move to (gnu packages golang-xyz). References: <87bk8ob6cd.fsf@troyfigiel.com> In-Reply-To: <87bk8ob6cd.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Feb 2024 22:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69015@debbugs.gnu.org Received: via spool by 69015-submit@debbugs.gnu.org id=B69015.170760242918456 (code B ref 69015); Sat, 10 Feb 2024 22:01:03 +0000 Received: (at 69015) by debbugs.gnu.org; 10 Feb 2024 22:00:29 +0000 Received: from localhost ([127.0.0.1]:45076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYvOe-0004mV-VV for submit@debbugs.gnu.org; Sat, 10 Feb 2024 17:00:29 -0500 Received: from mout-p-201.mailbox.org ([2001:67c:2050:0:465::201]:53576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYvOc-0004OR-Dq for 69015@debbugs.gnu.org; Sat, 10 Feb 2024 17:00:27 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4TXPlk2dPwz9spF for <69015@debbugs.gnu.org>; Sat, 10 Feb 2024 23:00:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1707602402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IvC/Dju1JCJYnrg16NVsWWzgFnUoq9Xr7danUXzY3KE=; b=fPWGrIk/JgVH+eEA6EL5wj8+HqZFLZ9PGnYkuJwZnKH1IiO1nqO2LRrRhB1NT3JB9CA5vc EDczzT4r/4FXrBoTpPupPpP7qpW6CWsolYyFSzuPVPUt7+v0W0AxsXNlSOGXbKYGbTKssX TSSitDZYqgVgkn1sMLCmZ7xsOx0umqw3x2bBCEANFC/i7aHdW6qKsQryBcawcv3XJcannb BfGFuznl/OpkkAUer12somqc+y5ewOvVOBh0i3aCUqwouSzqfUNgJY5BGFwkYWfm0yDDsM BdzbwUpY/Hv21ZRDFLlOMxZl5CYXvNKPv1ysI09MtYkYfYPzGc5fXSvenj3Ppg== From: Troy Figiel Date: Sat, 10 Feb 2024 22:29:42 +0100 Message-ID: <87y1bs9dzy.fsf@troyfigiel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4TXPlk2dPwz9spF 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 * gnu/packages/configuration-management.scm: Add (gnu packages golang-xyz) to used modules. * gnu/packages/databases.scm (go-etcd-io-bbolt): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-xyz.scm | 26 +++++++++++++++++++++++ gnu/packages/golang.scm | 23 -------------------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 296f48dcd5..aedf4f38e4 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -22,6 +22,7 @@ (define-module (gnu packages configuration-management) #:use-module (guix git-download) #:use-module (gnu packages golang) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d52cbedd9c..fe46a87093 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1,4 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Benjamin ;;; Copyright © 2023 Thomas Ieong @@ -39,6 +42,29 @@ (define-module (gnu packages golang-xyz) ;;; ;;; Code: +(define-public go-etcd-io-bbolt + (package + (name "go-etcd-io-bbolt") + (version "1.3.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etcd-io/bbolt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) + (build-system go-build-system) + (arguments + `(#:import-path "go.etcd.io/bbolt")) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://pkg.go.dev/go.etcd.io/bbolt/") + (synopsis "Low-level key/value store in Go") + (description "This package implements a low-level key/value store in Go.") + (license license:expat))) + (define-public go-github-com-djherbis-atime (package (name "go-github-com-djherbis-atime") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 163691a1e6..5d3b39d1a9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9328,29 +9328,6 @@ (define-public go-github-com-zclconf-go-cty configuration languages, but other uses may be possible too.") (license license:expat))) -(define-public go-etcd-io-bbolt - (package - (name "go-etcd-io-bbolt") - (version "1.3.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/etcd-io/bbolt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) - (build-system go-build-system) - (arguments - `(#:import-path "go.etcd.io/bbolt")) - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://pkg.go.dev/go.etcd.io/bbolt/") - (synopsis "Low-level key/value store in Go") - (description "This package implements a low-level key/value store in Go.") - (license license:expat))) - (define-public go-github-com-bwesterb-go-ristretto (package (name "go-github-com-bwesterb-go-ristretto")