From patchwork Mon Oct 30 01:08:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55578 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 8FA4F27BBEA; Sun, 29 Oct 2023 22:10:49 +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 4AAF727BBE2 for ; Sun, 29 Oct 2023 22:10:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxDzN-0005qn-QV; Sun, 29 Oct 2023 18:10:33 -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 1qxDzK-0005ps-TS for guix-patches@gnu.org; Sun, 29 Oct 2023 18:10: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 1qxDzK-0000Uu-12 for guix-patches@gnu.org; Sun, 29 Oct 2023 18:10:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxDzq-0005Vi-Of for guix-patches@gnu.org; Sun, 29 Oct 2023 18:11:02 -0400 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: Sun, 29 Oct 2023 22:11: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.169861743520775 (code B ref 66827); Sun, 29 Oct 2023 22:11:02 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Oct 2023 22:10:35 +0000 Received: from localhost ([127.0.0.1]:43705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDzN-0005Oa-4q for submit@debbugs.gnu.org; Sun, 29 Oct 2023 18:10:34 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:61716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDzK-0005Nw-EF for 66827@debbugs.gnu.org; Sun, 29 Oct 2023 18:10:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4083f61312eso30485675e9.3 for <66827@debbugs.gnu.org>; Sun, 29 Oct 2023 15:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698617391; x=1699222191; 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=Aw+Ba1YqqPQ86ED6CTiAfwNSiVdsG8GHVtLI4lweoqA=; b=TJyoTdiRhc1+CuBLYkQHJvqNQWcFZ9tn14FIv8GDu9/76ZwYABiL/c2bXO49GFz65N rGOoxRWM6zZW002CSqlPcbCvQn+E6WEOzSpcZ3O/XvTv1mTt9W9ztdusUVyrBNO0j9Ks kXhF6FcUrVmeqoatKiADfplVJ3Nt1F/AfG+RVutZZ0LA5+p73FSrJqondrJ5J9wbEyAx s/aTfpMUbTnt6GatWpbAZ1Xo41ZtfvL+XDAbfnE3I2xQEpoiLN5bCiA9FIZaAeZ2Zi2c +xWpGoEDnMIbbDDrSLXetzHCjaGXUTQYcpgB3BICi28xTZSvEis+psxUoMuWrXZvLbPa rTxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698617391; x=1699222191; 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=Aw+Ba1YqqPQ86ED6CTiAfwNSiVdsG8GHVtLI4lweoqA=; b=ArABTn29JOonzFnyeFc97ysXIcicWeTzW62thyYHS8e+dicWZGmP+xNCe4sF8hnTHy fuhW2GPFN4te53BkVZZVYnuV6CGcPNqGwO8jtsejSmKRAAzGvg2SeSktjFGQ4y+o3LQU wJ34eDU1w5mzdSq8KhMphsIsGiJoE9oOKon6AgyHbiZSS2gOfLlxee09EvEMre0D/TPt PSAXUadtAEGlt6KPfAF45S9tgHdt8DXn6dJdIkJArlQaA9A9Fkcb53WdLflF/84Vxnnn izYpuicfi72ztJv46wtuIpSn+8MSp/BtTkWmKwvcJjXb64vU6YJlzN3+ElKkv9vcibJm 65VQ== X-Gm-Message-State: AOJu0YyIF1h/pzDc+1PiGU051+7VgOAbuk1tDYd5C3aCRorn6q4OQWIQ t8ZoWDrtAWnyEgEiZIGTff6bmWy1rVV3Tg== X-Google-Smtp-Source: AGHT+IF0bYYiBXws3lOqZCcyg6Y4oZmkP5E2YeDtWMk40pUsPe28zS5FaNRBbFTmjjfS/TdacmEKkw== X-Received: by 2002:a05:600c:19cc:b0:408:3a67:f6f5 with SMTP id u12-20020a05600c19cc00b004083a67f6f5mr7526736wmq.18.1698617391340; Sun, 29 Oct 2023 15:09:51 -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.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 15:09:50 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 30 Oct 2023 01:08:16 +0000 Message-ID: <397c9e9fccb9c3a2c330d606fb01fb62aa0b6d62.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-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 b32e379e47..212f5a2303 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 b1cdfda862..1576f39052 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)