From patchwork Wed Nov 8 00:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56048 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 17BE127BBE9; Tue, 7 Nov 2023 21:45:45 +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,URIBL_BLOCKED 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 9BA0F27BBE2 for ; Tue, 7 Nov 2023 21:45:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0TrT-0001IX-Iu; Tue, 07 Nov 2023 16:43:51 -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-0001C0-6r 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 1r0TrC-0007eQ-VF for guix-patches@gnu.org; Tue, 07 Nov 2023 16:43:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Trp-0000fu-2i for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 22/67] gnu: go-github-com-tdewolff-minify-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.16993934112083 (code B ref 66827); Tue, 07 Nov 2023 21:44:13 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:43:31 +0000 Received: from localhost ([127.0.0.1]:43529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tr8-0000XK-FX for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:31 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:52446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Tqt-0000SL-Lx for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:16 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-32f7abbb8b4so3860770f8f.0 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:42:37 -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=zXjwTf7MlPBgQr/bHut4ji2TcYB9gHWKJRh5gubGUU0=; b=f1Y4565v3pfTd4QDFZ650n18Z1LrXqf8ZaILjdyBw+eXvgwc1LeAUo9ryNQRRTAdpl fyLrZDwH1D4au78wH+w011LHQLLMc6Wa4DhKu2I1ADu5oCxeQXtnLFBPSCegc6WryCI3 4VgyN8fSHKmAUYi9ezw91d1l+emHflKqpAyh4XbQdiqZCa0NyFWlSslbNhK39IRUYKSq ZYlh+c2zF1nUYGB7fpdAHlnRm0HiCdhETBlU1O95iFGjNRLlJ4ti71143pnMiL8Kfi4x TxZGDi+Ffv8gzuQ9fbretGNY9fPyHojM+BF/qY+7zmTLY/8yiwj1MvcdY0S8q1H5K79s nyoA== 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=zXjwTf7MlPBgQr/bHut4ji2TcYB9gHWKJRh5gubGUU0=; b=S33VNwIxXODKJ4Xfy+kN/K+WmBA3eQzMbP50a43CcqflXPNQ6gWOC2IVsJE/lWopm/ TdUF5K1RXgJEfeQujXmVzgfK24+VfVAKP1DetIaqmzqnhVJvWH2pGPZoUg6mlzy2FZIx rQBHTlEQhGdpC88tk2vn8Mm4igNcQlBuKRUEx+vC9io0worPWp1ZPvbH/FgLVKlYeEgJ 3F9RlSqWkS6yhZ4xpn/q8yCLagpjTl8E1Ze+55BnPkhtJqWud36gsRzoJI/kwfHVfXeV zCoXu1SajvkgqbOEX8uTmYJINfc9Og+MQ4YNLh1ZwsZIcDjS60U4NhfUrXnCYy0vs5NG 7yaw== X-Gm-Message-State: AOJu0Yw9FqPIecLVtnS7utU1qvc+izTx/XaFgkJiZKjSfbRofO/WzhGW WA5qOeUAHR6NomdZmwqPSldWil4F6NFl2w== X-Google-Smtp-Source: AGHT+IFbPaua5QsmrDFqkNm3Kmvo7+WRu06HVwe3puTozuzomPYxJICPtBXW4FuwBdaVIUmebmv0PA== X-Received: by 2002:adf:f60e:0:b0:32f:8085:7411 with SMTP id t14-20020adff60e000000b0032f80857411mr35387wrp.24.1699393351769; Tue, 07 Nov 2023 13:42: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 p2-20020adfce02000000b0032f9688ea48sm3310178wrn.10.2023.11.07.13.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:42:31 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:40:59 +0000 Message-ID: <3f13ad9e2912f457bf9eac4973df065d983b22a7.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-tdewolff-minify-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I4cee7a25e618cc7427d8669c4b17d028817e378f --- gnu/packages/golang-web.scm | 43 +++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5be08caf2e..d82cac46b9 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. @@ -28,6 +29,7 @@ (define-module (gnu packages golang-web) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system go) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) @@ -466,6 +468,47 @@ (define-public go-github-com-sourcegraph-jsonrpc2 "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") (license license:expat))) +(define-public go-github-com-tdewolff-minify-v2 + (package + (name "go-github-com-tdewolff-minify-v2") + (version "2.12.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/minify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tdewolff/minify/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" "svg"))))))) + (propagated-inputs + (list go-github-com-tdewolff-parse-v2)) + (native-inputs + (list go-github-com-tdewolff-hasher + go-github-com-tdewolff-test)) + (home-page "https://go.tacodewolff.nl/minify") + (synopsis "Go minifiers for web formats") + (description + "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and +an interface to implement any other minifier.") + (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 4a7060f065..70208b87b6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3436,46 +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-minify-v2 - (package - (name "go-github-com-tdewolff-minify-v2") - (version "2.12.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/minify") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/minify/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" "svg"))))))) - (propagated-inputs - (list go-github-com-tdewolff-parse-v2)) - (native-inputs - (list go-github-com-tdewolff-hasher - go-github-com-tdewolff-test)) - (home-page "https://go.tacodewolff.nl/minify") - (synopsis "Go minifiers for web formats") - (description - "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and -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")