From patchwork Wed Nov 8 00:40:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56076 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 4853927BBE2; Tue, 7 Nov 2023 21:47:31 +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=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 4553C27BBE9 for ; Tue, 7 Nov 2023 21:47:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Tr3-00014c-FB; Tue, 07 Nov 2023 16:43:25 -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 1r0Tr2-00014T-Nd for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:24 -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 1r0Tr2-0007bn-GO for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:24 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Tre-0000cO-JW for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 02/67] gnu: go-github-com-gorilla-mux: 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:44: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.16993933851686 (code B ref 66827); Tue, 07 Nov 2023 21:44:02 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:43:05 +0000 Received: from localhost ([127.0.0.1]:43453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tqi-0000R0-TZ for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:05 -0500 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:50591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tqf-0000Pn-F0 for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:02 -0500 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-507975d34e8so8917708e87.1 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699393337; x=1699998137; 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=/Wj2HmFSDZVETOrzUxtvqEA4xTbvB75H9uPoBTmpig4=; b=Hu9b4lDu7Ah2ok9Vm7SFtSmFFAqtHm6200Wbe5HPCXo2UGSqnes4qRrrskKoMjkTAI ssJVNQVfNM8uO4rVcUK1eLzqtVD903uQiG0+E2af3SgkYypC9t/Wnhm+fFJTej0u2+oO dKEUdXdMwxILXl4NP6m791w85E+NX5YpDTt6Wj1TOEfqC8GrrRtqcsLXLbD9HjcRiU6X ZYlOUXUxvfdc9lE8JP9vOPVZtuw/u/GRHie12aZw1aQh06lN5B5ehp9X6o3Zts2FKhbb 6PBpIzIS5usP98IQrqCtqJCykzRAH+BFRof1sYD+GpqXNbofBWv1I0xDj01Etdimo8mv kXVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699393337; x=1699998137; 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=/Wj2HmFSDZVETOrzUxtvqEA4xTbvB75H9uPoBTmpig4=; b=kfz6S7nAzEVsiHqRlc6rtALRCTxv72q50Oe87x98P8/Hs9upBmdCS9bmC9o+mqC9Fx xFbMnlnLz5pOSxFlMfL49QVvG+KTW2iLF+FloE1B44UHKkGLtogexQL/rmABggl1rs6l N77eW2DLs2K7Y8PnnQWzLYkcPPNGBtIOq4pLC2NIDmjeegZehTeVWyrENCLVtGAHlN/8 IFc0epdFF50kMqzLlF4h2swmElH9I0v7aaN6ComgWzE5npQNP8hiJHSHeONFRfAJSPsC Z+xMLzjAJRqNIvfA10rjjep8C1REj2HyW8c3IPPmvZmVvVe+dXIwwmaq43gJzlsF1Uoc 13SQ== X-Gm-Message-State: AOJu0Yy3KH1+8lp3LEuAHjFiZjITbXDu/65iypaBTMm+z0BDpdlbW0ea 3gEHH7vVjzL5KQAExd7o8I+UhE0tfYfs5A== X-Google-Smtp-Source: AGHT+IGMeKsFefld22il7JLCdxK10LdQ8YCHmSteRcOk4IVeGdmb3W28cJKpZw7TnfIX//NBOZ2rJA== X-Received: by 2002:ac2:52b6:0:b0:500:9bbf:da17 with SMTP id r22-20020ac252b6000000b005009bbfda17mr24135465lfm.51.1699393337118; Tue, 07 Nov 2023 13:42:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:42:16 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:40:39 +0000 Message-ID: <3b6200738d7a91daa1d1c716ec04b3793fe0e2d2.1699403992.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-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 4f3415232c..71dff964d5 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 9c707e5414..f583bd53c5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4701,30 +4701,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 66d09700db..4055923fb1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -141,6 +141,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)