[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
359/458: gnu: texlive-hyphen-package: Remove SIMPLE-TEXLIVE-PACKAGE call
From: |
guix-commits |
Subject: |
359/458: gnu: texlive-hyphen-package: Remove SIMPLE-TEXLIVE-PACKAGE call. |
Date: |
Wed, 14 Jun 2023 05:23:16 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit 963f0f4d2490f80568d2e04b756e712d345c209f
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Thu May 18 10:54:09 2023 +0200
gnu: texlive-hyphen-package: Remove SIMPLE-TEXLIVE-PACKAGE call.
* gnu/packages/tex.scm (texlive-hyphen-package): Remove
SIMPLE-TEXLIVE-PACKAGE call.
---
gnu/packages/tex.scm | 133 ++++++++++++++++++++++++++-------------------------
1 file changed, 69 insertions(+), 64 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 492a27fb54..5b57d037ff 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -184,70 +184,75 @@ copied to their outputs; otherwise the
TEXLIVE-BUILD-SYSTEM is used."
(define (texlive-hyphen-package name code locations hash)
"Return a TeX Live hyphenation package with the given NAME, using source
-files from LOCATIONS with expected checksum HASH. CODE is not currently in
use."
- (let ((parent (simple-texlive-package
- name locations hash #:trivial? #t)))
- (package
- (inherit parent)
- (arguments
- (substitute-keyword-arguments (package-arguments parent)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'build
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (root (string-append out "/share/texmf-dist"))
- (patterns
- (string-append root
"/tex/generic/hyph-utf8/patterns/txt/"))
- (loaders
- (string-append root
"/tex/generic/hyph-utf8/loadhyph"))
- (ptex
- (string-append root
"/tex/generic/hyph-utf8/patterns/ptex"))
- (quote
- (string-append root
"/tex/generic/hyph-utf8/patterns/quote")))
- (mkdir "scripts")
- (copy-recursively
- (dirname (search-input-file inputs "hyph-utf8.rb"))
- "scripts")
-
- ;; Prepare target directories
- (mkdir-p patterns)
- (mkdir-p loaders)
- (mkdir-p ptex)
- (mkdir-p quote)
-
- ;; Generate plain patterns
- (with-directory-excursion "scripts"
- (substitute* "lib/tex/hyphen/path.rb"
- (("^([[:blank:]]+)TeXROOT = .*" _ indent)
- (string-append indent "TeXROOT = \""
- (getcwd) "/..\"\n")))
-
- (substitute* "generate-plain-patterns.rb"
- ;; Ruby 2 does not need this.
- (("require 'unicode'") "")
- ;; Write directly to the output directory
- (("File\\.join\\(PATH::TXT")
- (string-append "File.join(\"" patterns "\""))
- (("File\\.join\\(PATH::QUOTE")
- (string-append "File.join(\"" quote "\"")))
- (invoke "ruby" "generate-plain-patterns.rb")
-
- ;; Build pattern loaders
- (substitute* "generate-pattern-loaders.rb"
- (("File\\.join\\(PATH::LOADER")
- (string-append "File.join(\"" loaders "\"")))
-
- (invoke "ruby" "generate-pattern-loaders.rb")
-
- ;; Build ptex patterns
- (substitute* "generate-ptex-patterns.rb"
- (("File\\.join\\(PATH::PTEX")
- (string-append "File.join(\"" ptex "\"")))
- (invoke "ruby" "generate-ptex-patterns.rb")))))))))
- (native-inputs
- (list ruby ruby-hydra-minimal hyph-utf8-scripts))
- (home-page "https://ctan.org/pkg/hyph-utf8"))))
+files from LOCATIONS with expected checksum HASH. CODE is not currently in
+use."
+ (package
+ (name name)
+ (version (number->string %texlive-revision))
+ (source (texlive-origin name version location hash))
+ (build-system texlive-build-system)
+ (arguments
+ (list
+ #:texlive-latex-base #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((root (string-append #$output "/share/texmf-dist"))
+ (patterns
+ (string-append root
"/tex/generic/hyph-utf8/patterns/txt/"))
+ (loaders
+ (string-append root "/tex/generic/hyph-utf8/loadhyph"))
+ (ptex
+ (string-append root
"/tex/generic/hyph-utf8/patterns/ptex"))
+ (quote
+ (string-append root
"/tex/generic/hyph-utf8/patterns/quote")))
+ (mkdir "scripts")
+ (copy-recursively
+ (dirname (search-input-file inputs "hyph-utf8.rb"))
+ "scripts")
+
+ ;; Prepare target directories
+ (mkdir-p patterns)
+ (mkdir-p loaders)
+ (mkdir-p ptex)
+ (mkdir-p quote)
+
+ ;; Generate plain patterns
+ (with-directory-excursion "scripts"
+ (substitute* "lib/tex/hyphen/path.rb"
+ (("^([[:blank:]]+)TeXROOT = .*" _ indent)
+ (string-append indent "TeXROOT = \""
+ (getcwd) "/..\"\n")))
+
+ (substitute* "generate-plain-patterns.rb"
+ ;; Ruby 2 does not need this.
+ (("require 'unicode'") "")
+ ;; Write directly to the output directory
+ (("File\\.join\\(PATH::TXT")
+ (string-append "File.join(\"" patterns "\""))
+ (("File\\.join\\(PATH::QUOTE")
+ (string-append "File.join(\"" quote "\"")))
+ (invoke "ruby" "generate-plain-patterns.rb")
+
+ ;; Build pattern loaders
+ (substitute* "generate-pattern-loaders.rb"
+ (("File\\.join\\(PATH::LOADER")
+ (string-append "File.join(\"" loaders "\"")))
+
+ (invoke "ruby" "generate-pattern-loaders.rb")
+
+ ;; Build ptex patterns
+ (substitute* "generate-ptex-patterns.rb"
+ (("File\\.join\\(PATH::PTEX")
+ (string-append "File.join(\"" ptex "\"")))
+ (invoke "ruby" "generate-ptex-patterns.rb"))))))))
+ (native-inputs
+ (list hyph-utf8-scripts ruby ruby-hydra-minimal))
+ (home-page "https://ctan.org/pkg/hyph-utf8")
+ (synopsis #f)
+ (description #f)
+ (license #f)))
(define texlive-extra-src
(origin
- 249/458: gnu: texlive-eso-pic: Refresh package definition., (continued)
- 249/458: gnu: texlive-eso-pic: Refresh package definition., guix-commits, 2023/06/14
- 262/458: gnu: texlive-infwarerr: Refresh package definition., guix-commits, 2023/06/14
- 266/458: gnu: texlive-ltxcmds: Refresh package definition., guix-commits, 2023/06/14
- 267/458: gnu: texlive-pdfescape: Refresh package definition., guix-commits, 2023/06/14
- 333/458: gnu: texlive-mkpattern: Refresh package definition., guix-commits, 2023/06/14
- 341/458: gnu: texlive-cm-lgc: Refresh package definition., guix-commits, 2023/06/14
- 368/458: gnu: texlive-morefloats: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/06/14
- 377/458: gnu: texlive-babel-finnish: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/06/14
- 348/458: gnu: texlive-hyphen-base: Refresh package definition., guix-commits, 2023/06/14
- 344/458: gnu: texlive-cbfonts: Refresh package definition., guix-commits, 2023/06/14
- 359/458: gnu: texlive-hyphen-package: Remove SIMPLE-TEXLIVE-PACKAGE call.,
guix-commits <=
- 360/458: gnu: texlive-tetex: Refresh package definition., guix-commits, 2023/06/14
- 383/458: gnu: texlive-lastpage: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/06/14
- 367/458: gnu: texlive-sectsty: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/06/14
- 400/458: gnu: texlive-tipa: Fix build., guix-commits, 2023/06/14
- 414/458: gnu: Add texlive-etex-pkg., guix-commits, 2023/06/14
- 444/458: gnu: Add texlive-latex-bin., guix-commits, 2023/06/14
- 456/458: gnu: Simplify texlive-default-updmap.cfg., guix-commits, 2023/06/14
- 277/458: gnu: texlive-auxhook: Refresh package definition., guix-commits, 2023/06/14
- 282/458: gnu: texlive-hycolor: Refresh package definition., guix-commits, 2023/06/14
- 297/458: gnu: texlive-times: Refresh package definition., guix-commits, 2023/06/14