From patchwork Wed Nov 8 00:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56084 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 E62B527BBEA; Tue, 7 Nov 2023 21:47: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 EABAB27BBE9 for ; Tue, 7 Nov 2023 21:47:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0TrX-0001NB-U3; Tue, 07 Nov 2023 16:43:55 -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 1r0TrD-0001C9-MH for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:35 -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 1r0TrD-0007eZ-El for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Trp-0000g2-It for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 23/67] gnu: go-github-com-tdewolff-parse-v2: 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:13 +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.16993934122099 (code B ref 66827); Tue, 07 Nov 2023 21:44:13 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:43:32 +0000 Received: from localhost ([127.0.0.1]:43532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tr9-0000XY-BX for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:32 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:58840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tqu-0000ST-ED for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:17 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-32dc9ff4a8fso3515490f8f.1 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699393352; x=1699998152; 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=Tup21QQ9audwgxtanZlgqcCgO/haYBEOoWBCmXIEkMg=; b=RdbKLlfZz0hjChp8seB2buXUlYzab885ipMucmnR7xnCaoo9IE+vjrNxeB68d+wDO9 QxPiH92mW7uiuZeBuY/wbbBOKBT2Qf3AY+3rwlenMeu9g8w59Bv0Irn+xg4a1sTiyuBO 1Z4k1mQfhc5W0zV0eclKDuOsvt5hBQiLvgWavAejYVnI8tKJSjDwucekt2tf10Y/vlAX LMLjofPm2sqS82t6qRJ7w/PsFZ9AtoRYpgAHeT9XDCYhuUmhq8OPJpxUB+6e8LlOU073 JXewCe6Qy7WEuem2VCTik0X/nN8evBwvR5A+lFkm5dz+ogvfUEwKCjlI5fmnUnD471Py OFgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699393352; x=1699998152; 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=Tup21QQ9audwgxtanZlgqcCgO/haYBEOoWBCmXIEkMg=; b=SbZ5bfac0y/hvVZq+RFAJFk4aU1rp3B1PTkYGfQ+UZgx6ZJEtaIv1FurXtsAeHfSjK p82IS7kWLMFr4juaSA6CvKTmkemXKsM73IbPFPFZNbB2kAUXeqLfylHyTzr7evizzH5K SKbSVhVqsWfmD47YO9Q7dr+ouYMdF8j97OCOJjj9YuXHEsmMj/B0p2bZxpWxKppdNNSM TxTKcRlvMAdsFR85uPheteDxbB8xLdK36f50fjv7n/V++RKwcVscqXvAYwE1lfsn7V1U 0YGXEo/63i+paNdOWUesgez2pjzK/sQtvt/ZT5yTWAf0ob7J24RRZliLwMQlBjJ1GKIr OFiw== X-Gm-Message-State: AOJu0Yw8MRW73+oTzWwGgPVbp8sAR0edz/QvD3UbNB9PZYmSrnOKjLGA W22GbAOseTQidIRIBbXgE9t8Ho0htWUczA== X-Google-Smtp-Source: AGHT+IGQ850dHROsNGuIbvDugPp0k7CImc0rPOkDfB8NHSwhOg/P/xdWb8AROK2BcRdjDuWfuZuORg== X-Received: by 2002:a05:6000:156b:b0:32f:a7d5:4ef with SMTP id 11-20020a056000156b00b0032fa7d504efmr24263wrz.44.1699393352512; Tue, 07 Nov 2023 13:42:32 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:42:32 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:41:00 +0000 Message-ID: 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-tdewolff-parse-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Id58c54359f1bf55c6fc8178ce142bf985858bb87 --- gnu/packages/golang-web.scm | 38 +++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 37 ------------------------------------ 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d82cac46b9..9e68e96baf 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -509,6 +509,44 @@ (define-public go-github-com-tdewolff-minify-v2 an interface to implement any other minifier.") (license license:expat))) +(define-public go-github-com-tdewolff-parse-v2 + (package + (name "go-github-com-tdewolff-parse-v2") + (version "2.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/parse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tdewolff/parse/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'regenerate-hash + (lambda* (#:key import-path #:allow-other-keys) + (for-each + (lambda (dir) + (with-directory-excursion + (format #f "src/~a/~a" import-path dir) + (make-file-writable "hash.go") + (format #t "Generating `hash.go' for ~a...~%" dir) + (invoke "go" "generate"))) + '("css" "html"))))))) + (native-inputs + (list go-github-com-tdewolff-hasher + go-github-com-tdewolff-test)) + (home-page "https://github.com/tdewolff/parse") + (synopsis "Go parsers for web formats") + (description + "This package contains several lexers and parsers written in Go.") + (license license:expat))) + ;;; ;;; 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 70208b87b6..c4ae0091d2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3436,43 +3436,6 @@ (define-public go-github-com-tdewolff-hasher @code{string} to @code{uint32} mapper.") (license license:bsd-3))) -(define-public go-github-com-tdewolff-parse-v2 - (package - (name "go-github-com-tdewolff-parse-v2") - (version "2.6.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/parse") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/parse/v2" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'regenerate-hash - (lambda* (#:key import-path #:allow-other-keys) - (for-each - (lambda (dir) - (with-directory-excursion - (format #f "src/~a/~a" import-path dir) - (make-file-writable "hash.go") - (format #t "Generating `hash.go' for ~a...~%" dir) - (invoke "go" "generate"))) - '("css" "html"))))))) - (native-inputs - (list go-github-com-tdewolff-hasher - go-github-com-tdewolff-test)) - (home-page "https://github.com/tdewolff/parse") - (synopsis "Go parsers for web formats") - (description - "This package contains several lexers and parsers written in Go.") - (license license:expat))) - (define-public go-github-com-tj-docopt (package (name "go-github-com-tj-docopt")