mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Compare commits
14 commits
641dbfdbd4
...
38a7482eb5
Author | SHA1 | Date | |
---|---|---|---|
|
38a7482eb5 | ||
|
ded3259e51 | ||
|
8fe50a34a3 | ||
|
dae0712ba9 | ||
|
2bab4f3eb6 | ||
|
d32333a400 | ||
|
a5df6c22c7 | ||
|
087c8a1927 | ||
|
c7ac1be24e | ||
|
5c7e825c6d | ||
|
2eff4687a5 | ||
|
5b314273df | ||
|
c03479f6e8 | ||
|
786c2f1381 |
6 changed files with 104 additions and 82 deletions
|
@ -12,7 +12,7 @@
|
|||
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2021-2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2022 Eric Bavier <bavier@posteo.net>
|
||||
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
|
||||
|
@ -181,13 +181,13 @@ them as it goes.")
|
|||
(define-public python-afdko
|
||||
(package
|
||||
(name "python-afdko")
|
||||
(version "3.9.5")
|
||||
(version "4.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "afdko" version))
|
||||
(sha256
|
||||
(base32 "02c1rjx7ggbd1m9vqgsc2r28yiw66cjgvs5cq1a2fz0lkadbvrnb"))
|
||||
(base32 "0c6ribidsmcd9rihy32gknfrr3iw8dy2jlmq6lk05pc33s3ix8z1"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
|
@ -415,6 +415,7 @@ but also provides many useful font conversion and analysis facilities.
|
|||
"--ignore=tests/makeotfexe_test.py"
|
||||
"--ignore=tests/otc2otf_test.py"
|
||||
"--ignore=tests/otf2ttf_test.py"
|
||||
"--ignore=tests/proofpdf_test.py"
|
||||
"--ignore=tests/ttxn_test.py")))))))
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
|
@ -470,7 +471,7 @@ other operations on paths.")
|
|||
(define-public python-cffsubr
|
||||
(package
|
||||
(name "python-cffsubr")
|
||||
(version "0.2.9.post1")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -478,7 +479,7 @@ other operations on paths.")
|
|||
(modules '((guix build utils)))
|
||||
(snippet '(delete-file-recursively "external")) ;unbundle ADFKO
|
||||
(sha256
|
||||
(base32 "0p7wyagkmwf4agr6ysgswrpmpifx5rz8dnjbcs2gmj29rwnl2cbb"))))
|
||||
(base32 "1yrfjn3mdi48pg78yzlmskdz9i4nf2wg7h8ivnn9yrw1vc5iaibp"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -560,13 +561,13 @@ for fontTools.")
|
|||
(define-public python-cu2qu
|
||||
(package
|
||||
(name "python-cu2qu")
|
||||
(version "1.6.7.post1")
|
||||
(version "1.6.7.post2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cu2qu" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1x762r7bf39g6aivfvrmq00h6f07abvs9x1xm0fz8l81vq8jz64c"))))
|
||||
(base32 "022qpzbpi6j56wqz48rnqs6dvksipw13fi4g10k941fnkgcn5x8x"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
;; XXX: Try to remove it when updating python-fonttools.
|
||||
|
@ -592,14 +593,24 @@ converts any cubic curves to quadratic. The most useful function is probably
|
|||
(define-public python-ufo2ft
|
||||
(package
|
||||
(name "python-ufo2ft")
|
||||
(version "2.31.0")
|
||||
(version "2.33.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ufo2ft" version))
|
||||
(sha256
|
||||
(base32 "1rg2997af8blvswlwif0kpz2vxrlh555gzqslz6yv9y7i7v8lphl"))))
|
||||
(base32 "0xnnwlj3rl0p7q19l6wdrfkzzq1f2l5vyl2qs7kl4vvfalgpzakv"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:test-flags
|
||||
#~(list "-k"
|
||||
;; XXX: These tests all fail with "TTX output is different
|
||||
;; from expected". Potentially fixed in 3.x release.
|
||||
(string-append "not test_compileVariableTTF "
|
||||
"and not test_compileVariableCFF2 "
|
||||
"and not test_drop_glyph_names_variable "
|
||||
"and not test_buildTables_FeatureLibError "
|
||||
"and not test_kern_zyyy_zinh"))))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-setuptools-scm
|
||||
|
@ -708,13 +719,13 @@ implementing the pen protocol for manipulating glyphs.")
|
|||
(hidden-package
|
||||
(package
|
||||
(name "python-fontparts-bootstrap")
|
||||
(version "0.11.0")
|
||||
(version "0.13.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "fontParts" version ".zip"))
|
||||
(uri (pypi-uri "fontparts" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0j4h8hszky639gmfy1avmw670y80ya49kca8yc635h5ihl0c3v8x"))))
|
||||
(base32 "0ddyfa975hskaip6l4hn7n2jh50y5s0pw911phyx2fsws54pw5s7"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:test-backend #~'custom
|
||||
|
@ -726,8 +737,7 @@ implementing the pen protocol for manipulating glyphs.")
|
|||
python-fonttools-minimal))
|
||||
(native-inputs
|
||||
(list python-setuptools
|
||||
python-setuptools-scm
|
||||
unzip))
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/robotools/fontParts")
|
||||
(synopsis "Library for interacting with font parts")
|
||||
(description "FontParts is an @acronym{API, Application Programming
|
||||
|
@ -1925,13 +1935,13 @@ with @samp{nameIDs}.")
|
|||
(define-public python-ufolib2
|
||||
(package
|
||||
(name "python-ufolib2")
|
||||
(version "0.13.1")
|
||||
(version "0.18.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ufoLib2" version))
|
||||
(uri (pypi-uri "ufolib2" version))
|
||||
(sha256
|
||||
(base32 "0yx4i8q5rfyqhr2fj70a7z1bp1jv7bdlr64ww9z4nv9ycbda4x9j"))))
|
||||
(base32 "1971ibdsgji8x0jzlk1hc6dv2r5wnfyylz7f6wjkymqw6v6fzq3x"))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
|
@ -1954,51 +1964,53 @@ API-compatible with defcon.")
|
|||
;;; A variant used to break a cycle between python-fontpens and
|
||||
;;; python-fontparts.
|
||||
(define-public python-defcon-bootstrap
|
||||
(package
|
||||
(name "python-defcon-bootstrap")
|
||||
(version "0.11.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/robotools/defcon")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "06w5kd5ac63m6m8x8j4xwdl7ncbpjl7pdpfpy9i6c8nhbd8sbjfm"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-version
|
||||
(lambda _
|
||||
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
|
||||
(propagated-inputs (list python-fontpens-bootstrap python-fonttools))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-setuptools
|
||||
python-setuptools-scm
|
||||
unzip))
|
||||
(home-page "https://github.com/robotools/defcon")
|
||||
(synopsis "Flexible objects for representing UFO data")
|
||||
(description
|
||||
"Defcon is a set of @acronym{UFO, unified font object} based
|
||||
(hidden-package
|
||||
(package
|
||||
(name "python-defcon-bootstrap")
|
||||
(version "0.12.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/robotools/defcon")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1zx4xas6qcpp54d1vcfy5wjv17aazkpfmb7hkjy99g47xsi6crrh"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-version
|
||||
(lambda _
|
||||
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
|
||||
(propagated-inputs (list python-fontpens-bootstrap python-fonttools))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-setuptools
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/robotools/defcon")
|
||||
(synopsis "Flexible objects for representing UFO data")
|
||||
(description
|
||||
"Defcon is a set of @acronym{UFO, unified font object} based
|
||||
objects optimized for use in font editing applications. The objects are built
|
||||
to be lightweight, fast and flexible. The objects are very bare-bones and
|
||||
they are not meant to be end-all, be-all objects. Rather, they are meant to
|
||||
provide base functionality so that you can focus on your application’s
|
||||
behavior, not object observing or maintaining cached data. Defcon implements
|
||||
UFO3 as described by the UFO font format.")
|
||||
(license license:expat)))
|
||||
(license license:expat))))
|
||||
|
||||
(define-public python-defcon
|
||||
(hidden-package
|
||||
(package/inherit python-defcon-bootstrap
|
||||
(name "python-defcon")
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs python-defcon-bootstrap)
|
||||
(replace "python-fontpens-bootstrap" python-fontpens))))))
|
||||
(package/inherit python-defcon-bootstrap
|
||||
(name "python-defcon")
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs python-defcon-bootstrap)
|
||||
(replace "python-fontpens-bootstrap" python-fontpens)))
|
||||
(properties
|
||||
(alist-delete 'hidden?
|
||||
(package-properties python-fontparts-bootstrap)))))
|
||||
|
||||
(define-public nototools
|
||||
(package
|
||||
|
|
|
@ -1476,7 +1476,7 @@ given profile, etc. DLNA is a subset of UPnP A/V.")
|
|||
(define-public gupnp-av
|
||||
(package
|
||||
(name "gupnp-av")
|
||||
(version "0.14.1")
|
||||
(version "0.14.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -1484,7 +1484,7 @@ given profile, etc. DLNA is a subset of UPnP A/V.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kry7arwmvs8b4175wia3l0s02ap1shq68f29g2xjrhc9g6f175p"))))
|
||||
"1izq71qphyac02ynypwk0skxqzhfr0zrl7dap3sxrdaw4yrp9n91"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list gettext-minimal
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020, 2021, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
|
||||
;;; Copyright © 2020-2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
|
||||
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
|
||||
;;; Copyright © 2021 Andy Tai <atai@atai.org>
|
||||
|
@ -1224,14 +1224,30 @@ basic geometries.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/typemytype/booleanOperations")
|
||||
(commit version)))
|
||||
(url "https://github.com/typemytype/booleanOperations")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ahfgamyq1ndwbr9n8sdx8qhqc2195xnbahylgjpk877hbr2gxav"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; There are
|
||||
#:modules '((guix build pyproject-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 format))
|
||||
;; Some tests fail due to small differences in the expected result (see:
|
||||
;; <https://github.com/typemytype/booleanOperations/issues/69>).
|
||||
#:test-flags #~(list "-k"
|
||||
(format #f "not ~{~a~^ and not ~}"
|
||||
'("test_QTail_reversed_difference"
|
||||
"test_QTail_reversed_intersection"
|
||||
"test_QTail_reversed_union"
|
||||
"test_QTail_reversed_xor"
|
||||
"test_Q_difference"
|
||||
"test_Q_intersection"
|
||||
"test_Q_union"
|
||||
"test_Q_xor")))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-version
|
||||
|
@ -1243,8 +1259,7 @@ basic geometries.")
|
|||
python-fontpens-bootstrap
|
||||
python-pytest
|
||||
python-setuptools
|
||||
python-setuptools-scm
|
||||
unzip))
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/typemytype/booleanOperations")
|
||||
(synopsis "Boolean operations on paths")
|
||||
(description
|
||||
|
|
|
@ -285,7 +285,7 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
|
|||
(define-public harfbuzz
|
||||
(package
|
||||
(name "harfbuzz")
|
||||
(version "8.3.0")
|
||||
(version "11.4.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/harfbuzz/harfbuzz"
|
||||
|
@ -293,7 +293,7 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h"))))
|
||||
"1iaqiwh3b6mwv1ar2mm29fpfygsb1x79wv7mm6ppyn7a8rqz2lqh"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out"
|
||||
"bin")) ;160K, only hb-view depend on cairo
|
||||
|
|
|
@ -17585,16 +17585,14 @@ number of lines in the contained files easily.")
|
|||
(hidden-package
|
||||
(package
|
||||
(name "python-fonttools-minimal")
|
||||
(version "4.39.3")
|
||||
(version "4.59.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "fonttools" version ".zip"))
|
||||
(uri (pypi-uri "fonttools" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1msibi5cmi5znykkg66dq7xshl07lkqjxhrz5hcipqvlggsvjd4j"))))
|
||||
"08pgq9nrj3r81gzb6gbf5mcak0xyqrj26cw0rc5za4v1n14hfb77"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
(list unzip))
|
||||
(arguments '(#:tests? #f))
|
||||
(home-page "https://github.com/fonttools/fonttools")
|
||||
(synopsis "Tools to manipulate font files")
|
||||
|
@ -17621,14 +17619,17 @@ from an XML-based format.")
|
|||
(when tests?
|
||||
(invoke "pytest" "-vv"
|
||||
"-k"
|
||||
;; XXX: These tests need .trm files that are
|
||||
;; not shipped with the PyPI release.
|
||||
;; XXX: These tests need data files that are not
|
||||
;; shipped with the PyPI release.
|
||||
(format #f "not ~a"
|
||||
(string-join
|
||||
'("test_read_fontdimens_mathsy"
|
||||
'("test_cli_vtp"
|
||||
"test_group_order"
|
||||
"test_read_fontdimens_mathsy"
|
||||
"test_read_fontdimens_mathex"
|
||||
"test_read_fontdimens_vanilla"
|
||||
"test_read_boundary_char"
|
||||
"test_reading_supplement_encoding"
|
||||
"fontTools.tfmLib"
|
||||
;; The MtiTest tests fail for unknown
|
||||
;; reasons (see:
|
||||
|
@ -21023,13 +21024,13 @@ expression.")
|
|||
(define-public python-unicodedata2
|
||||
(package
|
||||
(name "python-unicodedata2")
|
||||
(version "15.0.0")
|
||||
(version "16.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "unicodedata2" version))
|
||||
(sha256
|
||||
(base32 "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"))))
|
||||
(base32 "1z3llixb4cd6cc6nmyps5vv2sss14n3x6dzcc65xg75mj9jqsj05"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/fonttools/unicodedata2")
|
||||
(synopsis "Python unicodedata backport")
|
||||
|
|
|
@ -1921,19 +1921,13 @@ libxml2 and libxslt.")
|
|||
(sha256
|
||||
(base32 "03l86qr5xzvz0jcbk669sj8nbw1fjshmf0b7l83gl5cfnx81wm5i"))))
|
||||
(arguments
|
||||
(list #:phases
|
||||
(list #:tests? #f ;some tests fail with newer libxml2
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'relax-gcc-14-strictness
|
||||
(lambda _
|
||||
(setenv "CFLAGS"
|
||||
"-Wno-error=incompatible-pointer-types")))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(substitute* "src/lxml/tests/test_elementtree.py"
|
||||
;; AssertionError: Lists differ: [] != [('end', 'element')]
|
||||
(("def test_simple_xml") "def _do_not_test_simple_xml"))
|
||||
(invoke "make" "test"))))))))))
|
||||
"-Wno-error=incompatible-pointer-types")))))))))
|
||||
|
||||
(define-deprecated python-lxml-4.7 python-lxml)
|
||||
(export python-lxml-4.7)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue