From patchwork Wed Nov 29 22:34:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57061 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 9076D27BBE9; Wed, 29 Nov 2023 19:37:57 +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 C9A2C27BBE2 for ; Wed, 29 Nov 2023 19:37:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QMo-0007Lq-Hm; Wed, 29 Nov 2023 14:37:02 -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 1r8QMj-0007KT-Mv for guix-patches@gnu.org; Wed, 29 Nov 2023 14:36:58 -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 1r8QMi-0008Pi-S5 for guix-patches@gnu.org; Wed, 29 Nov 2023 14:36:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QMq-0005sE-FE; Wed, 29 Nov 2023 14:37:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 03/66] gnu: go-github-com-gorilla-css: 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:04 +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.170128659722230 (code B ref 66827); Wed, 29 Nov 2023 19:37:04 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:36:37 +0000 Received: from localhost ([127.0.0.1]:51158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMO-0005mK-SU for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:36:37 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:53312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMI-0005kf-Ja for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:36:31 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40b4734b975so965175e9.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=1701286577; x=1701891377; 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=nXN8Ry2Hod4q8AwXchJPVlPpKezmTGz+pZMbb8j6DQs=; b=G96dbeMY6Pg8Ben8y+AaWGbDUIBY/VuLYzrOlXLAvChVzsvu9O9TKKRBCn9L9/Zu3y ZlIKU7TozXDq95KiHBgoKPB0nan/SoiMzu9yAjNKwXZ29D2ZUDZYgNhmdzTlYQMSQvM3 T7fvFkecCqCe7TmIzMLUfi3d/PFXof4qGIwD4HwlMa9HpOG7qf1dQTb3dxoQ8faQ1zvS +AxavxPGTvka7n/ER0u25Z2S7QKRRzXvfaXqUKCHaFbL+b2k2EBu5RKJTYrzPaYgEY4/ zfm5TxFbK1FoQEcmgCwrBwWgHkxUds+/7s/5KolgfIWVZTzwubZ/mCWsNK7Vj3UM1ca9 0DLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286577; x=1701891377; 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=nXN8Ry2Hod4q8AwXchJPVlPpKezmTGz+pZMbb8j6DQs=; b=iLiYY1JwdbTghkaE1RB6SSXPy1N9zNxo/SkAi3AOGqUD70MYy82nxuew2fjU3G/wd4 PsJ+FC6m5pvRi7HJslm1N8neZHRqiu56wTILuf51ZO98BjsdsalLVAL2oBatdteWxIz2 rrAkt9PBNFaZ7xj+UGqZ265hWC9p+LwL0fPXAHwrXFtRP1FpCEgiPzy5YxF2ny0iKpdv +we29pNcIJRJB0rr1/VJUywqLaqj/GLLHxFSEKbRHP+W+r9WMC6YEAlkNSyro8h0TuYm wD8LE5hID4GQuqnRjQWebQks9Ny0DfXFgmDq1+ode4+GS6TNwZ8FoXvyndm2r4JeYpqA 5Fvw== X-Gm-Message-State: AOJu0YxOBz8Erhs8SKKd9jTofO/KLDN7GP697Ox3gVRVh0XQfXoa+arW cf3VUV8kE0Oyq6eMQQT4fs46vD4ltzvNtA== X-Google-Smtp-Source: AGHT+IGfYcHZgyF+KE/c5NzyNM6qTLZDMiUZBuTWye++4zFwksGBf5fso2fVDI5LjWAV3UUMtMCGqQ== X-Received: by 2002:a05:600c:1c11:b0:405:3dbc:8823 with SMTP id j17-20020a05600c1c1100b004053dbc8823mr16220981wms.12.1701286576672; Wed, 29 Nov 2023 11:36:16 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 11:36:16 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:41 +0000 Message-ID: <519d514afc934c84d30e0e9eaadb2e14cc11c388.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-css): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module. * gnu/packages/golang.scm: As above... Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 23 +---------------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 95a7e8615f..296f48dcd5 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management) #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c779600411..1d61a76268 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,28 @@ (define-module (gnu packages golang-web) ;;; ;;; Code: +(define-public go-github-com-gorilla-css + (package + (name "go-github-com-gorilla-css") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/css") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gorilla/css/scanner" + #:unpack-path "github.com/gorilla/css")) + (home-page "https://github.com/gorilla/css/") + (synopsis "CSS3 tokenizer") + (description "This package provides a CSS3 tokenizer.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-mux (package (name "go-github-com-gorilla-mux") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7e796db5a9..0c7d22281a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -80,6 +80,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -4691,28 +4692,6 @@ (define-public go-github-com-google-cadvisor containers.") (license license:asl2.0)))) -(define-public go-github-com-gorilla-css - (package - (name "go-github-com-gorilla-css") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/css") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gorilla/css/scanner" - #:unpack-path "github.com/gorilla/css")) - (home-page "https://github.com/gorilla/css/") - (synopsis "CSS3 tokenizer") - (description "This package provides a CSS3 tokenizer.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-context (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") (revision "0"))