From patchwork Wed Nov 8 00:41:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56055 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 C4E9C27BBE2; Tue, 7 Nov 2023 21:46:05 +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 C363727BBED for ; Tue, 7 Nov 2023 21:45:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Ts8-0002I6-UB; Tue, 07 Nov 2023 16:44:32 -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 1r0Ts4-00029f-Jq for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:28 -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 1r0Ts4-0007tQ-BG for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Tsg-0000oF-Ef for guix-patches@gnu.org; Tue, 07 Nov 2023 16:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 55/67] gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Nov 2023 21:45:06 +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 Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.16993934702868 (code B ref 66827); Tue, 07 Nov 2023 21:45:06 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:44:30 +0000 Received: from localhost ([127.0.0.1]:43662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Ts5-0000k5-Kf for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:44:30 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:50552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0TrH-0000Yc-LE for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:40 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-32d895584f1so3660368f8f.1 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:43:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699393376; x=1699998176; 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=QaEkoqli3tc4rfnAokxVuE4IHuHPt2/30O52jGYmsHg=; b=dLpqWPceVLORTmFjsFQSUhE3Eocdm4+kwn7IFfAeFS4eeNFkIzv7bCbSL9SSXgY/Xz cRaElJ2m7SqtbHZG9DE/pe1izXW6nIausk3jSPoUvvokfoYAIrCYQBMPu7i/ruFwzgIw CXTjP2m5RwlUKEuUKJroaECMCbMS+uj+2m4JBtP4t8GglGLvHH+aRh9lnj8L8/ci6LO9 xI0MsQ9c5ZD47igIwI5z7RZbG8yXkgev0Y3gmaVEaK4kWc0lZnXdmGHTVlwA98qKsgof yvePW2W74d1wlj9JfW4M8+9meTib/iiU7OBa5KyPwb7qeUaqty/a3vYtLi8lN5k2YG+k jG9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699393376; x=1699998176; 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=QaEkoqli3tc4rfnAokxVuE4IHuHPt2/30O52jGYmsHg=; b=QmX6Y87dxLerozCIZ34nhYfcIilAF98xkMZKRcZPIco2J2UjPZ8mNd+dF9Iq1P74Nl RTI+t084waDBw6MoGN4ecTpf6aWu1a/MFmBRG24fOjbQXMOvqD7tuKAEl6/tBwdd7BHo G1cQ3/EMBTgsbu0ZeN+h8t6E86v0tg2qV4XmDLiULDUcA1g8Xe5GZU5ZJgWP/XflqTk1 yiYAInbXUNnHCnNxJDpx6du/weSMbCq3WlJDwXCPX4r2yuX5zPmNYF24JnJUp27GhKAO YcxJkWVQfgnt/LeeJDYI8ZJ46eszyYVLdnrLPmamow9bI6MvrNiNbNle6Ok4nXFp8cxQ yP7Q== X-Gm-Message-State: AOJu0YxnY5fvncblQrPp3vvFH6IVEuOJZYOqKpYkEpdoqDn3z1PMhkLW l8b1NCz0NA+rkM5zg5l5tBBp4HCuL9YTtQ== X-Google-Smtp-Source: AGHT+IFJy5/rJJ3rnmsKQ7KV598NKy71bs4Ur/dauKeSP+ihiWoUNwVHBzJ6mkeamA1obXl1e10uxQ== X-Received: by 2002:adf:f6c2:0:b0:32d:aa11:221d with SMTP id y2-20020adff6c2000000b0032daa11221dmr30587wrp.27.1699393375684; Tue, 07 Nov 2023 13:42:55 -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 p2-20020adfce02000000b0032f9688ea48sm3310178wrn.10.2023.11.07.13.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:42:55 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:41:32 +0000 Message-ID: <652f04c38c0d31b6be3727e97542a39df9f023ca.1699403993.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.git.sharlatanus@gmail.com> References: <0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.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 bf71d0de49..0e608a8eab 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9965,30 +9965,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 b0381515a5..36d33da42b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -122,6 +122,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)