From patchwork Wed Nov 29 22:35:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57102 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 3D0F627BBE2; Wed, 29 Nov 2023 19:40:44 +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, SPF_HELO_PASS,URIBL_BLOCKED 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 DE96527BBEC for ; Wed, 29 Nov 2023 19:40:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QOp-0000nq-Vp; Wed, 29 Nov 2023 14:39: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 1r8QOn-0000la-DM for guix-patches@gnu.org; Wed, 29 Nov 2023 14:39:05 -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 1r8QOn-0000tr-41 for guix-patches@gnu.org; Wed, 29 Nov 2023 14:39:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QOu-00068Y-O2; Wed, 29 Nov 2023 14:39:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 55/66] gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 19:39:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66827 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66827@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.170128671523306 (code B ref 66827); Wed, 29 Nov 2023 19:39:12 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:38:35 +0000 Received: from localhost ([127.0.0.1]:51372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QOG-00063h-9X for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:38:35 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:49494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMt-0005rN-Cq for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:37:08 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40b474c925bso729515e9.3 for <66827@debbugs.gnu.org>; Wed, 29 Nov 2023 11:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701286614; x=1701891414; 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=SNko+iY7dl5se04v89EhX/8HFy0GnvH33cWDiCco8fE=; b=c0vJhdG1vYaBVQO22pF+kY1FlDFSWgX7AtIANj3szEcuyJY2xLnVpx7A7K/OJJBGER sl3er9QFnVcND2IHKzmXjRlTC5qxN7aniJO+/vFczvTXT0Yyc4zXYa4F2mtL5ksJTw/k u+Lxm4D10u9BO4wCk8BHrTvwz5odApnppXkK2yz05efhsRLXGFZn0ybgkeOXemZ5Wj3J LVC2Zhquy6lRUsHyo1J3sbbGzr+T20RC4m0HibDNUUudhStW7otGDUCqA+IIWT8TGae1 Bu58o0gvNIT4OQk2S/ULQcjdHq5Ta07lCdMauGIy8gYf7F+yrymp0vdT8aWxiwFz42HK SWBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286614; x=1701891414; 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=SNko+iY7dl5se04v89EhX/8HFy0GnvH33cWDiCco8fE=; b=fXH8YzuG5wgrlSprqFOGbFU67EpGBTYChewFstzGZGTUIzoZGLlsZHuyHsJlpjZzEa KjWhzmPvnq4M/+ueElXikXMI/O8Ne34MagGFJMpwzDyvBlBHC8oxgDAr80JrnLnGMGBG SZs5xwdBmsRihowgSZ11p+l3pr228qYcgeioW/Dc8plWbd/vwX/Cx0Sx3Ecu+Hc/Z0Jv RTI/PMHGjB86aOS8v7PAzCj3QHjctmzSNCb6YxQjqKB0ZYdM8mIONpaBpypwiBeSP3bh xW1EPGg8FQcxag8pWm5Oi/5GDDANQwa8TlgqxYCNPJAbK0TplShmju0cMkp/4K89inHM wB4A== X-Gm-Message-State: AOJu0YwAgA6OQU2/N5NVXoswOZlfPjqCDYDsXTcuPW39i3ZFu5X48ZLr H4NMKNdo0ib6s/5v5e/w778GBtnIxX6+cQ== X-Google-Smtp-Source: AGHT+IEczSbaABsLZCjAZ1OxsYpbLSqEGZq2vfffwkCR/ooJycw4CRlanB4nWPY/vcNzMslZ8E4Z6g== X-Received: by 2002:a05:600c:4f14:b0:40b:5641:4394 with SMTP id l20-20020a05600c4f1400b0040b56414394mr677444wmq.33.1701286613930; Wed, 29 Nov 2023 11:36:53 -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 q17-20020a05600c46d100b0040836519dd9sm3239674wmo.25.2023.11.29.11.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 11:36:53 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:33 +0000 Message-ID: <3836cb7c4953e003c740f78835dda99400a0a7e2.1701297273.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <123a0b9b76c24c29184c527dabb652384f7be762.1701297273.git.sharlatanus@gmail.com> References: <123a0b9b76c24c29184c527dabb652384f7be762.1701297273.git.sharlatanus@gmail.com> 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-hjson-hjson-go): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/networking.scm: Add (gnu packages golang-web) module. * gnu/packages/uucp.scm: As above. Change-Id: If1ba5e4d866ce74fa35ae9126c6ba4cd0b149dab --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/networking.scm | 1 + gnu/packages/uucp.scm | 1 + 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 96873f020c..4771657add 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan @@ -757,6 +758,29 @@ (define-public go-github-com-gorilla-websocket protocol.") (license license:bsd-2))) +(define-public go-github-com-hjson-hjson-go + (package + (name "go-github-com-hjson-hjson-go") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hjson/hjson-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/hjson/hjson-go")) + (home-page "https://hjson.org/") + (synopsis "Human JSON implementation for Go") + (description "Hjson is a syntax extension to JSON. It is intended to be +used like a user interface for humans, to read and edit before passing the +JSON data to the machine.") + (license license:expat))) + (define-public go-github-com-jcmturner-dnsutils-v2 (package (name "go-github-com-jcmturner-dnsutils-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3236abdec6..38398b111b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10092,30 +10092,6 @@ (define-public go-github-com-hashicorp-go-syslog (description "This package is a very simple wrapper around log/syslog") (license license:expat))) -(define-public go-github-com-hjson-hjson-go - (package - (name "go-github-com-hjson-hjson-go") - (version "4.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hjson/hjson-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/hjson/hjson-go")) - (home-page "https://hjson.org/") - (synopsis "Human JSON implementation for Go") - (description "Hjson is a syntax extension to JSON. It is intended to be -used like a user interface for humans, to read and edit before passing the -JSON data to the machine.") - (license license:expat))) - (define-public go-golang-zx2c4-com-wireguard (package (name "go-golang-zx2c4-com-wireguard") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6b415076e8..2366dd5fc5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -123,6 +123,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index e10de59aa2..1626c90c36 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -19,6 +19,7 @@ (define-module (gnu packages uucp) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages texinfo) #:use-module (guix licenses) #:use-module (guix packages)