gnu: texlive-fonts-iwona -> texlive-iwona.

* gnu/packages/tex.scm (texlive-iwona): New variable.
(texlive-fonts-iwona): Deprecate variable.
* gnu/packages/guile-xyz.scm (guile-cv)[native-inputs]: Use new name.
This commit is contained in:
Nicolas Goaziou 2023-05-14 21:44:45 +02:00
parent 16b71431dd
commit 8ace45c088
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
2 changed files with 29 additions and 37 deletions

View file

@ -4044,12 +4044,13 @@ feature-set, fully programmable in Guile Scheme.")
(inputs (inputs
(list vigra vigra-c guile-2.2)) (list vigra vigra-c guile-2.2))
(native-inputs (native-inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-booktabs `(("texlive" ,(texlive-updmap.cfg
texlive-lm (list texlive-booktabs
texlive-siunitx texlive-iwona
texlive-standalone texlive-lm
texlive-xcolor texlive-siunitx
texlive-fonts-iwona))) texlive-standalone
texlive-xcolor)))
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("guile-lib" ,guile2.2-lib))) `(("guile-lib" ,guile2.2-lib)))

View file

@ -7895,39 +7895,28 @@ TeX metrics (VF and TFM files) and macros for use with LaTeX.")
(define-deprecated-package texlive-fonts-txfonts texlive-txfonts) (define-deprecated-package texlive-fonts-txfonts texlive-txfonts)
(define-public texlive-fonts-iwona (define-public texlive-iwona
(package (package
(name "texlive-fonts-iwona") (name "texlive-iwona")
(version "0.995b") (version (number->string %texlive-revision))
(source (origin (source (texlive-origin
(method url-fetch) name version
(uri (string-append "http://jmn.pl/pliki/Iwona-tex-" (list "doc/fonts/iwona/"
(string-map (lambda (c) "fonts/afm/nowacki/iwona/"
(if (char=? c #\.) "fonts/enc/dvips/iwona/"
#\_ c)) "fonts/map/dvips/iwona/"
version) "fonts/opentype/nowacki/iwona/"
".zip")) "fonts/tfm/nowacki/iwona/"
(sha256 "fonts/type1/nowacki/iwona/"
(base32 "tex/latex/iwona/"
"13684iqx5granpc5rfvqnmyvdpgpbr1x9y7i7y7bcaq0qxv7ph1x")))) "tex/plain/iwona/")
(build-system trivial-build-system) (base32
(arguments "1gk80zj711rcnk06cvszic7lpm06nj47kbypg13rpijdzfsvmi8m")))
`(#:modules ((guix build utils)) (outputs '("out" "doc"))
#:builder (build-system texlive-build-system)
(begin (home-page "https://ctan.org/pkg/iwona")
(use-modules (guix build utils))
(let ((target (string-append (assoc-ref %outputs "out")
"/share/texmf-dist/"))
(unzip (search-input-file %build-inputs "/bin/unzip")))
(invoke unzip (assoc-ref %build-inputs "source"))
(mkdir-p target)
(copy-recursively "iwona" target)
#t))))
(native-inputs
(list unzip))
(home-page "http://jmn.pl/en/kurier-i-iwona/")
(synopsis "Sans-serif typeface for TeX") (synopsis "Sans-serif typeface for TeX")
(description "Iwona is a two-element sans-serif typeface. It was created (description "Iwona is a two-element sans-serif typeface. It was created
as an alternative version of the Kurier typeface, which was designed in 1975 as an alternative version of the Kurier typeface, which was designed in 1975
for a diploma in typeface design at the Warsaw Academy of Fine Arts under the for a diploma in typeface design at the Warsaw Academy of Fine Arts under the
supervision of Roman Tomaszewski. Kurier was designed for linotype supervision of Roman Tomaszewski. Kurier was designed for linotype
@ -7936,6 +7925,8 @@ alternative version of the Kurier fonts. The difference lies in the absence
of ink traps which typify the Kurier font.") of ink traps which typify the Kurier font.")
(license license:gfl1.0))) (license license:gfl1.0)))
(define-deprecated-package texlive-fonts-iwona texlive-iwona)
(define-public texlive-jknappen (define-public texlive-jknappen
(package (package
(inherit (simple-texlive-package (inherit (simple-texlive-package