From patchwork Sun Feb 11 10:53:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60017 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 ED01727BBEC; Sun, 11 Feb 2024 10:55: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,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 9016027BBE9 for ; Sun, 11 Feb 2024 10:55:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7U2-0003rW-Pa; Sun, 11 Feb 2024 05:54:50 -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 1rZ7U1-0003qW-LY for guix-patches@gnu.org; Sun, 11 Feb 2024 05:54:49 -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 1rZ7U1-0005ZP-DG for guix-patches@gnu.org; Sun, 11 Feb 2024 05:54:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7UH-0005Qx-Hs; Sun, 11 Feb 2024 05:55:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 27/30] gnu: go-golang-org-x-crypto: Move to (gnu packages-build). 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:55:05 +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.170764886220727 (code B ref 69042); Sun, 11 Feb 2024 10:55:05 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:54:22 +0000 Received: from localhost ([127.0.0.1]:38382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TZ-0005O8-Oa for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:54:22 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:49492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TO-0005MC-Fj for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:54:12 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-410bd8dfe9aso1776035e9.3 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:53:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707648828; x=1708253628; 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=U3lAfo7BF5x0HJHfoh8Bik4T7orXmVhfbZ5nK8mIy6Y=; b=Y9qk6c1rx2oNpjuwFpYKxctZ1vxI71zleAZ0UXLLOwhic4U6ONbaAu3v8WRR44Q/wu 42+cdZmVxI98cFkp+5BVtCJ/wigUdB/+OmYvZxGg4/MroLer1bTGodxQ6WvjfynNVY2l k3hXVawUEG0YTYEuUL1aoEXusOnEkEbF8bsIkKuo5Uk7Cz8AYY0Crnj6xaGx6i7uXJJM b46Dg/a4+Lm4v13eBhAfPwn74pj+OeH4tE6Us1jjQkJzvRFHJkOweIAJErDffAjfOh+j GZf9HPuB8FBvWsjWSy6I8YI6scpTippa/jrji6AZ5R7OIRWgTACdxwoVW0uLhSr4C1iA 72cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707648828; x=1708253628; 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=U3lAfo7BF5x0HJHfoh8Bik4T7orXmVhfbZ5nK8mIy6Y=; b=VDlBdURUmhRTtnlxaJiCseEIHNaCcSLCl6e8dPSwvwfhYuvq6kUcmfHU5DoY0Gml5i ACDZhfpziM932jsDe3wOz42//GMJp9gABInD0BJgCCDt98N68cUKMd4j5D2x+ENdXPIC eWo0/FqRk2+ESjxfDJtIpqA8mDBoMKpVKVUMr4D6YUrrjJUHXtEn6mbDE77uI4TrkHrx klQEBH7ghpgsNppvSLBz3pJCeDvmgCB+pHcy+pdhyG+BTAgDtW3pvV99ex8mjXrGvfDd ZEyJZqVT2J+iehl3I39e77E6DgXAKS4FVgRMt0qQWyX8UggztuGhcO/m6Dj2c85X6g0G jsEQ== X-Gm-Message-State: AOJu0YzDVn4K1fY623cyt71EQT6w4STtzdDaf5XLC8oXZeXQyKn4223z 9mC5j5Q4LyPtrdc8iFqJmrWp8d8hvtet8iAc7t0uL/c2d7Fzm9bE20roWLbp4Xk= X-Google-Smtp-Source: AGHT+IGqFkn8kPu4fNPzylYuCF83P4QLxEsueaFiHB3mjm1IYZATCc3AYFGE1nBVrNL3mubRgTPDbA== X-Received: by 2002:a05:600c:3b9b:b0:410:c837:d05b with SMTP id n27-20020a05600c3b9b00b00410c837d05bmr550266wms.13.1707648828515; Sun, 11 Feb 2024 02:53:48 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:48 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:53:16 +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-golang-org-x-crypto): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/backup.scm: Add (gnu packages golang-build) module. * gnu/packages/crypto.scm: As above. Change-Id: I5daad7fe90e1507958fe73c04fc043ebbc006395 --- gnu/packages/backup.scm | 1 + gnu/packages/crypto.scm | 1 + gnu/packages/golang-build.scm | 34 +++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 31 ------------------------------- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f160efd37d..3b3b9d332a 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -71,6 +71,7 @@ (define-module (gnu packages backup) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index c7145bcb0c..6857ea2075 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -60,6 +60,7 @@ (define-module (gnu packages crypto) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index b717c3ad27..8b7dca46a6 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,14 +1,15 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Brian Leung +;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 HiPhish -;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vagrant Cascadian ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 hackeryarn ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Felix Lechner @@ -74,6 +75,37 @@ (define-public go-github-com-yuin-goldmark (description "This package provides a markdown parser.") (license license:expat))) +(define-public go-golang-org-x-crypto + (package + (name "go-golang-org-x-crypto") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit (string-append "v" version)))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/crypto" + ;; Source-only package + #:tests? #f + #:phases + (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://go.googlesource.com/crypto/") + (synopsis "Supplementary cryptographic libraries in Go") + (description "This package provides supplementary cryptographic libraries +for the Go language.") + (license license:bsd-3))) + (define-public go-golang-org-x-exp (package (name "go-golang-org-x-exp") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0437b4e83d..e473c0880b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3347,37 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2 (home-page "https://github.com/hashicorp/hcl") (license license:mpl2.0))) -(define-public go-golang-org-x-crypto - (package - (name "go-golang-org-x-crypto") - (version "0.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit (string-append "v" version)))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/crypto" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-golang-org-x-sys)) - (synopsis "Supplementary cryptographic libraries in Go") - (description "This package provides supplementary cryptographic libraries -for the Go language.") - (home-page "https://go.googlesource.com/crypto/") - (license license:bsd-3))) - (define-public govulncheck (package (name "govulncheck")