From patchwork Wed Nov 29 22:34:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57050 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 8908127BBEA; Wed, 29 Nov 2023 19:37:27 +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 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 D2D6D27BBE2 for ; Wed, 29 Nov 2023 19:37:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QMk-0007KU-O2; Wed, 29 Nov 2023 14:36:58 -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 1r8QMi-0007KC-1O for guix-patches@gnu.org; Wed, 29 Nov 2023 14:36:56 -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 1r8QMh-0008Pb-Q9 for guix-patches@gnu.org; Wed, 29 Nov 2023 14:36:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QMp-0005rn-C1; Wed, 29 Nov 2023 14:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 02/66] gnu: go-github-com-gorilla-mux: 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:37:03 +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.170128659622218 (code B ref 66827); Wed, 29 Nov 2023 19:37:03 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:36:36 +0000 Received: from localhost ([127.0.0.1]:51155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMO-0005mA-Bo for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:36:36 -0500 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]:51335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMI-0005kc-5b for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:36:31 -0500 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2c9c149848fso2171121fa.2 for <66827@debbugs.gnu.org>; Wed, 29 Nov 2023 11:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701286576; x=1701891376; 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=Dwfd3sPc3XBYQO7V+uGhki+9Y6AyUrmJvvQanUcZt0A=; b=L2w6q3ax6f+56k5tYsVN4I9n2jhtw1N7EPLFVumx0cxh11NWyEhGyhhZgHSBoBmyPb SIRiNKs++NjSK925ZNjh+R6UGXo51A5tSg6d2uMAXk+865sN9goaS/XS6Jp9v81NHCM5 ClzMo2rfK+k3/6IZbxFA0NDOvbxsY5ZMA0UeuQD+U7XB/Ivu0fuG2W1ApMlamp1LciDI OdGj9s/zrdeknRFmpoikfvHugyjeYxoL11Fg+Exl0aU/6Tgg0DIZkvsazo3yzk3BEG3j t4UKY3mzp+Ql9fMtl4kV9kBIYlLY57NbVm/vVEYxAE1ixMjV3BhkY7/rLPL3xNfRMIg9 dV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286576; x=1701891376; 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=Dwfd3sPc3XBYQO7V+uGhki+9Y6AyUrmJvvQanUcZt0A=; b=cJ5BXe5nZqsV1UZUXamWpzcPlKFL86f6cbNzk4yOXy8lIUIH1Bi4hwzzgBZ6xYtPIi w/f6DHObg7SInbKkFKcTAHfhEyVZoQCafN1BdXFumLyfXXggXRKf3YwC09a4rBFXMPar CWr+IFB1BguMeAiTSOhGuoPiI+iLDYcWUV5XVqi96wXjiLREhgxEFYezBu1+6gQzsknN HM+fOR5VIBBDi6NjzDXJ94onu1/XpTYs7faFwUS3AOfsxmUzHcf5Dj1HqbGAnvcxV53y 2UmtQreIX+j1ZJqD6w7/ZbXstBapvZ3KNYJy9qLJam0QIT7+61FrGCnrUh2OGYUjpRNo MWig== X-Gm-Message-State: AOJu0Yy5O7vkpg/UFE+v4eNiYSuKRg8aIaQ3CaleI2pOxVJKBXgfPDFE i7+MO2KuHxBcxAxLkkjaoW/V7lOL8z0fEA== X-Google-Smtp-Source: AGHT+IHkiASEoG9Gi2FrDzQSLRirhq3KEPKdt86nQjKJqIE/Sc7Y+MAIEwV1oBIIGTcCpEGBL+aKTQ== X-Received: by 2002:a2e:b16a:0:b0:2c9:c0c7:1754 with SMTP id a10-20020a2eb16a000000b002c9c0c71754mr1768570ljm.1.1701286575921; Wed, 29 Nov 2023 11:36:15 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 11:36:15 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:40 +0000 Message-ID: <7942ea1d12b00fb231223ee20714b4ecfcb45220.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-gorilla-mux): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/finance.scm: Add (gnu packages golang-web) module. * gnu/packages/web.scm: As above... Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada --- gnu/packages/finance.scm | 1 + gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/web.scm | 1 + 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index cd419f2102..5ff86bcb72 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -93,6 +93,7 @@ (define-module (gnu packages finance) #: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 groff) #:use-module (gnu packages gsasl) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index feb2854d9c..c779600411 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +34,29 @@ (define-module (gnu packages golang-web) ;;; ;;; Code: +(define-public go-github-com-gorilla-mux + (package + (name "go-github-com-gorilla-mux") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/mux") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/mux")) + (home-page "https://github.com/gorilla/mux") + (synopsis "URL router and dispatcher for Go") + (description + "Gorilla/Mux implements a request router and dispatcher for matching +incoming requests with their respective handler.") + (license license:bsd-3))) + ;;; ;;; 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 5e9211026b..7e796db5a9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4737,30 +4737,6 @@ (define-public go-github-com-gorilla-context (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.") (license license:bsd-3)))) -(define-public go-github-com-gorilla-mux - (package - (name "go-github-com-gorilla-mux") - (version "1.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/mux") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/mux")) - (home-page "https://github.com/gorilla/mux") - (synopsis "URL router and dispatcher for Go") - (description - "Gorilla/Mux implements a request router and dispatcher for matching -incoming requests with their respective handler.") - (license license:bsd-3))) - (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4a4252138b..3837dcb043 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -142,6 +142,7 @@ (define-module (gnu packages web) #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk)