From patchwork Sat Jan 20 09:58:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59185 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 A0DFF27BBEA; Sat, 20 Jan 2024 10:00:09 +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,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 45F7F27BBE2 for ; Sat, 20 Jan 2024 10:00:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR88B-00054Z-SE; Sat, 20 Jan 2024 04:59:15 -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 1rR88A-00052Y-9Z for guix-patches@gnu.org; Sat, 20 Jan 2024 04:59:14 -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 1rR88A-0000jC-1f for guix-patches@gnu.org; Sat, 20 Jan 2024 04:59:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR88C-00058y-Nt; Sat, 20 Jan 2024 04:59:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68605] [PATCH 12/38] gnu: go-gitlab-com-yawning-edwards25519-extra: Move to (gnu packages golang-crypto). 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: Sat, 20 Jan 2024 09:59:16 +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 , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 68605-submit@debbugs.gnu.org id=B68605.170574475319706 (code B ref 68605); Sat, 20 Jan 2024 09:59:16 +0000 Received: (at 68605) by debbugs.gnu.org; 20 Jan 2024 09:59:13 +0000 Received: from localhost ([127.0.0.1]:60981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR887-00057H-GR for submit@debbugs.gnu.org; Sat, 20 Jan 2024 04:59:13 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:49514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR87u-000524-OG for 68605@debbugs.gnu.org; Sat, 20 Jan 2024 04:58:59 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40e5afc18f5so17119455e9.3 for <68605@debbugs.gnu.org>; Sat, 20 Jan 2024 01:58:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705744730; x=1706349530; 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=C8fRhtV0omjkSjxEsDuB6Wx8BSz41sxCR04vQr7KQFU=; b=KzQ2zW4g+Riy/2c+NmZmgiFITwNhZ5zVUfBsKS8KcPaOaHhBt0efqyo34ZAsseJZzW JGH6RSdRA/dvkLptOnYiPsd19LX9RR0es4kZRGKA1x34yJV4ZPuR/AeFu+zX+sEkeIfq D5sMtK/GSaeE7i1GOdDgeujEBD/1M52kco6EZR4rjGbTxZs7dCmF0xgsnJoaVtwFXa5X potGMn46YAqkAg1zizlY2L/A3tAHGCKzFvIarS2mjuBxeTWnKGGFvOce/gOC1YSISaXM mxggxS5AAdVhPsJ/+Yl9rUWvfSB6VP59lfbXIjc+bGq1+k+vE1tcdks75P9RmX1rPLaD N74w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705744730; x=1706349530; 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=C8fRhtV0omjkSjxEsDuB6Wx8BSz41sxCR04vQr7KQFU=; b=X/4SMPTi/3ZKvzO3pRVRyVcYy4ZbdKrO1OfiaG9wxd1S3/rpcO+Qt1n+sshdo4+58q Qdp4oftj93ht2a0wuyM8lsXUFqb5PhS+Rl3jliGWATK5sSWw65a2MUb+hoDxCVT3LlyF J2nm9YFCKogMYHx/HH7sy5F+YFO1hx1aeIATUtXYSS+GYMRjl6AROMEbIHLuANxjp5xq H22gQDLc31l/9amA/Rhxt/9tWNvsf5QBxRPb4BA6r364MzsiI0CpwYvzK1jCNxxSFzeW 0Am87r6MyJtW3tHHaD3RkdPFF/wM3hCP+zxNmK/EPrv9qxwt4RRzS5lxMssGeOD+ULd1 I+1A== X-Gm-Message-State: AOJu0YxuRDwueJChZQ9lCwQw5w6Nd6vSK/2XJMdMuFQJ09TWD6LnVTvC NcJXili3KfzyQ386/fgoOy1VTTQHIfMcytfZcqAKUcB6r+9CCpdU1xCdPVywjVk= X-Google-Smtp-Source: AGHT+IGZ7Cin4V0GtKeQOQDoltU9B4zVTPWGExR9OCuHDWZbwtBTHYzqVllhXl6pBDBoC3CozdYgXQ== X-Received: by 2002:a05:600c:b57:b0:40e:4832:9fab with SMTP id k23-20020a05600c0b5700b0040e48329fabmr585884wmr.143.1705744730293; Sat, 20 Jan 2024 01:58:50 -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.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 01:58:50 -0800 (PST) From: Sharlatan Hellseher Date: Sat, 20 Jan 2024 09:58:04 +0000 Message-ID: <4d44875948eae72442c12a9ac23817c116e21a6c.1705743627.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-gitlab-com-yawning-edwards25519-extra): Move from here ... * gnu/packages/golang-crypto.scm: ... to here. Change-Id: I9c4aef2a0b58c482f838cc6a3a9e443dc05629b7 --- gnu/packages/golang-crypto.scm | 66 ++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 65 --------------------------------- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 72771d40a2..7f25cd12a2 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -294,6 +294,72 @@ (define-public go-github-com-shadowsocks-go-shadowsocks2 tunnel proxy protocol.") (license license:asl2.0))) +(define-public go-gitlab-com-yawning-edwards25519-extra + (let ((commit "2149dcafc266f66d2487f45b156f6397f9c4760b") + (revision "0")) + (package + (name "go-gitlab-com-yawning-edwards25519-extra") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/yawning/edwards25519-extra") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08mz1qyi8ig515hh5blnzxhiwsav564ah7mzyhvmr6i48ndhhv98")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "gitlab.com/yawning/edwards25519-extra" + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda arguments + (for-each + (lambda (directory) + (apply (assoc-ref %standard-phases 'build) + `(,@arguments #:import-path ,directory))) + (list + "gitlab.com/yawning/edwards25519-extra/elligator2" + "gitlab.com/yawning/edwards25519-extra/h2c" + "gitlab.com/yawning/edwards25519-extra/internal/montgomery" + "gitlab.com/yawning/edwards25519-extra/vrf")))) + (replace 'check + (lambda arguments + (for-each + (lambda (directory) + (apply (assoc-ref %standard-phases 'check) + `(,@arguments #:import-path ,directory))) + (list + "gitlab.com/yawning/edwards25519-extra/elligator2" + "gitlab.com/yawning/edwards25519-extra/h2c" + "gitlab.com/yawning/edwards25519-extra/internal/montgomery" + "gitlab.com/yawning/edwards25519-extra/vrf")))) + (replace 'install + (lambda arguments + (for-each + (lambda (directory) + (apply (assoc-ref %standard-phases 'install) + `(,@arguments #:import-path ,directory))) + (list + "gitlab.com/yawning/edwards25519-extra/elligator2" + "gitlab.com/yawning/edwards25519-extra/h2c" + "gitlab.com/yawning/edwards25519-extra/internal/montgomery" + "gitlab.com/yawning/edwards25519-extra/vrf"))))))) + (propagated-inputs (list go-golang-org-x-crypto + go-filippo-io-edwards25519)) + (home-page "https://gitlab.com/yawning/edwards25519-extra") + (synopsis "edwards25519-extra") + (description "This package provides extensions to the Go standard +library's Ed25519 and curve25519 implementations, primarily extracted from +@@url{https://github.com/oasisprotocol/curve25519-voi,curve25519-voi}. This +package is intended for interoperability with the standard library and the +@@url{https://filippo.io/edwards25519,edwards25519} package as much as +possible.") + (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 4e44ebf5ba..499bf6c8a9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9792,71 +9792,6 @@ (define-public age-keygen #:unpack-path "filippo.io/age" #:install-source? #f)))) -(define-public go-gitlab-com-yawning-edwards25519-extra - (let ((commit "2149dcafc266f66d2487f45b156f6397f9c4760b") - (revision "0")) - (package - (name "go-gitlab-com-yawning-edwards25519-extra") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/yawning/edwards25519-extra") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "08mz1qyi8ig515hh5blnzxhiwsav564ah7mzyhvmr6i48ndhhv98")))) - (build-system go-build-system) - (arguments - '(#:unpack-path "gitlab.com/yawning/edwards25519-extra" - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda arguments - (for-each - (lambda (directory) - (apply (assoc-ref %standard-phases 'build) - `(,@arguments #:import-path ,directory))) - (list - "gitlab.com/yawning/edwards25519-extra/elligator2" - "gitlab.com/yawning/edwards25519-extra/h2c" - "gitlab.com/yawning/edwards25519-extra/internal/montgomery" - "gitlab.com/yawning/edwards25519-extra/vrf")))) - (replace 'check - (lambda arguments - (for-each - (lambda (directory) - (apply (assoc-ref %standard-phases 'check) - `(,@arguments #:import-path ,directory))) - (list - "gitlab.com/yawning/edwards25519-extra/elligator2" - "gitlab.com/yawning/edwards25519-extra/h2c" - "gitlab.com/yawning/edwards25519-extra/internal/montgomery" - "gitlab.com/yawning/edwards25519-extra/vrf")))) - (replace 'install - (lambda arguments - (for-each - (lambda (directory) - (apply (assoc-ref %standard-phases 'install) - `(,@arguments #:import-path ,directory))) - (list - "gitlab.com/yawning/edwards25519-extra/elligator2" - "gitlab.com/yawning/edwards25519-extra/h2c" - "gitlab.com/yawning/edwards25519-extra/internal/montgomery" - "gitlab.com/yawning/edwards25519-extra/vrf"))))))) - (propagated-inputs (list go-golang-org-x-crypto - go-filippo-io-edwards25519)) - (home-page "https://gitlab.com/yawning/edwards25519-extra") - (synopsis "edwards25519-extra") - (description - "This package provides extensions to the Go standard library's Ed25519 and -curve25519 implementations, primarily extracted from -@@url{https://github.com/oasisprotocol/curve25519-voi,curve25519-voi}. This -package is intended for interoperability with the standard library and the -@@url{https://filippo.io/edwards25519,edwards25519} package as much as possible.") - (license license:bsd-3)))) - (define-public go-github-com-bwesterb-go-ristretto (package (name "go-github-com-bwesterb-go-ristretto")