From d17d7e6ca1b4517162049dfa7f163b0ab0f737fd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:41 +0000 Subject: [PATCH] gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-css): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module. * gnu/packages/golang.scm: As above... Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 23 +---------------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 95a7e8615f..296f48dcd5 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management) #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c779600411..1d61a76268 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,28 @@ (define-module (gnu packages golang-web) ;;; ;;; Code: +(define-public go-github-com-gorilla-css + (package + (name "go-github-com-gorilla-css") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/css") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gorilla/css/scanner" + #:unpack-path "github.com/gorilla/css")) + (home-page "https://github.com/gorilla/css/") + (synopsis "CSS3 tokenizer") + (description "This package provides a CSS3 tokenizer.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-mux (package (name "go-github-com-gorilla-mux") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index edc8c2bec0..74b5df2fb8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -80,6 +80,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -4816,28 +4817,6 @@ (define-public go-github-com-google-cadvisor containers.") (license license:asl2.0)))) -(define-public go-github-com-gorilla-css - (package - (name "go-github-com-gorilla-css") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/css") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gorilla/css/scanner" - #:unpack-path "github.com/gorilla/css")) - (home-page "https://github.com/gorilla/css/") - (synopsis "CSS3 tokenizer") - (description "This package provides a CSS3 tokenizer.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-context (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") (revision "0"))