From patchwork Sat Jan 20 09:58: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: 59203 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 81CDC27BBE9; Sat, 20 Jan 2024 10:01:07 +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 54E3D27BBEA for ; Sat, 20 Jan 2024 10:01:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR89d-0006AO-1n; Sat, 20 Jan 2024 05:00:45 -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 1rR894-0005YL-MH for guix-patches@gnu.org; Sat, 20 Jan 2024 05:00:10 -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 1rR894-0002p7-BF for guix-patches@gnu.org; Sat, 20 Jan 2024 05:00:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR896-0005S7-Vi for guix-patches@gnu.org; Sat, 20 Jan 2024 05:00:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68605] [PATCH 29/38] gnu: go-github-com-cespare-xxhash: Move to (gnu packages golang-crypto). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 10:00:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68605@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 68605-submit@debbugs.gnu.org id=B68605.170574479219962 (code B ref 68605); Sat, 20 Jan 2024 10:00:12 +0000 Received: (at 68605) by debbugs.gnu.org; 20 Jan 2024 09:59:52 +0000 Received: from localhost ([127.0.0.1]:32812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR88m-0005Bo-3r for submit@debbugs.gnu.org; Sat, 20 Jan 2024 04:59:52 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR886-000556-Ea for 68605@debbugs.gnu.org; Sat, 20 Jan 2024 04:59:11 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40e7e2e04f0so16875115e9.1 for <68605@debbugs.gnu.org>; Sat, 20 Jan 2024 01:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705744742; x=1706349542; 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=jWRKphxQez2BRDx9j25u2j7CNKFu9tezBPERrRCQNzc=; b=Rip57OGOMPnXdie5LB2EIPrZFN981BmkM5SLy6mzV7M6QsLvm5QliPotlqPj/6sqer clQZxGdSQ2UDE/S9EQeiffpN5F4H1wEokHiDIl2Fpi3Ud/efyhjaJ6I5eeSzybwO9Z7/ VM2tdmOUf2627/6dv680GwjQ3fUEMX0ImLqWJGPkC24Odr6PvjXUTHwx+SbWsPgJfLjO VDG0ONrgwwM+J8yBxKy1M2Ljvdj2X+BPWOiTcDVpUEgBGvRAXMMTUCt+s9IbKjkYjG9h jnkjzTfHbXEYnRcDv9IBLK/JmRgYOl7I8vcLQq+ZZETFz5gxq9o5v5HwypAQjNovdXu8 DiUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705744742; x=1706349542; 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=jWRKphxQez2BRDx9j25u2j7CNKFu9tezBPERrRCQNzc=; b=MEktbcOORcRocnBclqmaBGk1BdGnOcFALednNOJaZ6afpa5A7twy1jVFCgv/v7/v2M Anj14pTYSLHw1xsuQgRkYvKbQyCw3qigKvZJGY1lZEwBVrrEawe0oT1xcA65ZspQUFNk GkYa7nkuyojT0HuJz1pjbETXA0ysfLgC5DObvJUqWZYgxpEd9FtXqhpi80yM4Sl70/2X 5q7jX6i/9hPgp41FL80Yo6WIcic1x26mgy5/BVKV/96vTdiOKIRdB/IKOTciNMOPmGTa +x0soqgHlYASp9LMlIwbn2DeuV+BKFSvZ9HVShAW38prC3EhIeQfNasxmliaH9vaXZap GwVw== X-Gm-Message-State: AOJu0YyDA903tHy4csWVPFXpFy4m3WPyVgyxozV8KjF4ocFH7s6L0M0+ oVNck+wFoOAGB2l4ZaMXlYNed39zzIYMHx4t7bHaWsEUWXTB/UHC3hqdYkBeeLU= X-Google-Smtp-Source: AGHT+IEtUPC8I5C9nDPLnOTfIc0fQeoVT7yqs2DDyYuXaXxuv0RxgzKViO465V7RzbNMGX0imXHK8w== X-Received: by 2002:a7b:cd0e:0:b0:40e:7d47:661e with SMTP id f14-20020a7bcd0e000000b0040e7d47661emr549833wmj.51.1705744741931; Sat, 20 Jan 2024 01:59:01 -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 f6-20020a05600c4e8600b0040d6ffae526sm36066695wmq.39.2024.01.20.01.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 01:59:01 -0800 (PST) From: Sharlatan Hellseher Date: Sat, 20 Jan 2024 09:58:21 +0000 Message-ID: <042d6a994d0f217975f58fd24d338605c88cc042.1705743628.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/syncthing.scm (go-github-com-cespare-xxhash): Move from here ... * gnu/packages/golang-crypto.scm: ... to here. * gnu/packages/textutils.scm: Add (gnu packages golang-crypto) to used modules. Change-Id: Ic72cf6c4770cd3f03cc2e27c3455632ee16e7c09 --- gnu/packages/golang-crypto.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/syncthing.scm | 31 ------------------------------- gnu/packages/textutils.scm | 1 + 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 00a6f51313..187f47b8eb 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 (unmatched-parenthesis +;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2022, 2023 Nicolas Graves ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Clément Lassieur @@ -165,6 +166,37 @@ (define-public go-github-com-btcsuite-btcd-btcec needing to use secp256k1 elliptic curve cryptography.") (license license:isc)))) +(define-public go-github-com-cespare-xxhash + (package + (name "go-github-com-cespare-xxhash") + (version "2.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cespare/xxhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/cespare/xxhash" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) + (home-page "https://github.com/cespare/xxhash/") + (synopsis "Go implementation of xxHash") + (description "This package provides of Go implementation of the 64-bit +xxHash algorithm (XXH64).") + (license license:expat))) + (define-public go-github-com-cloudflare-circl (package (name "go-github-com-cloudflare-circl") diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7598b46824..e3c0593aee 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1006,34 +1006,3 @@ (define-public go-github-com-ccding-go-stun and RFC 5389).") (home-page "https://github.com/ccding/go-stun") (license asl2.0)))) - -(define-public go-github-com-cespare-xxhash - (package - (name "go-github-com-cespare-xxhash") - (version "2.1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cespare/xxhash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/cespare/xxhash" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) - (synopsis "Go implementation of xxHash") - (description "This package provides of Go implementation of the 64-bit -xxHash algorithm (XXH64).") - (home-page "https://github.com/cespare/xxhash/") - (license expat))) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 494e6b5ef5..96bc2e56cc 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -65,6 +65,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-crypto) #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses)