From patchwork Sat Jan 20 09:57:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59180 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 797CA27BBEA; Sat, 20 Jan 2024 09:59:52 +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=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 7F29927BBE2 for ; Sat, 20 Jan 2024 09:59:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR884-00050h-To; Sat, 20 Jan 2024 04:59:08 -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 1rR883-0004zv-1t for guix-patches@gnu.org; Sat, 20 Jan 2024 04:59:07 -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 1rR882-0000iX-QB for guix-patches@gnu.org; Sat, 20 Jan 2024 04:59:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR885-00056T-Ed; Sat, 20 Jan 2024 04:59:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68605] [PATCH 06/38] gnu: go-github-com-shadowsocks-go-shadowsocks2: 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:09 +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.170574474419529 (code B ref 68605); Sat, 20 Jan 2024 09:59:09 +0000 Received: (at 68605) by debbugs.gnu.org; 20 Jan 2024 09:59:04 +0000 Received: from localhost ([127.0.0.1]:60936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR87y-00054H-RJ for submit@debbugs.gnu.org; Sat, 20 Jan 2024 04:59:04 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:60583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR87q-00051n-P2 for 68605@debbugs.gnu.org; Sat, 20 Jan 2024 04:58:56 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40e60e135a7so14659435e9.0 for <68605@debbugs.gnu.org>; Sat, 20 Jan 2024 01:58:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705744726; x=1706349526; 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=b4o1Od+i6yw1xBJELywaLbjQ5lYN1KbtDvl47nPSWGI=; b=OPAN+0Pz2CxiIMivcRncpi5qET2LImjoXhVmKRY8gkg9F0TS7PZXnz7HfR3LnQQPyu depfiNSC45JEoAjPow6z+9xhhPAdmMFLI9Fh4lTH5ppngUA/96HnzpVYkKp2tIiX/TwB 3t/QXtNMt85n1uGIagXdh0x3kDozIi8Afd+/oByytp0Mj1yzDKD8f8C8TUgOuwZOykE0 LMpSaqOAHfY3Sstmi7LUbjCYikA28Sr+Xwowm6+wQfXJIMTBOi4J7sphvfi29L/CQ2Mx 0ZkbiMqBOFuHn08/+C0ftI8uLFVdVN4x9UcvHlN0IkfcQ0NZs9s/CI325nqaJCN3UOQT gQDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705744726; x=1706349526; 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=b4o1Od+i6yw1xBJELywaLbjQ5lYN1KbtDvl47nPSWGI=; b=WEPd6TWPvoOV2Ezju8ZxNmSc9WWhtjuRU6eODMqPWouXAfe8xn7rj9jujKG/wMdF1x 9TSYMHqjMlOLa8GfNb+HEiw1ZWI4VpCaxv6WfwFAdkmMb9aWfenNhzinhHZeDOvLa+c0 TRyVISVcB8hYLV+C960nQs48hCkbVPtaUTBZDA8DECPCkcB0kGym/zfbsnmE5CNOt+fc kT4rqjFaXfeQD1ZSnnvLt20FFyOH9V4HXeCqKuBge8ygs9n8gVdvbczkAb1LGIdD0Btp nPNU6lRJhoyPCBXaIU7hL4ekcWWhuiJdVdTRb7pcz/NDxbb0UtGfb4TjEyZ3O9ZOTAXN V9Og== X-Gm-Message-State: AOJu0YwbqCiu/J9ebJwCxW1gLQ5/wyvGIM5nsi9n+OKXUIvyxLnrrCRh 6wESGuYDSXGWdBq6sDztD63oBi+KPHFoN+69Tp7wbViP5jRX+AtmhNDZ75gDq9s= X-Google-Smtp-Source: AGHT+IHcAxlZXU536od6lXT7+rm2ZOJme+t6S8prWstKbGeVL4akpAh+vEfSS+ofa7bakF4yRRSceg== X-Received: by 2002:a05:600c:500b:b0:40e:5bd0:a87a with SMTP id n11-20020a05600c500b00b0040e5bd0a87amr753801wmr.60.1705744726249; Sat, 20 Jan 2024 01:58:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 01:58:45 -0800 (PST) From: Sharlatan Hellseher Date: Sat, 20 Jan 2024 09:57:58 +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/golang.scm (go-github-com-shadowsocks-go-shadowsocks2): Move from here ... * gnu/packages/golang-crypto.scm: ... to here. Change-Id: Iae18376cae074b6ffb2d5b1b27b6161f4712dfdb --- gnu/packages/golang-crypto.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 2c9605b8cf..859d490787 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -120,6 +120,35 @@ (define-public go-github-com-riobard-go-bloom (description "Go-Bloom implements bloom filter using double hashing.") (license license:asl2.0)))) +(define-public go-github-com-shadowsocks-go-shadowsocks2 + (package + (name "go-github-com-shadowsocks-go-shadowsocks2") + ;; Version > 0.1.3 requires go-toolchain v1.16. + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shadowsocks/go-shadowsocks2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/shadowsocks/go-shadowsocks2")) + (propagated-inputs + (list go-github-com-riobard-go-bloom + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-text)) + (home-page "https://github.com/shadowsocks/go-shadowsocks2") + (synopsis "Shadowsocks tunnel proxy") + (description "Go-ShadowSocks is a Go implementation of the Shadowsocks +tunnel proxy protocol.") + (license license:asl2.0))) + ;;; ;;; 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 2bf6b0a4a9..a47345cc1e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1733,33 +1733,6 @@ (define-public go-github-com-rfjakob-eme mode developed by Halevi and Rogaway.") (license license:expat))) -(define-public go-github-com-shadowsocks-go-shadowsocks2 - (package - (name "go-github-com-shadowsocks-go-shadowsocks2") - ;; Version > 0.1.3 requires go-toolchain v1.16. - (version "0.1.3") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/shadowsocks/go-shadowsocks2") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/shadowsocks/go-shadowsocks2")) - (propagated-inputs - (list go-github-com-riobard-go-bloom go-golang-org-x-crypto - go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text)) - (home-page "https://github.com/shadowsocks/go-shadowsocks2") - (synopsis "Shadowsocks tunnel proxy") - (description "Go-ShadowSocks is a Go implementation of the Shadowsocks tunnel -proxy protocol.") - (license license:asl2.0))) - (define-public go-github-com-schachmat-ingo (package (name "go-github-com-schachmat-ingo")