From patchwork Mon Feb 12 18:48:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60220 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 9EADD27BBEA; Mon, 12 Feb 2024 18:50:35 +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=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 5FE5027BBE9 for ; Mon, 12 Feb 2024 18:50:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbNU-0008G8-K7; Mon, 12 Feb 2024 13:50:04 -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 1rZbNP-0008F3-Vg for guix-patches@gnu.org; Mon, 12 Feb 2024 13:50:00 -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 1rZbNM-0006QM-Q0 for guix-patches@gnu.org; Mon, 12 Feb 2024 13:49:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbNd-0001d8-LZ; Mon, 12 Feb 2024 13:50:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 28/30] gnu: go-github-com-klauspost-compress: Move 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:13 +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.17077638116233 (code B ref 69042); Mon, 12 Feb 2024 18:50:13 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:50:11 +0000 Received: from localhost ([127.0.0.1]:49354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbNZ-0001cD-Si for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:50:11 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:56576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbN6-0001WD-PS for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:42 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-411adaa8d13so1649805e9.1 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707763758; x=1708368558; 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=iwpkzcMwQBtmsQN7ASgqY0ZYuZByJotboDgX/f3ktWA=; b=PFajr2dNdjl3L6RNMdsQuTx5ZQ0fY/mycyZ3Nzg2TNxSHwbdySk/1HFlUIRv6toAH6 NFfcg9873zl0gtkKYBDzv8nJ2hXMq5n4m8hLhVjJVjtBsLYozI5qbuT4ybO5pmU+DcQV A65izrx9hccM6TyCDwsT6jV2srB2Uennevgfag+F6EWH28QksOExsjqA4PYSdjMQ8ubR TRLypn8ml5wXLxS0WqJdBcF49D2IO+b5nl/LDI+7bieqgtMzLePjZmBQoOmd0ZW47W61 lAHChnH51C5+xm288PcDOM6mj0dPPS/5ERihyGrBpFetMjTLtvlAXrmF+w7H8aE/wmP1 hOjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707763758; x=1708368558; 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=iwpkzcMwQBtmsQN7ASgqY0ZYuZByJotboDgX/f3ktWA=; b=GMwPd1b2WY6G3fDlBtkmzJ3mOHxk+QAzkOnf4IgtvyVDibIn9hX3Ru19HW/AlnXn51 TNjQAqNZ6k6dSDD1GSlc7mwYicLnUudshibls1E5yCpsz1juskdb6psfUjP71LwoxbI/ 4poTyNvTZTuM+kODpag0kBawUEyRZWBjh9GfrX0W0axh2f1vvGFQVoP8DkIFDULxZ/v0 Ot2F2LShknYnur6YE2C6E8RSceGJgZMLxY4jlyCczHwksXHxJDYuTOev7PkGnyRxHqfa A3z1YuPr9ikOb3HdSBuEhVXUEefw5PIqFRWbfICf63FHUWiUa7W3ERb+D0zTgrVbpgTN RY5w== X-Gm-Message-State: AOJu0YwOWNU0dFD9182a49LWuyatKcYh604jQgZ7ez35YqmymHbZkISQ CoSjusu/4FSFwYslfEwyol4GDquOjrEqYojvOYnAgja9RfJ1/kdyVNCp1J/rPVI= X-Google-Smtp-Source: AGHT+IEGSGuTR0jnkWH6sG5od1CIlPSnlogRYnaSJQDYzIZOtp2vpxfs7U/gqAufOmJ+pYbOJOgKqA== X-Received: by 2002:a5d:5151:0:b0:33b:1cb9:ca19 with SMTP id u17-20020a5d5151000000b0033b1cb9ca19mr4688049wrt.23.1707763758027; Mon, 12 Feb 2024 10:49:18 -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.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:49:17 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:45 +0000 Message-ID: <18189b3a497162b1e050709116224c2b5ceb9159.1707763691.git.sharlatanus@gmail.com> 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/golang.scm (go-github-com-klauspost-compress): Move from here ... * gnu/packages/golang-compression.scm: ... to here. * gnu/packages/golang-compression.scm: Add (gnu packages golang-compression) module. * gnu/packages/golang-crypto.scm: As above. * gnu/packages/golang-web.scm: As above. * gnu/packages/uucp.scm: As above. Change-Id: Ia99f1e6aae7f75940fc150eb02862c0b3e9f3325 --- gnu/packages/golang-compression.scm | 31 ++++++++++++++++++++++++++++ gnu/packages/golang-crypto.scm | 3 ++- gnu/packages/golang-web.scm | 1 + gnu/packages/golang.scm | 32 ----------------------------- gnu/packages/uucp.scm | 1 + 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 670572ea90..5aacc34a66 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -56,6 +56,37 @@ (define-public go-github-com-golang-snappy compression format.") (license license:bsd-3))) +(define-public go-github-com-klauspost-compress + (package + (name "go-github-com-klauspost-compress") + (version "1.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/compress") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/klauspost/compress" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'fix-permissions + (lambda* (#:key outputs #:allow-other-keys) + ;; Provide write permissions on gzip files so that + ;; reset-gzip-timestamps has sufficient permissions. + (for-each make-file-writable + (find-files (assoc-ref outputs "out") ".gz$"))))))) + (propagated-inputs + (list go-github-com-golang-snappy)) + (home-page "https://github.com/klauspost/compress") + (synopsis "Go compression library") + (description "@code{compress} provides various compression algorithms.") + (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-crypto.scm b/gnu/packages/golang-crypto.scm index 39e7412558..58fd9cb250 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -45,7 +45,8 @@ (define-module (gnu packages golang-crypto) #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) - #:use-module (gnu packages golang-check)) + #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression)) ;;; Commentary: ;;; diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d7fb7dd366..28a9fad113 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -50,6 +50,7 @@ (define-module (gnu packages golang-web) #: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-xyz) #:use-module (gnu packages tls) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e473c0880b..24ca39fc58 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9477,38 +9477,6 @@ (define-public go-github-com-dustin-go-humanize back.") (license license:expat))) -(define-public go-github-com-klauspost-compress - (package - (name "go-github-com-klauspost-compress") - (version "1.13.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/klauspost/compress") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/klauspost/compress" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'fix-permissions - (lambda* (#:key outputs #:allow-other-keys) - ;; Provide write permissions on gzip files so that - ;; reset-gzip-timestamps has sufficient permissions. - (for-each make-file-writable - (find-files (assoc-ref outputs "out") ".gz$"))))))) - (propagated-inputs - (list go-github-com-golang-snappy)) - (home-page "https://github.com/klauspost/compress") - (synopsis "Go compression library") - (description "@code{compress} provides various compression algorithms.") - (license license:bsd-3))) - (define-public go-github-com-oneofone-xxhash (package (name "go-github-com-oneofone-xxhash") diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index 8f1759556e..8e47834fef 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -20,6 +20,7 @@ (define-module (gnu packages uucp) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages texinfo)