From patchwork Wed Nov 8 00:40: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: 56023 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 D7BCF27BBE2; Tue, 7 Nov 2023 21:43: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 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 917F127BBE9 for ; Tue, 7 Nov 2023 21:43:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Tr4-00015H-Nn; Tue, 07 Nov 2023 16:43:26 -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 1r0Tr3-00014b-Dr for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:25 -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 1r0Tr3-0007by-66 for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Trf-0000cc-9I for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 03/67] gnu: go-github-com-gorilla-css: 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: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 Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.16993933861701 (code B ref 66827); Tue, 07 Nov 2023 21:44:03 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:43:06 +0000 Received: from localhost ([127.0.0.1]:43456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tqj-0000R9-Ou for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:06 -0500 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:53307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tqg-0000Pp-A0 for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:03 -0500 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507d1cc0538so8351266e87.2 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:42:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699393338; x=1699998138; 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=N1VzS+45JhMQWlhQRBgohHSmmUW9rtRlXD3uvrCi4L8=; b=R8fFE58WIMa0s3ZKv1fdU5Q42JIAM/C7JUeuTaf8jXUekP6sv6jfjIiICKqQriBxDV hdqjIxnBGVlEPsKxthY3BwgQSI3GLEXWf+432msBYPdQYSIwX7CwTHmr8fhn92VxkGj3 UE2EAwfXMSpu5l8RCh6JUvrmzkyGBBRmXmSc2Zkqu0pzJUuCoBbvCwx1sRkw0eCvjoZJ OzrBNF8KILEiyQCASL7Glu5fT0Rn7yt73Zvo3SfUmNhiJCoZ7FmrboiRmxoSUR1kBF0c hH+oHkicEKf5YkZ6L2fOIiOYw2EYRb8rZ2zpkCT65h4CKXhytou4iVj4FBzGs9eq3Swh t+8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699393338; x=1699998138; 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=N1VzS+45JhMQWlhQRBgohHSmmUW9rtRlXD3uvrCi4L8=; b=kuLGoh3xY+PCEOyWFNXWxSoH3DftYyTQ3F8n+rOxSPcjfpr1qUHGSqtRGeVxooNIPZ 9IIXaWu18rOr62OA/HIUVHcYDni+iJPP+wtWYDxOYEpzLX65qzcbdfuclubZ4fBvPW8w HHXly5Bqro+a+CckbPhplVLeTDmZXpuxtagNnCMT7fmJxpK4AyKhSVasFYu8WEKNQV8W GKhBZUZqJyRXfUT6abgufUV6R7Qc0SEMrxrIue19Q5JMkXfM1pooGyojrvW9c0agdUOf 9qy0lBDJ+Y8YKQDjPb20gRPXnJeblmOV2ghAr/YvbByezpV9mlba7XWOQ5m73w4/giNQ 2r/Q== X-Gm-Message-State: AOJu0YxmfLywbWHY7XPk1WByCKnqJ/UUvr2jiEYkS93RYpL4mPLGEPNA yNfhq6VR0vFR+WVGB1CmAwnJp2vRSydACQ== X-Google-Smtp-Source: AGHT+IGqgNqly/yGlxhbWye/DWS3OgpPoris3Gf15IKp2QGZ7d/SQ9ww9no9HfL8+B6KUMIviwetJQ== X-Received: by 2002:a19:6d1b:0:b0:507:95ea:1e72 with SMTP id i27-20020a196d1b000000b0050795ea1e72mr22179935lfc.22.1699393337882; 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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:42:17 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:40:40 +0000 Message-ID: <28b2fdbc101d69f8e539ef92b459ee666d355d13.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-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 f583bd53c5..db335858f6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -79,6 +79,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) @@ -4655,28 +4656,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"))