diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | gnu/packages/abiword.scm | 68 | ||||
| -rw-r--r-- | gnu/packages/astronomy.scm | 410 | ||||
| -rw-r--r-- | gnu/packages/audio.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/bdw-gc.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/fltk.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 22 | ||||
| -rw-r--r-- | gnu/packages/lua.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 13 | ||||
| -rw-r--r-- | gnu/packages/web.scm | 2 | ||||
| -rw-r--r-- | guix/lint.scm | 4 |
11 files changed, 305 insertions, 244 deletions
diff --git a/.gitignore b/.gitignore index 66c2ea39a5..4f7308b295 100644 --- a/.gitignore +++ b/.gitignore @@ -138,8 +138,7 @@ /t-*/ /test-env /test-tmp -/tests/*.trs -/tests/services/*.trs +/tests/**/*.trs GPATH GRTAGS GTAGS diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index d3b08323f7..55cf07ab6b 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -25,11 +25,16 @@ (define-module (gnu packages abiword) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix build-system glib-or-gtk) #:use-module (guix gexp) + #:use-module (guix git-download) #:use-module (gnu packages) + #:use-module (gnu packages aspell) + #:use-module (gnu packages bash) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages autogen) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages enchant) @@ -40,30 +45,31 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages ots) + #:use-module (gnu packages perl) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) + #:use-module (gnu packages xorg) #:use-module (gnu packages wv) #:use-module (gnu packages xml)) (define-public abiword (package (name "abiword") - (version "3.0.5") + (version "3.0.7") (source - (origin - (method url-fetch) - (uri - ;; XXX: The main site <https://www.abisource.com/> is down. Only a (partial) - ;; mirror is available at <http://www.nl.abisource.com/>. - (string-append "http://www.nl.abisource.com/downloads/abiword/" version - "/source/abiword-" version ".tar.gz")) - (sha256 - (base32 "1d1179pnslijpjhz1q155fsc828rrlqf7lsn2inqsl3hk5z28mqj")) - (patches - (search-patches "abiword-explictly-cast-bools.patch")))) - + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/AbiWord/") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hp11vdfm70n840ib19szxkibfs0v1hhklslz4xipfwrdvpwk1km")) + (patches + (search-patches "abiword-explictly-cast-bools.patch")))) (build-system glib-or-gtk-build-system) (arguments ;; NOTE: rsvg is disabled, since Abiword (list #:configure-flags ;; supports it directly, and its BS is broken. @@ -80,6 +86,7 @@ "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " "wikipedia " "wml " "xslfo") "--enable-introspection" + "--enable-scripting" (string-append "--with-gir-dir=" #$output "/share/gir-1.0") @@ -93,22 +100,34 @@ ;; Manually starting the X server before the test phase did not help ;; the tests to pass. #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; FIXME: Use #:bootstrap-scripts instead. + (add-before 'bootstrap 'bootstrap-common + (lambda _ + (substitute* "autogen-common.sh" + (("/bin/sh") + (string-append + #$(this-package-native-input "bash-minimal") + "/bin/sh")))))) #:make-flags #~(list "gtk_update_icon_cache=true"))) (inputs - (list boost + (list aspell + boost enchant fontconfig fribidi - glib goffice gtk+ + libgcrypt libchamplain libglade libgsf libjpeg-turbo libpng (librsvg-for-system) + libxft libxml2 libxslt ots @@ -118,13 +137,22 @@ wv zlib)) (native-inputs - (list gobject-introspection + (list `(,glib "bin") + autoconf + autoconf-archive + autogen + automake + bash-minimal + findutils + grep intltool - `(,glib "bin") libtool + perl pkg-config - python-wrapper)) - (home-page "http://www.nl.abisource.com/") + python-wrapper + sed + gobject-introspection)) + (home-page "https://gitlab.gnome.org/World/AbiWord/") (synopsis "Word processing program") ;; HACKERS: The comment below is here so that it shows up early in the diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a96b4661fd..745120b85c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1967,6 +1967,50 @@ support for reading and writing various compression algorithms including: @url{http://facebook.github.io/zstd/,Zstandard}.") (license license:bsd-3)))) +(define-public python-asdf-transform-schemas + (hidden-package + (package + (name "python-asdf-transform-schemas") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asdf_transform_schemas" version)) + (sha256 + (base32 "0clp3a2ldfhvsh5c7zqd7nr2bvv62a89aaf8p4a2vzgzjvhghl0g")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Check why all tests fail in this file. + #:test-flags #~(list "--deselect=tests/test_invalid.py"))) + (native-inputs + (list python-asdf-bootstrap + python-pytest + python-setuptools-next + python-setuptools-scm + python-wheel)) + (propagated-inputs + (list python-asdf-standard)) + (home-page "https://github.com/asdf-format/asdf-transform-schemas") + (synopsis "ASDF schemas for transforms") + (description + "This package provides ASDF schemas for validating transform tags. +Users should not need to install this directly; instead, install an +implementation package such as asdf-astropy.") + (license license:bsd-3)))) + +(define-public python-asdf-transform-schemas-bootstrap + (hidden-package + (package/inherit python-asdf-transform-schemas + (arguments + (list #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (native-inputs + (list python-setuptools-next + python-wheel)) + (propagated-inputs '())))) + (define-public python-asdf-zarr (package (name "python-asdf-zarr") @@ -4453,6 +4497,34 @@ semi-analytic models, to cosmological hydrodynamic simulations, and even observationally-derived galaxy merger catalogs.") (license license:expat))) +(define-public python-hvpy + (package + (name "python-hvpy") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hvpy" version)) + (sha256 + (base32 "0bly1bgp0axxhzzf5imqsgmms41z8cxbjahxsibvb55dk94gwig6")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ; Requires HTTP(S) access to api.beta.helioviewer.org + (native-inputs + (list python-pytest + python-pytest-astropy + python-setuptools + python-wheel)) + (propagated-inputs + (list python-pydantic-2 + python-pydantic-settings + python-requests)) + (home-page "https://helioviewer.org/") + (synopsis "Helioviewer Python API Wrapper") + (description "@code{hvpy} is a Python API wrapper around the formal +@url{Helioviewer API, https://api.helioviewer.org/docs/v2/}.") + (license license:bsd-2))) + (define-public python-irispy-lmsal (package (name "python-irispy-lmsal") @@ -4662,6 +4734,89 @@ Telescope,JWST} from a set of input dark current files and a set of flat field files.") (license license:bsd-3))) +(define-public python-kanon + (package + (name "python-kanon") + (version "0.6.6") + (source + (origin + (method git-fetch) ; no release in PyPI + (uri (git-reference + (url "https://github.com/ALFA-project-erc/kanon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sg9yrsas5xmhbw6mhfyxsxh9i060af6v02whr9fqgv687fiyrhc")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list ;"--numprocesses" "auto" + ;; XXX: This tests failing a lot. + "-k" (string-append "not test_attribute_forwardin" + " and not test_declination" + " and not test_init_basedquantity" + " and not test_ptolemy_viz" + " and not test_ptolemy_viz" + " and not test_quantity" + " and not test_read" + " and not test_shifting" + " and not test_sun_true_position" + " and not test_sun_true_position") + "--ignore=kanon/tables/__init__.py") + #:phases + #~(modify-phases %standard-phases + ;; See <https://github.com/ALFA-project-erc/kanon/issues/149>. + (delete 'sanity-check) + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "pyproject.toml" + (("version = \"0.0.0\"") (string-append "version = \"" #$version "\"")) + ;; RuntimeError: Unable to detect version control + ;; system. Checked: Git. Not installed: Mercurial, Darcs, + ;; Subversion, Bazaar, Fossil, Pijul. See + ;; <https://github.com/blacklanternsecurity/bbot/issues/1257>. + (("enable = true") "enable = false")))) + (add-before 'check 'prepare-test-environment + (lambda _ + (setenv "HOME" "/tmp")))))) + (native-inputs + (list git-minimal/pinned + python-poetry-core + python-poetry-dynamic-versioning + python-pytest-astropy + python-pytest-xdist + python-requests-mock)) + (propagated-inputs + (list python-astropy-6 + python-matplotlib + python-numpy + python-pandas + python-requests + python-scipy + ;; Optional + python-ipykernel + python-papermill)) + (home-page "https://dishas.obspm.fr") + (synopsis "History of astronomy") + (description "This package provides a history of astronomy library. +Current Features: +@itemize +@item define standard positional numeral systems with standard arithmetics +(BasedReal) +@item set your own precision contexts and algorithms on arithmetical +operations (PrecisionContext) +@item keep track of all operations +@item build or import ancient astronomical tables +@item perform arithmetical and statistical operations +@item support for BasedReal values +@item define new calendar types +@item date conversions +@item collection of mathematical models used for all kinds of geocentric +astronomical tables +@end itemize") + (license license:bsd-3))) + (define-public python-lenstronomy (package (name "python-lenstronomy") @@ -5273,6 +5428,56 @@ position-frequency slice.") (list python-setuptools python-wheel))))) +(define-public python-pyerfa + (package + (name "python-pyerfa") + (version "2.0.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyerfa" version)) + (sha256 + (base32 "1h7nw61wqx9qsznnl8qandixr6c1n3f65hyqwzanav44wi7v5mhp")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove bundled submodule library. + (delete-file-recursively "liberfa"))))) + (build-system pyproject-build-system) + (arguments + (list + ;; Disable only one failing test: + ;; AttributeError: __warningregistry__ + ;; See https://github.com/liberfa/pyerfa/issues/126 + #:test-flags #~(list "-k" "not test_errwarn_reporting") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'use-system-liberfa + (lambda _ + (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1"))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (native-inputs + (list python-pytest-doctestplus + python-pytest + python-setuptools + python-setuptools-scm + python-wheel)) + (inputs + (list erfa)) + (propagated-inputs + (list python-numpy)) + (home-page "https://github.com/liberfa/pyerfa") + (synopsis "Python bindings for ERFA") + (description + "PyERFA is the Python wrapper for the ERFA library (Essential +Routines for Fundamental Astronomy), a C library containing key algorithms for +astronomy, which is based on the SOFA library published by the International +Astronomical Union (IAU). All C routines are wrapped as Numpy universal +functions, so that they can be called with scalar or array inputs.") + (license license:bsd-3))) + (define-public python-pyhalo (package (name "python-pyhalo") @@ -6186,34 +6391,6 @@ instruments.") (license (list license:bsd-3 ; licenses/LICENSE.rst, same as python-astropy license:expat)))) ; licenses/KOSMOS_LICENSE -(define-public python-hvpy - (package - (name "python-hvpy") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "hvpy" version)) - (sha256 - (base32 "0bly1bgp0axxhzzf5imqsgmms41z8cxbjahxsibvb55dk94gwig6")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ; Requires HTTP(S) access to api.beta.helioviewer.org - (native-inputs - (list python-pytest - python-pytest-astropy - python-setuptools - python-wheel)) - (propagated-inputs - (list python-pydantic-2 - python-pydantic-settings - python-requests)) - (home-page "https://helioviewer.org/") - (synopsis "Helioviewer Python API Wrapper") - (description "@code{hvpy} is a Python API wrapper around the formal -@url{Helioviewer API, https://api.helioviewer.org/docs/v2/}.") - (license license:bsd-2))) - (define-public python-jplephem (package (name "python-jplephem") @@ -6248,89 +6425,6 @@ Astronomical Almanac to within 0.0005 arcseconds (half a @emph{mas} or milliarcsecond).") (license license:expat))) -(define-public python-kanon - (package - (name "python-kanon") - (version "0.6.6") - (source - (origin - (method git-fetch) ; no release in PyPI - (uri (git-reference - (url "https://github.com/ALFA-project-erc/kanon") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0sg9yrsas5xmhbw6mhfyxsxh9i060af6v02whr9fqgv687fiyrhc")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - #~(list ;"--numprocesses" "auto" - ;; XXX: This tests failing a lot. - "-k" (string-append "not test_attribute_forwardin" - " and not test_declination" - " and not test_init_basedquantity" - " and not test_ptolemy_viz" - " and not test_ptolemy_viz" - " and not test_quantity" - " and not test_read" - " and not test_shifting" - " and not test_sun_true_position" - " and not test_sun_true_position") - "--ignore=kanon/tables/__init__.py") - #:phases - #~(modify-phases %standard-phases - ;; See <https://github.com/ALFA-project-erc/kanon/issues/149>. - (delete 'sanity-check) - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "pyproject.toml" - (("version = \"0.0.0\"") (string-append "version = \"" #$version "\"")) - ;; RuntimeError: Unable to detect version control - ;; system. Checked: Git. Not installed: Mercurial, Darcs, - ;; Subversion, Bazaar, Fossil, Pijul. See - ;; <https://github.com/blacklanternsecurity/bbot/issues/1257>. - (("enable = true") "enable = false")))) - (add-before 'check 'prepare-test-environment - (lambda _ - (setenv "HOME" "/tmp")))))) - (native-inputs - (list git-minimal/pinned - python-poetry-core - python-poetry-dynamic-versioning - python-pytest-astropy - python-pytest-xdist - python-requests-mock)) - (propagated-inputs - (list python-astropy-6 - python-matplotlib - python-numpy - python-pandas - python-requests - python-scipy - ;; Optional - python-ipykernel - python-papermill)) - (home-page "https://dishas.obspm.fr") - (synopsis "History of astronomy") - (description "This package provides a history of astronomy library. -Current Features: -@itemize -@item define standard positional numeral systems with standard arithmetics -(BasedReal) -@item set your own precision contexts and algorithms on arithmetical -operations (PrecisionContext) -@item keep track of all operations -@item build or import ancient astronomical tables -@item perform arithmetical and statistical operations -@item support for BasedReal values -@item define new calendar types -@item date conversions -@item collection of mathematical models used for all kinds of geocentric -astronomical tables -@end itemize") - (license license:bsd-3))) - (define-public python-photutils (package (name "python-photutils") @@ -7211,56 +7305,6 @@ science instruments plus the fine guidance sensor, including both direct imaging, coronagraphic, and spectroscopic modes.") (license license:bsd-3))) -(define-public python-pyerfa - (package - (name "python-pyerfa") - (version "2.0.1.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyerfa" version)) - (sha256 - (base32 "1h7nw61wqx9qsznnl8qandixr6c1n3f65hyqwzanav44wi7v5mhp")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; Remove bundled submodule library. - (delete-file-recursively "liberfa"))))) - (build-system pyproject-build-system) - (arguments - (list - ;; Disable only one failing test: - ;; AttributeError: __warningregistry__ - ;; See https://github.com/liberfa/pyerfa/issues/126 - #:test-flags #~(list "-k" "not test_errwarn_reporting") - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'use-system-liberfa - (lambda _ - (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1"))) - (add-before 'check 'build-extensions - (lambda _ - (invoke "python" "setup.py" "build_ext" "--inplace")))))) - (native-inputs - (list python-pytest-doctestplus - python-pytest - python-setuptools - python-setuptools-scm - python-wheel)) - (inputs - (list erfa)) - (propagated-inputs - (list python-numpy)) - (home-page "https://github.com/liberfa/pyerfa") - (synopsis "Python bindings for ERFA") - (description - "PyERFA is the Python wrapper for the ERFA library (Essential -Routines for Fundamental Astronomy), a C library containing key algorithms for -astronomy, which is based on the SOFA library published by the International -Astronomical Union (IAU). All C routines are wrapped as Numpy universal -functions, so that they can be called with scalar or array inputs.") - (license license:bsd-3))) - (define-public python-pynbody (package (name "python-pynbody") @@ -7628,50 +7672,6 @@ and use. Unlike FITS, the metadata is highly structured and is designed up-front for extensibility.") (license license:bsd-3))) -(define-public python-asdf-transform-schemas - (hidden-package - (package - (name "python-asdf-transform-schemas") - (version "0.6.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "asdf_transform_schemas" version)) - (sha256 - (base32 "0clp3a2ldfhvsh5c7zqd7nr2bvv62a89aaf8p4a2vzgzjvhghl0g")))) - (build-system pyproject-build-system) - (arguments - (list - ;; XXX: Check why all tests fail in this file. - #:test-flags #~(list "--deselect=tests/test_invalid.py"))) - (native-inputs - (list python-asdf-bootstrap - python-pytest - python-setuptools-next - python-setuptools-scm - python-wheel)) - (propagated-inputs - (list python-asdf-standard)) - (home-page "https://github.com/asdf-format/asdf-transform-schemas") - (synopsis "ASDF schemas for transforms") - (description - "This package provides ASDF schemas for validating transform tags. -Users should not need to install this directly; instead, install an -implementation package such as asdf-astropy.") - (license license:bsd-3)))) - -(define-public python-asdf-transform-schemas-bootstrap - (hidden-package - (package/inherit python-asdf-transform-schemas - (arguments - (list #:tests? #f - #:phases #~(modify-phases %standard-phases - (delete 'sanity-check)))) - (native-inputs - (list python-setuptools-next - python-wheel)) - (propagated-inputs '())))) - (define-public python-asdf-coordinates-schemas (hidden-package (package diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c481b5a3de..622ce50020 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2850,6 +2850,11 @@ partial release of the General MIDI sound set.") (string-append "--ldflags=-Wl,-rpath=" #$output "/lib")) #:phases '(modify-phases %standard-phases + (add-after 'unpack 'fix-includes + (lambda _ + (substitute* "src/LV2/DSP/gx_common.h" + (("#include <cstdlib>" all) + (string-append all "\n#include <cstdint>"))))) (add-after 'unpack 'python3.11-compatibility (lambda _ (substitute* "wscript" @@ -6450,7 +6455,7 @@ as is the case with audio plugins.") (define-public carla (package (name "carla") - (version "2.4.1") + (version "2.5.10") (source (origin (method git-fetch) @@ -6460,7 +6465,7 @@ as is the case with audio plugins.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01ngkmfcxyg1bb4qmfvlkkjbx4lx62akxqhizl8zmqnhfcy4p9bx")))) + (base32 "1p7nvydnmg5l457w3089bwj1a5z509ydlpwvf19k86i348a1lm6v")))) (build-system gnu-build-system) (arguments (list #:tests? #f ; no "check" target diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index ea8cf4bb99..f7c3768145 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -39,7 +39,7 @@ (version "8.2.8") (source (origin (method url-fetch) - (uri (list (string-append "https://github.com/ivmai/bdwgc/releases" + (uri (list (string-append "https://github.com/bdwgc/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz") (string-append "https://www.hboehm.info/gc/gc_source" @@ -73,7 +73,7 @@ ((target-ppc64le?) (list #:make-flags ;; This is a known workaround upstream. - ;; https://github.com/ivmai/bdwgc/issues/479 + ;; https://github.com/bdwgc/bdwgc/issues/479 #~(list "CFLAGS_EXTRA=-DNO_SOFT_VDB"))) ((target-ppc32?) (list #:make-flags @@ -129,7 +129,7 @@ C or C++ programs, though that is not its primary goal.") (version "7.6.12") (source (origin (method url-fetch) - (uri (string-append "https://github.com/ivmai/bdwgc/releases" + (uri (string-append "https://github.com/bdwgc/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 @@ -153,7 +153,7 @@ C or C++ programs, though that is not its primary goal.") (source (origin (method url-fetch) (uri (string-append - "https://github.com/ivmai/libatomic_ops/releases/download/v" + "https://github.com/bdwgc/libatomic_ops/releases/download/v" version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 @@ -182,7 +182,7 @@ C or C++ programs, though that is not its primary goal.") memory update operations on a number of architectures. These might allow you to write code that does more interesting things in signal handlers, write lock-free code, experiment with thread programming paradigms, etc.") - (home-page "https://github.com/ivmai/libatomic_ops/") + (home-page "https://github.com/bdwgc/libatomic_ops/") ;; Some source files are X11-style, others are GPLv2+. (license gpl2+))) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 4ea711924e..6ee675778c 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -103,14 +103,14 @@ UI builder called FLUID that can be used to create applications in minutes.") (define-public fltk (package (inherit fltk-1.3) - (version "1.4.3") + (version "1.4.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/fltk/fltk") (commit (string-append "release-" version)))) (sha256 - (base32 "0v14a5x00h0ylvvvz26pj05c6zl3m5s5viiy5zlnjqjfliqdy0ci")))))) + (base32 "1nfl37c9yplp4gxjjlajysfj2vsr47xjlcq78ambd7im4wbjgj76")))))) (define-public ntk diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b34570a810..7ace87bc11 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -7593,6 +7593,28 @@ termios API is used. GNU Guile doesn't have an interface for that built in. This module implements this interface by use of Guile's dynamic FFI.") (license license:bsd-2))) +(define-public guile-bstructs + (package + (name "guile-bstructs") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://files.dthompson.us/releases" + "/guile-bstructs/guile-bstructs-" version ".tar.gz")) + (sha256 + (base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) + (synopsis "Efficient binary structures for Guile") + (description + "Guile-bstructs provides an efficient implementation of +low-level binary structures for Guile Scheme inspired by Chez Scheme's +ftypes.") + (home-page "https://dthompson.us/projects/guile-bstructs.html") + (license license:asl2.0))) + (define-public guile-goblins (package (name "guile-goblins") diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 7ebd79e6f6..7fb07cab0c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -134,7 +134,7 @@ for configuration, scripting, and rapid prototyping.") (define-public lua-5.4 (package (inherit lua) - (version "5.4.6") + (version "5.4.8") (arguments (substitute-keyword-arguments (package-arguments lua) ((#:make-flags flags) @@ -145,7 +145,7 @@ for configuration, scripting, and rapid prototyping.") (uri (string-append "https://www.lua.org/ftp/lua-" version ".tar.gz")) (sha256 - (base32 "125dncwz8syhxk034m4fpahq7vsprfnwdqfxlffbb83arfws2pkx")) + (base32 "1bi90r9nzmqhjwhr8ysffhmhq30wxxcpqwmbxr33wyaf2npds62g")) (patches (search-patches "lua-5.4-pkgconfig.patch" "lua-5.4-liblua-so.patch")))))) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a2fdd1858b..f950fa050e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com> -;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2018, 2025 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com> @@ -1853,10 +1853,17 @@ a built-in cache to decrease server I/O pressure.") ;; because it is used as the shebang of generated scripts that ;; are invoked during the test phase. (string-append "SHELL_PATH=" - (search-input-file %build-inputs "/bin/sh")))))) + (search-input-file %build-inputs "/bin/sh")))) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'unpack-git + (lambda _ + ;; Unpack the source of git into the 'git' directory. + (invoke "tar" "--strip-components=1" "-C" "git" "-xf" + #$(this-package-input "git-source.tar.xz")))))))) (inputs (modify-inputs (package-inputs cgit) - (replace "git-source" + (replace "git-source.tar.xz" ;; cgit-pink is tightly bound to git. Use GIT_VER from the Makefile, ;; which may not match the current (package-version git). (origin diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a9b5f732ab..947fb6f800 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6345,7 +6345,7 @@ developed as part of the NetSurf project.") "0750q884ax8wygl64wq03zdjj8h838ch3f8jdfkv4gz809zj4my3")))) (build-system gnu-build-system) (native-inputs - (list netsurf-buildsystem pkg-config gperf-3.0)) + (list netsurf-buildsystem pkg-config gperf)) (inputs (list libwapcaplet)) (propagated-inputs diff --git a/guix/lint.scm b/guix/lint.scm index f09fb24347..2033aa36f1 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2017, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2020, 2024, 2025 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2018, 2019, 2025 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> @@ -640,7 +640,7 @@ of a package, and INPUT-NAMES, a list of package specifications such as (map (lambda (input) (make-warning package - (G_ "'~a' should probably switched for its minimal variant") + (G_ "'~a' should probably be switched for its minimal variant") (list input) #:field 'inputs)) (package-input-intersection (package-direct-inputs package) |