[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/65: gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-we
From: |
guix-commits |
Subject: |
28/65: gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web). |
Date: |
Wed, 3 Jan 2024 16:51:16 -0500 (EST) |
apteryx pushed a commit to branch master
in repository guix.
commit 8a8b218b3fa963e078d63b38774539ee1cf9ae15
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Wed Nov 29 22:35:06 2023 +0000
gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web).
* gnu/packages/golang.scm (go-github-com-bep-golibsass): Move from
here...
* gnu/packages/golang-web.scm: ...to here.
Change-Id: I514ae05a8c04eea2084cbcb7e4d84c83b6b71bb4
---
gnu/packages/golang-web.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 58 ------------------------------------------
2 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9aa3fe8233..72f2a7d84c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -34,7 +35,8 @@
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
- #:use-module (gnu packages golang-check))
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages web))
;;; Commentary:
;;;
@@ -95,6 +97,63 @@ the parse trees produced by the html package.")
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-bep-golibsass
+ (package
+ (name "go-github-com-bep-golibsass")
+ (version "0.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bep/golibsass")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "libsass_src")
+ #t))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bep/golibsass/libsass"
+ #:unpack-path "github.com/bep/golibsass"
+ ;; The dev build tag modifies the build to link to system libsass
+ ;; instead of including the bundled one (which we remove.)
+ ;;
https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
+ #:build-flags '("-tags" "dev")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-bindings
+ ;; Generate bindings for system libsass, replacing the
+ ;; pre-generated bindings.
+ (lambda* (#:key inputs unpack-path #:allow-other-keys)
+ (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
+ (let ((libsass-src (string-append (assoc-ref inputs
"libsass-src") "/src")))
+ (substitute* (string-append "src/" unpack-path "/gen/main.go")
+ (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
+ (string-append "\"" libsass-src "\""))
+ (("../../libsass_src/src/")
+ libsass-src)))
+ (invoke "go" "generate" (string-append unpack-path "/gen"))
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (if tests?
+ (invoke "go" "test" import-path "-tags" "dev"))
+ #t)))))
+ (propagated-inputs
+ (list libsass))
+ (native-inputs
+ `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
+ ("libsass-src" ,(package-source libsass))))
+ (home-page "https://github.com/bep/golibsass")
+ (synopsis "Easy to use Go bindings for LibSass")
+ (description
+ "This package provides SCSS compiler support for Go applications.")
+ (license license:expat)))
+
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 84dead6293..a49df748f7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10508,64 +10508,6 @@ is unchanged. This package contains a series of small
enhancements and
additions.")
(license license:bsd-3))))
-(define-public go-github-com-bep-golibsass
- (package
- (name "go-github-com-bep-golibsass")
- (version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bep/golibsass")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "libsass_src")
- #t))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bep/golibsass/libsass"
- #:unpack-path "github.com/bep/golibsass"
- ;; The dev build tag modifies the build to link to system libsass
- ;; instead of including the bundled one (which we remove.)
- ;;
https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
- #:build-flags '("-tags" "dev")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'generate-bindings
- ;; Generate bindings for system libsass, replacing the
- ;; pre-generated bindings.
- (lambda* (#:key inputs unpack-path #:allow-other-keys)
- (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
- (let ((libsass-src (string-append (assoc-ref inputs
"libsass-src") "/src")))
- (substitute* (string-append "src/" unpack-path "/gen/main.go")
- (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
- (string-append "\"" libsass-src "\""))
- (("../../libsass_src/src/")
- libsass-src)))
- (invoke "go" "generate" (string-append unpack-path "/gen"))
- #t))
- (replace 'check
- (lambda* (#:key tests? import-path #:allow-other-keys)
- (if tests?
- (invoke "go" "test" import-path "-tags" "dev"))
- #t)))))
- (propagated-inputs
- (list libsass))
- (native-inputs
- `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
- ("libsass-src" ,(package-source libsass))))
- (home-page "https://github.com/bep/golibsass")
- (synopsis "Easy to use Go bindings for LibSass")
- (description
- "This package provides SCSS compiler support for Go applications.")
- (license license:expat)))
-
(define-public go-github-com-hashicorp-go-syslog
(package
(name "go-github-com-hashicorp-go-syslog")
- 15/65: gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web)., (continued)
- 15/65: gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 12/65: gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 13/65: gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 17/65: gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 18/65: gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs., guix-commits, 2024/01/03
- 19/65: gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 23/65: gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 24/65: gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 26/65: gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 27/65: gnu: go-github-com-google-safehtml: Remove input labels., guix-commits, 2024/01/03
- 28/65: gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web).,
guix-commits <=
- 29/65: gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 31/65: gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 33/65: gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 41/65: gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 08/65: gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 03/65: gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 04/65: gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 09/65: gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 02/65: gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web)., guix-commits, 2024/01/03
- 10/65: gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web)., guix-commits, 2024/01/03