sharlatan pushed a commit to branch go-team
in repository guix.
commit 68d6daba58a939aa34444026523c1f03008e3783
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Sat Feb 15 17:49:44 2025 +0000
gnu: go-wrap: Move to fontutils.
* gnu/packages/golang.scm: Add (gnu packaes golang-xyz) and (guix
build-system go).
(go-wrap): Move from here ...
* gnu/packages/fontutils.scm: ... to here.
Change-Id: Ica77e4b936520991ba878bf2afbc47dfa89d88fe
---
gnu/packages/fontutils.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 54 ------------------------------------------
2 files changed, 58 insertions(+), 54 deletions(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index d2d3b1a260..abeba93991 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -19,8 +19,10 @@
;;; Copyright © 2023 John Kehayias <[email protected]>
;;; Copyright © 2023 Janneke Nieuwenhuizen <[email protected]>
;;; Copyright © 2023 pinoaffe <[email protected]>
+;;; Copyright © 2023 Liliana Marie Prikler <[email protected]>
;;; Copyright © 2024 Sören Tempel <[email protected]>
;;; Copyright © 2023 Zheng Junjie <[email protected]>
+;;; Copyright © 2024 Sou Bunnbu (宋文武) <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -55,6 +57,7 @@
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
@@ -86,6 +89,7 @@
#:use-module (guix build-system copy)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
@@ -1441,6 +1445,60 @@ applications should be.")
(license license:lgpl2.1+)
(home-page "https://scripts.sil.org/cms/scripts/page.php?cat_id=teckit";)))
+;; NOTE: A warning from upstream: This program is currently not actively
+;; maintained, it seems to work fine, but use at your own risk.
+(define-public go-wrap
+ (package
+ (name "go-wrap")
+ (version "0.3.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ ;; Original URL <https://github.com/Wraparound/wrap>, now
+ ;; redirects to this.
+ (url "https://github.com/eprovst/wrap";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xk1zii8vqzfys48phpdnr8ign0xvrsfwzyk9m0is9i3rffm25wh"))
+ (patches (search-patches
+ "go-github-com-wraparound-wrap-free-fonts.patch"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/eprovst/wrap/cmd/wrap"
+ #:unpack-path "github.com/eprovst/wrap"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-fonts
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (for-each
+ (lambda (program)
+ (wrap-program program
+ `("XDG_DATA_DIRS" suffix
+ ,(map dirname
+ (search-path-as-list '("share/fonts")
+ (map cdr inputs))))))
+ (find-files (string-append (assoc-ref outputs "out")
+ "/bin"))))))))
+ (native-inputs
+ (list go-github-com-spf13-cobra
+ go-github-com-signintech-gopdf
+ go-github-com-flopp-go-findfont))
+ (inputs
+ (list font-liberation
+ font-gnu-freefont))
+ (home-page "https://github.com/eprovst/wrap";)
+ (synopsis "Format Fountain screenplays")
+ (description
+ "Wrap is a command line tool that is able to convert Fountain files into
+a correctly formatted screen- or stageplay as an HTML or a PDF. It supports
+standard Fountain, but also has some custom syntax extensions such as
+translated keywords and acts.")
+ (license license:gpl3)))
+
(define-public graphite2
(package
(name "graphite2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1777990b57..6903664337 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1521,60 +1521,6 @@ the golang proxy package which connects through a TURN
relay. It provides
parsing and encoding support for STUN and TURN protocols.")
(license license:bsd-3)))
-;; NOTE: A warning from upstream: This program is currently not actively
-;; maintained, it seems to work fine, but use at your own risk.
-(define-public go-wrap
- (package
- (name "go-wrap")
- (version "0.3.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- ;; Original URL <https://github.com/Wraparound/wrap>, now
- ;; redirects to this.
- (url "https://github.com/eprovst/wrap";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1xk1zii8vqzfys48phpdnr8ign0xvrsfwzyk9m0is9i3rffm25wh"))
- (patches (search-patches
- "go-github-com-wraparound-wrap-free-fonts.patch"))))
- (build-system go-build-system)
- (arguments
- (list
- #:install-source? #f
- #:import-path "github.com/eprovst/wrap/cmd/wrap"
- #:unpack-path "github.com/eprovst/wrap"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'wrap-fonts
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (for-each
- (lambda (program)
- (wrap-program program
- `("XDG_DATA_DIRS" suffix
- ,(map dirname
- (search-path-as-list '("share/fonts")
- (map cdr inputs))))))
- (find-files (string-append (assoc-ref outputs "out")
- "/bin"))))))))
- (native-inputs
- (list go-github-com-spf13-cobra
- go-github-com-signintech-gopdf
- go-github-com-flopp-go-findfont))
- (inputs
- (list font-liberation
- font-gnu-freefont))
- (home-page "https://github.com/eprovst/wrap";)
- (synopsis "Format Fountain screenplays")
- (description
- "Wrap is a command line tool that is able to convert Fountain files into
-a correctly formatted screen- or stageplay as an HTML or a PDF. It supports
-standard Fountain, but also has some custom syntax extensions such as
-translated keywords and acts.")
- (license license:gpl3)))
-
(define-public lyrebird
(package
(name "lyrebird")
