From patchwork Wed Nov 29 22:35:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57068 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 31A4A27BBE9; Wed, 29 Nov 2023 19:38:37 +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 2E56E27BBE2 for ; Wed, 29 Nov 2023 19:38:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QN2-0007UW-MN; Wed, 29 Nov 2023 14:37:16 -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 1r8QMx-0007Qy-Qf for guix-patches@gnu.org; Wed, 29 Nov 2023 14:37:11 -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 1r8QMx-0008Rz-Hj for guix-patches@gnu.org; Wed, 29 Nov 2023 14:37:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QN5-0005xU-5B; Wed, 29 Nov 2023 14:37:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 22/66] gnu: go-github-com-tdewolff-minify-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.170128663222773 (code B ref 66827); Wed, 29 Nov 2023 19:37:19 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:37:12 +0000 Received: from localhost ([127.0.0.1]:51257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMw-0005ua-Hs for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:37:12 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMV-0005mq-W6 for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:36:44 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40b4746ae51so957985e9.2 for <66827@debbugs.gnu.org>; Wed, 29 Nov 2023 11:36:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701286590; x=1701891390; 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=Ee1WE8/KPYfBbz9Yx65CeoF9Zpqd9sEj/eHKcSA2Mio=; b=DagylddApif4us+FgjU5hvur4E5ArC9DNm5DLCW5WNMozU/HT+4Z/h2reQ8Mw8Qkfg KKPsPNcMFYpQm+TXeAVoVO2RjprMGWVQ4ybRHOlXLNWSm/Gc6yYDHZmrlahsiPOXyPzV ZANOPsQElyB8f2y4cyIYUxzOa1CouM+pW8FWhZqRDF7+Xb08bbvSn4PZx8XaWUt2cBXp 1JsANLU5wGxOvzug/qfFgeztWX5p4aVIZVzCwp2N/ZfLLjF6DOe45jNTzSkci/fHV1lb QOeingVWI6dejplagPIun7wJgTWw4bfteCoGyrej6kRW0dGz15yING4htS1kWjv+X0Fz PotA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286590; x=1701891390; 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=Ee1WE8/KPYfBbz9Yx65CeoF9Zpqd9sEj/eHKcSA2Mio=; b=UQR9roV3+1XNgU4Awz+An783wRWRL9Wsdl4CD9ht/4gCmKJoVn+sfT0xWlv3BtQ+qy JQd8kLcz6cyeytJJGq/d6jsdl3bS821Xtw91mVF89jTouNll6xvy8pRU/57+5Ih/mBu3 mwZ+NDqplyLU/qFH6JHAJ7g2SnnGz/A4tuCOutzY0wjMheKnfI5Rt3B4JUkWjRCZ47r8 mfQkKz0sSUlPGttalG3qIOxfWhZ2pAkI8jyJVnY0tWW2cV6yVqPCGyYTUlhKx0azSdp9 Y1ZGoyOKl4Cq4412ImPzM/XfjRzPsarM987VhVB9QZUq6B5gAw/Tn5Aa88H2E/BOccXR hk6Q== X-Gm-Message-State: AOJu0YyMURtYOip8awhOcTwJ+5hbQ00F6e35vyaB5joM70KAvnkDy30R 8vHhbHzvEn073sX9jt5vSEtF+U4Eh9yzCQ== X-Google-Smtp-Source: AGHT+IHD/21CHKuASttdexq3WaeD0zzzJ2Ext6eeXj8oNlnsDWUkHpXBUCe6Iv2ZRIy7QQoXQ8HMcQ== X-Received: by 2002:a05:600c:5494:b0:40b:4c39:b4e with SMTP id iv20-20020a05600c549400b0040b4c390b4emr4792272wmb.1.1701286590637; Wed, 29 Nov 2023 11:36:30 -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:30 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:00 +0000 Message-ID: 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-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 15c32b9b6a..202abb196b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3437,46 +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-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")