From patchwork Wed Nov 29 22:35:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57064 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 849ED27BBE2; Wed, 29 Nov 2023 19:38:19 +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=unavailable 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 CCA7627BBE2 for ; Wed, 29 Nov 2023 19:38:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QN3-0007Vm-KV; Wed, 29 Nov 2023 14:37:17 -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 1r8QMy-0007RB-LP for guix-patches@gnu.org; Wed, 29 Nov 2023 14:37:13 -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 1r8QMy-0008SA-Bw for guix-patches@gnu.org; Wed, 29 Nov 2023 14:37:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QN5-0005xk-Vo; Wed, 29 Nov 2023 14:37:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 23/66] gnu: go-github-com-tdewolff-parse-v2: 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:19 +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.170128663422814 (code B ref 66827); Wed, 29 Nov 2023 19:37:19 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:37:14 +0000 Received: from localhost ([127.0.0.1]:51269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMz-0005va-9C for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:37:14 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:46490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMW-0005n1-Si for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:36:45 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40b4e35ecf1so934655e9.1 for <66827@debbugs.gnu.org>; Wed, 29 Nov 2023 11:36:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701286591; x=1701891391; 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=CZQM/bC3/L0W7jgzcyuWxNcpZpXlx8J4dKpNSsOdr38=; b=j3lTbIRFGN6vs8XRiMtHATWQA39neVxRtdaDaHtLmtqtesN25hl7dfeyAEkM29QPnm mTQDOvaz3+bi1iPW9e1Iz75fpIF0XPe9iLebCsJw3dRQRNSCOn1CQofkRy1cUQZTJ7/w qCjywpCUQU5POkoy30AxXzERRNux4MWK78euwRMwK0B1XW4TkkCwK/wqW0/Lq9qjDRLg AZRQGZeJgA0i5YYPFHQ2/K6+glLoGBhHuiShLgKG2ilcv2y1HHPgxbdJo9+UlmThhYBH fJENNJkNBcTEWsJi1Pa96OB+H+jmpf8vV2fk4j2Tb675jIsXmh7+zmp0kJiYNhPP73Uy LHhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286591; x=1701891391; 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=CZQM/bC3/L0W7jgzcyuWxNcpZpXlx8J4dKpNSsOdr38=; b=iWOKh9lBdtfS0cNiXI/1hI278CfePqgJP07uOpFe2IS1svIKPe/o4a0fH+EI4oZV+8 EFXjL0pPrQgp+Nt4hGyXJRDWqvsIdlEmfjuf2iULxR1+9IviWWo7yxZVS4k34VxeMU0A VoNGSXNtrTkx45h6SjPEt3gDCEytDpu3Mp5q4k3lA2sPZDU7hTeqCLq5tPZKe/m0bZvV vRbxOi0FSzzz65gaCFQ8WFPoklIUkS8EY35cICCRgPU8/xoAR+goDlAU4eBO4arSFbl1 nGF961gtk071pgofIIbp9j0mrlezW68/L2wcpz+8MYaYojRvGDpEDciJ9lgkDU8gLBv8 UWNg== X-Gm-Message-State: AOJu0YySlk/qjLE/ez9aR/+jSkcNECvGdjspluonrMjTSmrbCXXdhuUw QwQIYEEQUNjauNzR1z47+lvGNXyspwsTfw== X-Google-Smtp-Source: AGHT+IFyf0GZrx9akx+2SGztAU/yEAFnosKmdHT/3nABvPaNY8UbjhnMCo8bYyyiaBDQzJK1VXgqIw== X-Received: by 2002:a05:600c:354c:b0:402:cc5c:c98 with SMTP id i12-20020a05600c354c00b00402cc5c0c98mr13982418wmq.13.1701286591343; Wed, 29 Nov 2023 11:36:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 11:36:31 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:01 +0000 Message-ID: <52840c10e13aeb1f7183d150f9a01ba22d4257d2.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-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 202abb196b..786752a0ad 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3437,43 +3437,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")