From patchwork Mon Feb 12 18:48:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60233 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 3E48F27BBEA; Mon, 12 Feb 2024 18:51:40 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable 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 F2AB627BBE2 for ; Mon, 12 Feb 2024 18:51:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbNV-0008G9-24; Mon, 12 Feb 2024 13:50:05 -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 1rZbNK-0008BX-6d for guix-patches@gnu.org; Mon, 12 Feb 2024 13:49:55 -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 1rZbNC-0006Nv-73 for guix-patches@gnu.org; Mon, 12 Feb 2024 13:49:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbNT-0001aZ-3E; Mon, 12 Feb 2024 13:50:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 04/30] gnu: go-github-com-golang-snappy: Mmove to golang-compression. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 12 Feb 2024 18:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69042@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 69042-submit@debbugs.gnu.org id=B69042.17077637685754 (code B ref 69042); Mon, 12 Feb 2024 18:50:03 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:49:28 +0000 Received: from localhost ([127.0.0.1]:49252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbMs-0001US-H6 for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:28 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:50177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbMo-0001Sk-DQ for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:23 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-33b86bc4bbaso526110f8f.0 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707763739; x=1708368539; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9RQC8Nb93t3X0vJ/n/965IzlsCO4ziojJCO2+Sc7yRg=; b=bEQ/zIo4lR2zRBJazuDv0n0TbfLqwC/C8+Wfq4sa81flgWASk4ip8mhR0kckT7+jaq nV8Wc4mZ/qp3mP0Vjg1C/uuEJnZi1gWEcl2VV7zk9tQrYZ9H96xMnjclG+0PrR7Y5ejk fU8kCzBRX18S19Gby2YETuWB0M6Vtl3FiZkMndthvQzKoOUhNshDaGPoQrq7os3CAdz9 CaqlGtGq7bhxIJiHEFzHCaJhrvW0Ec5ruZqj7ha3C7spbVfAxvOTYidPR/SPLRo0vk18 ong48Rgc4Q4JYv2syzwDn+D5QkpfLklOrgxZQZ7PYMbmQVabgwsj5m9wo4Mt++dMu3JS ApRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707763739; x=1708368539; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9RQC8Nb93t3X0vJ/n/965IzlsCO4ziojJCO2+Sc7yRg=; b=GRMivsOwiZe2MnWNReeI3d8iABraM5Obc8ZzIqvB1ViBN9buy+f9i3v9J01w5v38g2 +Y/C44hgmWZ+UdY+3T0ZK8C5tNMqjzZ5YIVGg3kUF5KDRUYLvgQBUmB66kpzUz1UxUq4 iFkwZi4wnPlL4VYuyj3/A0uQ5kNvtj02r2z/zXxE/tWEtnHeQqFWzo1wcnm219nWI78u S93oRv1J8uLshQeCvhnBPz39Zy28SAs7UBK1tAMu44gBfYb/ePXHez0q2weNgJkwSBbJ n/WrfB/yADD4xB32JUtlu2mQYAfk/g1jgChpURMGskkYIWF0SAe4paeHmas9r91CL65C 0/TQ== X-Gm-Message-State: AOJu0YxhhjIknnUGywcj3jmyaFZJcjEpux8Hb03M4Kj9layU/GWfi3ch uj0ckGynRISttPsRa7xHx3vTsAWJ4aNH1et79yempmkoyIZ7pPvNUUGRYPLlxtA= X-Google-Smtp-Source: AGHT+IH5e9kvSxS3wYrOSBRHPw3jPhNy2ZVeBZQsjaztq+9vw5zlvwMuJWOAdryp+WpYjIvO8JmB5w== X-Received: by 2002:a05:6000:12ce:b0:33b:4acd:2edd with SMTP id l14-20020a05600012ce00b0033b4acd2eddmr5423511wrx.14.1707763739572; Mon, 12 Feb 2024 10:48:59 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id v5-20020a5d59c5000000b0033b74a3dcf9sm6423510wry.27.2024.02.12.10.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:48:59 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:21 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/syncthing.scm (go-github-com-golang-snappy): Move from here ... * gnu/packages/golang-compression.scm: ... to here. * gnu/packages/golang.scm: Add (gnu packages golang-compression) module. * gnu/packages/high-availability.scm: As above. * gnu/packages/ipfs.scm: As above. * gnu/packages/syncthing.scm: As above. Change-Id: I936c82c127e1aa25dde20693bee70e5a871249fe --- gnu/packages/golang-compression.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 1 + gnu/packages/high-availability.scm | 4 ++-- gnu/packages/ipfs.scm | 1 + gnu/packages/syncthing.scm | 24 +----------------------- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 268cd16e30..670572ea90 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -1,4 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2021 Arun Isaac +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +33,29 @@ (define-module (gnu packages golang-compression) ;;; ;;; Code: +(define-public go-github-com-golang-snappy + (package + (name "go-github-com-golang-snappy") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/snappy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j")) + (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/golang/snappy")) + (home-page "https://github.com/golang/snappy") + (synopsis "Snappy compression format in the Go programming language") + (description "This package provides a Go implementation of the Snappy +compression format.") + (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 3997f4057d..43e9024167 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -83,6 +83,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages lua) diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 9760084603..ad18a39738 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -36,6 +36,7 @@ (define-module (gnu packages high-availability) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) @@ -48,7 +49,6 @@ (define-module (gnu packages high-availability) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages rsync) - #:use-module (gnu packages syncthing) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages version-control) @@ -284,7 +284,7 @@ (define-public nsq go-github-com-bmizerany-perks-quantile go-github-com-burntsushi-toml go-github-com-davecgh-go-spew - go-github-com-golang-snappy ; Move to (gnu packages golang) + go-github-com-golang-snappy go-github-com-julienschmidt-httprouter go-github-com-mreiferson-go-options go-github-com-mreiferson-go-svc diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index ae514cd93b..f09d0190dd 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -31,6 +31,7 @@ (define-module (gnu packages ipfs) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages python) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 4c3aa8f30b..c0270b87e5 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -38,6 +38,7 @@ (define-module (gnu packages syncthing) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) #:use-module (gnu packages python-crypto) @@ -398,29 +399,6 @@ (define-public go-github-com-golang-groupcache-lru (home-page "https://github.com/golang/groupcache") (license asl2.0)))) -(define-public go-github-com-golang-snappy - (package - (name "go-github-com-golang-snappy") - (version "0.0.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/snappy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j")) - (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/golang/snappy")) - (synopsis "Snappy compression format in the Go programming language") - (description "This package provides a Go implementation of the Snappy -compression format.") - (home-page "https://github.com/golang/snappy") - (license bsd-3))) - (define-public go-github-com-jackpal-gateway (package (name "go-github-com-jackpal-gateway")