From patchwork Sun Feb 11 10:52:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60013 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 647A727BBE9; Sun, 11 Feb 2024 10:54:01 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,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 A155927BBE2 for ; Sun, 11 Feb 2024 10:53:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7T1-0003ZA-VS; Sun, 11 Feb 2024 05:53:47 -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 1rZ7T1-0003Z1-4H for guix-patches@gnu.org; Sun, 11 Feb 2024 05:53:47 -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 1rZ7T0-0005UA-Sv for guix-patches@gnu.org; Sun, 11 Feb 2024 05:53:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7TG-0005LY-Sh; Sun, 11 Feb 2024 05:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 04/30] gnu: go-github-com-golang-snappy: Mmove to (gnu packages 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: Sun, 11 Feb 2024 10:54:02 +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.170764883820523 (code B ref 69042); Sun, 11 Feb 2024 10:54:02 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:53:58 +0000 Received: from localhost ([127.0.0.1]:38330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TB-0005Ko-1A for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:53:58 -0500 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:56713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7T8-0005KD-Gf for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:53:55 -0500 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-51147d0abd1so2578845e87.1 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707648812; x=1708253612; 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=Rz1dBDvU6OX2YMsGa2NDdtqfdJL/hqxh7HMC6hqCWMSTD7MSj5v7m8zF0ciU+/fQ0d NlBevGt8sDQmgmRK3PfLlkyWl1fjaFzz1NhanSoOa3+k6kbDhtPe/GrsQ2ujCgbURiWr UuBJAWYZI9Usf+PGbnu8ZD52aP3bsqQy0LXJ6L1Y9+lNtS4gOIBcpDqyM+/MegHJjZoc FoYSecAfJCFybIYWZ5lXh0RVTZMF/DD55v2KJbwAVgYjkF23hXeCrjFHFqv4OQ+31I1h qu+ibcVBiH5G6xQwqbcHlkCsTPyXAWHbWR2XNLK5pnX14ZFUqXgM+faWF4sqkRZqCiEz pW1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707648812; x=1708253612; 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=dwLHpjkHdw+CKog6j1AVSutbfqy7D4f0zIBjGsRrFL5j9q/BndBlHCP9Z2l2hW7JM/ U4EtmC0Vi7pmbnDv2iHNO4e8wUv6150FTn0lwKYQS12vlRdC/dbAbp3WlA+h9H8mLcIb dUC6yjahXhD37ZVcAhcFgig2bsL0XqJvJok+Ura6gUJ2pSfRKxt5JXYO1/+W6BMZlqOL Hzob1UxOzdPLaoiK+tbSHD7evCjqG6hPAkY8FHmU2svkBu7Ywt4zS7/00j2mkx0qNNzP U2uamO6fKQnuZLslMzdYTkcSPz8RtqyuY2rhvILt0TIq8zzZGSHCpl2GDkUHS3Nl781Y 7G1g== X-Gm-Message-State: AOJu0YyuNEhHLEtjqdt9D8d3VCz+gV3qvrtWBi/UBIVnYseE/0fSkNk/ y5Ro2VJejnxqwtnqlwEBIC/SiQ9hSOQKAzxuYir6RQbOpP4XT0d7Ohfzp9LqRIU= X-Google-Smtp-Source: AGHT+IEjX6GxBX/kYIxuzat0PxohuC7yTqquWLXLLRfw0GCYUnp28i6Ehrm6TUO0s926DwvJbIy0jg== X-Received: by 2002:ac2:4288:0:b0:510:323d:6402 with SMTP id m8-20020ac24288000000b00510323d6402mr2317308lfh.45.1707648811989; Sun, 11 Feb 2024 02:53:31 -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 i19-20020a05600c355300b0040ff2933959sm5562615wmq.7.2024.02.11.02.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:31 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:52:53 +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")