From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id aEuiBMrePmVwkAAAG6o9tA:P1 (envelope-from ) for ; Sun, 29 Oct 2023 23:38:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aEuiBMrePmVwkAAAG6o9tA (envelope-from ) for ; Sun, 29 Oct 2023 23:38:02 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A50E516EE8 for ; Sun, 29 Oct 2023 23:38:01 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=LP5E4Fii; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698619081; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+ojc9dEzKwXXLi0f8Prwkd2w4GcBD2a8auObYcGvDFw=; b=DsOcUVTvpXDSCS+p3nov6fVIhbQJcHI1SlnWAnL5yWMqtNLLgEEks6f8NlTpSqb3qtRtvg Riw+HFevk76FowIbL4qt4QYcYowC1Cu1z9/QFE6xYKq//0FbzwCEvHFWWfHHJ5g0Ajc19L LppR1D3GK68LBf91dL076XVY4lUWf5aK7ROdxTLLfH+UHdxZy1jKN0O3Xp1rQKxKmL9e7Z TGyaQvroelQBZjp9Q/HiYDhiJvYYXLhMk7L4s6aF44O5NCtIPV5SpvDfk/7sxs2YknoP7D ZFLXexGepyf8GsOQyaTG5+EHwPNaGyg4URsTK6atuC9iKnGmstbIyclzeKl0jg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=LP5E4Fii; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698619081; a=rsa-sha256; cv=none; b=Ocmk4ymbW5DH+xyTK9ScqNbr5nvjSG1l+sF5nQMHJQCWZBBLhwHf0oChbwpg83DRJyc2t5 ASAkNFSiBavgPCbPiTyhzCScRCL4/WnwjWWVxRvmXN9hkUSuB3cGejctOd7ErfOIFvjVmH g4giDow1prJsFBYWDYXl7xmWP7AozfHPE9beY5mjoHdD7qBxwnVTgax674ygF+Zw45zJZf EZTauC2dq92WrUV/hbFSTZB9Rt9ItjHcei1HrysHnhPlK/bLO1yXJoHragntxPBK4qy4WV GmYpL3DroPuMf15wF8qA2U9Rhx3XOaLjhf3/OnxZkAd0BwcruoWk6nkOzxjamw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxDzm-00068b-VU; Sun, 29 Oct 2023 18:10:58 -0400 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 1qxDzg-0005z3-UW for guix-patches@gnu.org; Sun, 29 Oct 2023 18:10:52 -0400 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 1qxDzc-0000Zs-6k for guix-patches@gnu.org; Sun, 29 Oct 2023 18:10:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxE08-0005by-VS for guix-patches@gnu.org; Sun, 29 Oct 2023 18:11:20 -0400 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: Sun, 29 Oct 2023 22:11:20 +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.169861746721289 (code B ref 66827); Sun, 29 Oct 2023 22:11:20 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Oct 2023 22:11:07 +0000 Received: from localhost ([127.0.0.1]:43796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDzt-0005Wi-84 for submit@debbugs.gnu.org; Sun, 29 Oct 2023 18:11:06 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:57752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDzY-0005Pp-1r for 66827@debbugs.gnu.org; Sun, 29 Oct 2023 18:10:44 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5082a932bdeso3502111e87.3 for <66827@debbugs.gnu.org>; Sun, 29 Oct 2023 15:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698617405; x=1699222205; 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=+ojc9dEzKwXXLi0f8Prwkd2w4GcBD2a8auObYcGvDFw=; b=LP5E4FiiC79Gk2ymUApBKJ8xwHf8BE+lwgYJrpdkQlm9yzThcBo+G2rpWChyWnpMrc JODt5cZqODlsrVC5BTFro3IuLldZN+qQthhM4zvpAroZdF0iEOsQGamx26Fa0ZBPXHh9 dLRz5TUwnaTnPPjOKeemn/DRHsTdBCk6MKXsjRfBK+v7Gc7z+Vsye8Xm0N9scc3pw4TN SY3ig9cq6XePICoNZi64ihUOh8ysHvKGdNE+uMYXpZTSFr6F3bhQYd4xL9G5V8OnwXKt n880aFK1QV/mz1hC3Hl2Wa/TAotv5VmgMhAGEfJZ32oUu6UWlSWQ8jDEBXx2mP1Viqs9 OsDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698617405; x=1699222205; 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=+ojc9dEzKwXXLi0f8Prwkd2w4GcBD2a8auObYcGvDFw=; b=CqBf+2KdPX5YwvYnRsgoPNDdZ63ZuMHQQIiaipmO4omCufuIP2HUlJhZHlFQGFGr7V lNnqUjB9jVi5D6nhU12Nbakvpvq6/il3mnTrUtkmY6ypykDvNDDxu4Mnt84Sa5DK9e7X ttv4nxtVZQWTm44Y3cercel38lLRciaDc1cveeOwV/j1zfYLBXpwLa9HGSgtjAy4I5Kz bH2UyZnD+RGiV+lLWcKgH3sblAhTOHoBk4qCE3DPyliO+k76akQIcdPOF9PnsDtDh5Td EuWtaMf+FhkXQDIP/aBrUEgxGWT0fu5JpZUWQRx0h/1/AKuv44GkWwSEtyNXX5O1q6zX prAQ== X-Gm-Message-State: AOJu0YyLhj/Ocn0U9yIANlKXMuo+tJ3Ds/CLjl1Tiphh56tIduNclTno 60QaJcTDfsc5dQ0QlrUxG92seRTnx4lq2Q== X-Google-Smtp-Source: AGHT+IEfgVBsHhDC3bFizqnjW7WmHBBFPoQnbeJUHHzMw3Sf1f3jkj0mkaDMQLKEIP2a0saXaDLThA== X-Received: by 2002:a05:6512:114b:b0:507:9ae6:6913 with SMTP id m11-20020a056512114b00b005079ae66913mr7301475lfg.28.1698617405306; Sun, 29 Oct 2023 15:10:05 -0700 (PDT) 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 3-20020a05600c234300b004063cced50bsm7527511wmq.23.2023.10.29.15.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 15:10:05 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 30 Oct 2023 01:08:36 +0000 Message-ID: <3cfba248549489bcfc89dba55708962a67f0663d.1698627461.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 7.90 X-Spam-Score: 7.90 X-Migadu-Queue-Id: A50E516EE8 X-Migadu-Scanner: mx13.migadu.com X-TUID: nuaMOLjvAoOz * 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 969cbd886f..143487c881 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") -- 2.41.0