From patchwork Mon Oct 30 01:09:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55633 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 B238D27BBE2; Sun, 29 Oct 2023 22:14:43 +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=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 7D8EC27BBEB for ; Sun, 29 Oct 2023 22:14:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxE2G-0008Ml-Gw; Sun, 29 Oct 2023 18:13:34 -0400 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 1qxE2E-0008MQ-7e for guix-patches@gnu.org; Sun, 29 Oct 2023 18:13:30 -0400 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 1qxE2D-00019c-KF for guix-patches@gnu.org; Sun, 29 Oct 2023 18:13:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxE2k-0005mt-D6 for guix-patches@gnu.org; Sun, 29 Oct 2023 18:14:02 -0400 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: Sun, 29 Oct 2023 22:14:02 +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.169861762222073 (code B ref 66827); Sun, 29 Oct 2023 22:14:02 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Oct 2023 22:13:42 +0000 Received: from localhost ([127.0.0.1]:43910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxE2P-0005jq-QK for submit@debbugs.gnu.org; Sun, 29 Oct 2023 18:13:42 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:54476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDzu-0005VL-So for 66827@debbugs.gnu.org; Sun, 29 Oct 2023 18:11:08 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-408425c7c10so30781645e9.0 for <66827@debbugs.gnu.org>; Sun, 29 Oct 2023 15:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698617428; x=1699222228; 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=EzYJ3u76XKx4DAtxa/EjksoJlnbd0hIu6JXvnhv1ih4=; b=SFK/luWydcpEnB3fEBEIGNXeelMKeFUnvb8aZR279rmo216pPO1RcPm68ARDSDFNui nNhnc54Ch0xc+HBQrgtvSqV9W+yO3d7dfx7hPbOlqWM4kWb13ZqxvJNnWNttUmT5OY+o RD2cLU8wiLLyXKlZrgaj2bRi/jBgsRt1RrBqr9ApgrPMXBPV+n6M14tvKZmY3BjKioJs 34BLAV6OmNmaV9YI2q11o87pNj7LJjkcqTIbuTkPJB6xm1Sa/inbnHztri5LF73ALPok aEP9DPnqqsLE13S37wG9NqDNEooUccAwgV2peJl0/iuXJwZwaL7DEpBwHJ/Lygqj9PEd FKSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698617428; x=1699222228; 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=EzYJ3u76XKx4DAtxa/EjksoJlnbd0hIu6JXvnhv1ih4=; b=oAEoa9oryEWs/TddN3NQjhjJd5BocxkMT8T2Ctat2eeMnQKDjG38Z0PWHU9Kj+DRoM c1w4jT+nkcJiDyKQJ6RfKFiWtAJA4IUJjiXpa7s+lr8CnijfKh4i7BnbVa/wJy3yOy8f rMrJ/KUzGoufKldjN+KJEp2j2rIbQLIA6uXz0x0AZ6LyVwx1wvSgaPDfI3Hc+iD6UPRX 4+ghi6oQ8FLJmFHDYqZiCyyZZ5L+ehAGe9JePG2DvfomqsnxFGMdC9OFUzKFX5kYoU3K O/8LpXzLvkNJooeV8IfZ09NoBYdfEmL7RDje86VW5/fMWk8t1hDliLCkjpVL+aVm5IqM /Kpw== X-Gm-Message-State: AOJu0YzNpdNdgXzDaTVQDOQnLdLGkrBZxZZl/JVFKQDOnav583oBv+Jb fctVCSE4QxNvhdVZ0JLRpW7kWX/JkenLVw== X-Google-Smtp-Source: AGHT+IGmLT+ev8HFcCtThvZvXAx0cQgWv4EX5fCdRW/oPFjA97SNnl7PjtBx6SgWYFn7zfvwxel4Lw== X-Received: by 2002:a05:600c:35c9:b0:401:73b2:f039 with SMTP id r9-20020a05600c35c900b0040173b2f039mr7164707wmq.7.1698617428341; Sun, 29 Oct 2023 15:10:28 -0700 (PDT) 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 3-20020a05600c234300b004063cced50bsm7527511wmq.23.2023.10.29.15.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 15:10:28 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 30 Oct 2023 01:09:09 +0000 Message-ID: <6a6327d5bec2c56779bd11a9a7b3308a256940f2.1698627461.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-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 c9eb70cf1f..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 "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-golang-zx2c4-com-wireguard (package (name "go-golang-zx2c4-com-wireguard") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 86309e4ab3..0fffea7ce4 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)