[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' into core-updates |
|
Date: |
Fri, 16 Sep 2022 13:12:48 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 7e0f2728a46b8f96b875a7199655bd63ad6a9fff
Merge: af53cf42b7 706e6c3c8f
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Sep 16 19:11:43 2022 +0200
Merge branch 'staging' into core-updates
NEWS | 93 +++++++++++-
gnu/build/marionette.scm | 22 ++-
gnu/local.mk | 1 -
gnu/packages/audio.scm | 2 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/bootloaders.scm | 7 +-
gnu/packages/build-tools.scm | 79 +++++++++-
gnu/packages/check.scm | 4 +-
gnu/packages/chemistry.scm | 2 +-
gnu/packages/cpp.scm | 4 +-
gnu/packages/ebook.scm | 41 ++++++
gnu/packages/education.scm | 75 ++++++++++
gnu/packages/enchant.scm | 2 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/fonts.scm | 5 +-
gnu/packages/fontutils.scm | 159 +++++++++++++++++++--
gnu/packages/fpga.scm | 29 +++-
gnu/packages/geo.scm | 121 ++++++++++------
gnu/packages/gnome.scm | 6 +-
gnu/packages/irods.scm | 2 +-
gnu/packages/java.scm | 20 +--
gnu/packages/monitoring.scm | 16 +--
gnu/packages/networking.scm | 4 +-
gnu/packages/nfs.scm | 1 -
.../patches/java-antlr4-fix-code-too-large.java | 90 ------------
gnu/packages/python-science.scm | 112 ++++++++-------
gnu/packages/python-xyz.scm | 55 ++++++-
gnu/packages/security-token.scm | 4 +-
gnu/packages/simulation.scm | 2 +-
gnu/packages/spice.scm | 48 ++++---
gnu/packages/telegram.scm | 2 +-
gnu/packages/video.scm | 10 +-
gnu/packages/virtualization.scm | 2 +-
gnu/packages/web.scm | 4 +-
gnu/packages/xdisorg.scm | 2 +-
gnu/services/desktop.scm | 14 +-
gnu/system/install.scm | 2 +-
37 files changed, 756 insertions(+), 290 deletions(-)
diff --cc gnu/packages/fonts.scm
index edcd888f73,39242f0bec..a812476db1
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@@ -778,7 -778,8 +778,8 @@@ OpenType variant of these fonts."
(replace 'install
(assoc-ref font:%standard-phases 'install)))))
(native-inputs
- (list python-fonttools-next
+ (list python-fonttools
+ python-glyphsets
python-pcpp
python-opentype-sanitizer
python-sfdlib
diff --cc gnu/packages/fontutils.scm
index bedd8ead8c,3806d78b1e..902472546e
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -540,6 -574,101 +574,101 @@@ process. FontParts is the successor o
(alist-delete 'hidden?
(package-properties python-fontparts-bootstrap)))))
+ (define-public python-glyphslib
+ (package
+ (name "python-glyphslib")
+ (version "6.0.7")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "glyphsLib" version))
+ (sha256
+ (base32
+ "0mkkwd09g76hvif603ij5aqicxh47zvhgyyd0pjcjmpdy6dr70yw"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ ;; The Zip format does not support pre-1980 time stamps.
+ (let ((circa-1980 (* 10 366 24 60 60)))
+ (setenv "SOURCE_DATE_EPOCH" (number->string circa-1980))
+ (invoke "python" "-m" "build" "--wheel" "--no-isolation"
"."))))
+ (replace 'install
+ (lambda _
+ (let ((whl (car (find-files "dist" "\\.whl$"))))
+ (invoke "pip" "--no-cache-dir" "--no-input"
+ "install" "--no-deps" "--prefix" #$output whl))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "GUIX_PYTHONPATH"
+ (string-append (getcwd) ":" (getenv
"GUIX_PYTHONPATH")))
+ (invoke "pytest" "-vv"
+ ;; These fail because the test data has not yet been
+ ;; updated for newer FontTools:
+ ;;
https://github.com/googlefonts/glyphsLib/issues/787
+ ;; Re-enable for versions > 6.0.7.
+ "--ignore=tests/builder/designspace_gen_test.py"
+ "--ignore=tests/builder/interpolation_test.py"
+ )))))))
+ (native-inputs
+ (list python-pypa-build
+ python-setuptools-scm
+ python-wheel
+
+ ;; For tests.
+ python-pytest
+ python-xmldiff))
+ (propagated-inputs
+ (list python-defcon
- python-fonttools-next
++ python-fonttools
+ python-openstep-plist
+ python-ufolib2
+ python-ufo2ft
+ python-ufonormalizer))
+ (home-page "https://github.com/googlefonts/glyphsLib";)
+ (synopsis "Bridge Glyphs source files to UFOs")
+ (description
+ "This package provides a bridge from Glyphs source files (@file{.glyphs})
+ to UFOs and DesignSpace files via @code{defcon} and @code{designspaceLib}.")
+ (license license:asl2.0)))
+
+ (define-public python-glyphsets
+ (package
+ (name "python-glyphsets")
+ (version "0.5.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "glyphsets" version))
+ (sha256
+ (base32
+ "1dc24i0hkd85gkkg3bqjhagjyw3xsqxazd86yh2l60c1wr5n9y6g"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'loosen-version-constraints
+ (lambda _
+ (substitute* "setup.py"
+ (("setuptools_scm>=4,<6\\.1")
+ "setuptools_scm>=4"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vv" "tests/testglyphdata.py")
+ (invoke "pytest" "-vv" "tests/testusage.py")))))))
+ (native-inputs (list python-pytest python-setuptools-scm))
+ (propagated-inputs
+ (list python-defcon python-fonttools python-glyphslib))
+ (home-page "https://github.com/googlefonts/glyphsets/";)
+ (synopsis "Evaluate coverage of glyph sets")
+ (description
+ "This package provides an API with data about glyph sets for many
+ different scripts and languages.")
+ (license license:asl2.0)))
+
(define-public python-opentype-sanitizer
(package
(name "python-opentype-sanitizer")