1
0
forked from tribes/guix

Compare commits

..

71 Commits

Author SHA1 Message Date
Maxim Cournoyer 6d1b402dba gnu: qtbase: Skip racy 'tst_qsqldatabase' test; reinstate qsqlthread.
* gnu/packages/qt.scm (qtbase) [#:phases] {check}: Skip tst_qsqldatabase.
Reinstate qsqlthread one.

Change-Id: I60fcca2a8e5d730b9599b81103d7ee7acb8b5bda
2026-04-07 17:58:09 +09:00
Maxim Cournoyer a0a174d18a gnu: wireplumber: Update to 0.5.14.
* gnu/packages/linux.scm (wireplumber): Update to 0.5.14.

Change-Id: Iad13fd3bf249c9faaa62695fcef9afc984dbf3ea
2026-04-07 17:57:01 +09:00
Maxim Cournoyer e8fab5a808 gnu: pulseaudio: Update to 17.0.
This resolves bugs caused by audio overflow hanging seek in gstreamer video
players like showtime.

* gnu/packages/pulseaudio.scm (pulseaudio): Update to 17.0.

Change-Id: I166bd19b2fcd4ef0e3d3cd74c690f2e4832d40ea
2026-04-07 17:56:43 +09:00
Maxim Cournoyer fd378e37fd gnu: libnice: Disable test-send-recv flaky test.
* gnu/packages/networking.scm (libnice)
[#:phases]{disable-failing-tests}: Skip test-send-recv test.

Change-Id: I8df3bd9061cf154bcb028bee193a8d6cabebf3f1
2026-04-07 17:55:29 +09:00
Maxim Cournoyer 20820a525d gnu: gst-plugins-base: Disable elements-inputselector test.
* gnu/packages/gstreamer.scm (gst-plugins-base)
[#:phases] {disable-problematic-tests}: Disable elements-inputselector test.

Change-Id: I9785719f2b3d196869afc1630808c7f693b02c79
2026-04-07 17:55:29 +09:00
Maxim Cournoyer 55be2410d1 gnu: python-rich: Disable test_brokenpipeerror test.
* gnu/packages/python-xyz.scm (python-rich) [#:test-options]: New.

Change-Id: I0df72628c2ecd896bce8db8e8f8101cb992ea1a5
2026-04-07 17:55:29 +09:00
Maxim Cournoyer 929e16ca91 gnu: python-pyftpdlib: Harden against flaky test failures.
* gnu/packages/python-xyz.scm (python-pyftpdlib)
[#:test-flags]: Unconditionally deselect whole test_functional_ssl and
test_functional test suites.

Change-Id: Icdd50dbe488309d609f73693b69bab2bac39d135
2026-04-07 17:55:29 +09:00
Maxim Cournoyer cfb19502fc gnu: libbluray: Fix patching of libbdplus library path.
* gnu/packages/video.scm (libbluray)
[#:phases] {fix-dlopen-paths}: Adjust for new file name.

Change-Id: I191e88e30659a7d3ed37839b43464babfdf3be43
2026-04-07 17:55:19 +09:00
Maxim Cournoyer d54e297b2b gnu: libaacs: Do not build/install static libraries.
* gnu/packages/video.scm (libaacs) [arguments]: New field.

Change-Id: I2f7664d20ecb235d6d4ef54371c00ae84eb2895d
2026-04-07 17:55:19 +09:00
Maxim Cournoyer 624f00570b gnu: libaacs: Update to 0.11.1.
* gnu/packages/video.scm (libaacs): Update to 0.11.1.

Change-Id: Id3311ff91bd38584d3074e8900046a073f27e6d2
2026-04-07 17:55:19 +09:00
Maxim Cournoyer 86267d4610 gnu: gtk: Remove dependency on ffmpeg.
That's not needed anymore since 4.22.

* gnu/packages/gtk.scm (gtk) [inputs]: Remove ffmpeg.

Change-Id: I53fea883f47cefe6a17967e9520f4adc76ec2bf8
2026-04-07 17:55:19 +09:00
Maxim Cournoyer 54a708e69f gnu: gtk: Disable gtklistitemmanager test.
* gnu/packages/gtk.scm (gtk) [#:phases] {patch}: Disable
gtklistitemmanager test.

Change-Id: Ia6c7e1dba7922b0f8975ae920d5e0e20079bf5fc
2026-04-07 17:55:18 +09:00
Maxim Cournoyer 11b99e079d gnu: gtk: Make reproducible.
* gnu/packages/patches/gtk4-demo-reproducible.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gtk.scm (gtk) [source]: Apply it.

Change-Id: I03ef58f324a84151a681988a18aa1ab986aeba79
2026-04-07 17:54:11 +09:00
Maxim Cournoyer eeaf837217 gnu: gtk: Update to 4.22.1.
* gnu/packages/gtk.scm (gtk): Update to 4.22.1.
[patches]: Add gtk-needs-udmabuf.patch.
[#:phases] {pre-check}: Adjust arguments of Xvfb.
[native-inputs]: Add glibc-utf8-locales.
* gnu/packages/patches/gtk-needs-udmabuf.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.

Change-Id: If9043cb55a60f4ec703515b61796b38fb4959f0b
2026-04-07 17:54:11 +09:00
Maxim Cournoyer 11250db478 gnu: gst-plugins-bad: Clean up 'adjust-tests' phase.
* gnu/packages/gstreamer.scm (gst-plugins-bad)
[#:phases] {adjust-tests}: Update cross-references.  Skip camerabin test on
all platforms.  Delete duplicate mxfdemux substitution.  Remove stale zxing.c
patching.

Change-Id: I75292bbeabf37c33f19a448d8fd592bfddbb4b2a
2026-04-07 17:54:11 +09:00
Maxim Cournoyer 51c2fa607c gnu: gst-plugins-ugly: Patch libdvdcss.so reference.
* gnu/packages/gstreamer.scm (gst-plugins-ugly)
[#:phases] {patch-paths}: New phase.

Change-Id: I86952f83bec68bc699c4700ee9dfed003db8dd6b
2026-04-07 17:54:11 +09:00
Maxim Cournoyer 3ae5c06b72 gnu: gst-plugins-bad: Patch libdvdcss.so reference.
* gnu/packages/gstreamer.scm (gst-plugins-bad)
[#:phases] {patch-paths}: New phase.

Change-Id: Idaf5de29b7cd6d0f5187af4250d8292997ecd38c
2026-04-07 17:54:11 +09:00
Maxim Cournoyer b9836afe69 gnu: gst-plugins-ugly: Enable GPL plugins.
This enables dvdread, for DVD playback support, among others.

* gnu/packages/gstreamer.scm (gst-plugins-ugly)
[#configure-flags]: Add "-Dgpl=enabled".

Change-Id: Ibff7cdf10b33b76ed79c771e4673afe36b02ce19
2026-04-07 17:54:11 +09:00
Maxim Cournoyer ec246d10fd gnu: gst-plugins-bad: Enable GPL plugins.
This enables resindvd, for DVD playback support, among others.

* gnu/packages/gstreamer.scm (gst-plugins-bad)
[#configure-flags]: Add "-Dgpl=enabled".

Change-Id: I04c3501044160730298771875d85b99f277f1686
2026-04-07 17:54:11 +09:00
Maxim Cournoyer b1dbd3588a gnu: libbluray: Update to 1.4.1.
* gnu/packages/video.scm (libbluray): Update to 1.4.1.
[source]: Adjust URI.
[build-system]: Switch to meson-build-system.
[#:configure-flags]: Delete.
[#:phases] {move-packages-to-libs}: Move after install phase and adjust
accordingly.
{fix-dlopen-paths}: Order after unpack phase.
[inputs]: Add libudfread.

Change-Id: I249215317cf51e84152115983706670319dd1bb9
2026-04-07 17:54:11 +09:00
Maxim Cournoyer c16c355dbd gnu: libudfread: Update to 1.2.0.
* gnu/packages/cdrom.scm (libudfread): Update to 1.2.0.
[source]: Adjust URI.
[build-system]: Use meson-build-system.
[native-inputs]: Remove automake, autoconf and libtool.

Change-Id: Iee2e2b4120f6211112cc2b60edaf4d30d5a9bb1d
2026-04-07 17:54:11 +09:00
Maxim Cournoyer 4f75a4e7fc gnu: libdvdnav: Update to 7.0.0.
* gnu/packages/video.scm (libdvdnav): Update to 7.0.0.
[source]: Adjust URI.
[build-system]: Switch to meson-build-system.

Change-Id: I20cf2c46a713f0a9bc7afec3dec2e576b7ad381a
2026-04-07 17:54:11 +09:00
Maxim Cournoyer 3ddd4e7d47 gnu: libdvdread: Update to 7.0.1.
* gnu/packages/video.scm (libdvdread): Update to 7.0.1.
[source]: Adjust URI.
[build-system]: Switch to meson-build-system.
[arguments]: Delete field.

Change-Id: I02231a64c2a3bb93e4d95f90051f58da5face50a
2026-04-07 17:54:11 +09:00
Maxim Cournoyer 655867eed6 gnu: libdvdcss: Update to 1.5.0.
* gnu/packages/video.scm (libdvdcss): Update to 1.5.0.
[build-system]: Switch to meson-build-system.

Change-Id: Ie9667158d4973961ce7068cf41f656afa4ab1a17
2026-04-07 17:54:10 +09:00
Liliana Marie Prikler f1e8ac3787 gnu: Fix build of qtbase on non-privileged daemons.
* gnu/packages/qt.scm (qtbase)[#:phases]<check>: Also disable
“tst_qstandardpaths”.
2026-04-07 17:54:10 +09:00
Cayetano Santos 5527b670ca teams: hpc: Adopt fabric-management module.
* etc/teams.scm (hpc)<#:scope>: Add "gnu/packages/fabric-management.scm".
* CODEOWNERS: Regenerate file.

Merges guix/guix!7703

Change-Id: I2f93401ed39f56a39dafbff4a81f95ea3b09d2f0
2026-04-07 10:33:10 +02:00
Herman Rimm d9a7cdd731 gnu: minizinc: Add Google's OR-Tools as solver.
* gnu/packages/maths.scm (minizinc)[inputs]: Add or-tools.
  [arguments]<#:phases>{install-solver-configs}:
  Install OR-Tools' config.

Change-Id: Ibc301b458487c3465251c1c6d97f5858d7d6d59e
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-07 17:25:09 +09:00
Tomas Volf da204c65db gnu: Add rxvt-unicode-terminfo.
* gnu/packages/xdisorg.scm (rxvt-unicode-terminfo): New variable.

Change-Id: I6433bc307b2a8037b3a28ad9ac61350f86737851
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-07 17:10:00 +09:00
Maxim Cournoyer ef465f8910 system/nss: Add 'merge' to NSS actions.
* gnu/system/nss.scm (lookup-action): Add merge.

Change-Id: I68ef691fe66f295735d82d72fea82adda3552df3
2026-04-07 15:10:10 +09:00
Maxim Cournoyer 9d986b2f03 doc: Fix documentation of the name service switch.
The previously referenced `nscd-service' procedure no longer exists.

* doc/guix.texi (Name Service Switch): Adjust to refer to nscd-service-type
and its nscd-configuration configuration record.

Change-Id: Ib2b5ef69facf3489626782ad9dbd927a27c04084
2026-04-07 15:10:10 +09:00
Wilko Meyer c63b598686 gnu: linux-libre 6.19: Update to 6.19.11.
* gnu/packages/linux.scm (linux-libre-6.19-version): Update to 6.19.11.
(linux-libre-6.19-pristine-source): Update hash.

Change-Id: Ic03485cd4dbeebefa1da51210d670350b33e7e3e
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2026-04-06 21:24:35 -07:00
Wilko Meyer 129cf96915 gnu: linux-libre 6.18: Update to 6.18.21.
* gnu/packages/linux.scm (linux-libre-6.18-version): Update to 6.18.21.
(linux-libre-6.18-pristine-source): Update hash.

Change-Id: If65363e23cff035a17c05872f56bdafe746f0038
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2026-04-06 21:24:31 -07:00
Wilko Meyer 8a4b8fbbd5 gnu: linux-libre 6.12: Update to 6.12.80.
* gnu/packages/linux.scm (linux-libre-6.12-version): Update to 6.12.80.
(linux-libre-6.12-pristine-source): Update hash.

Change-Id: Ife8bc24950b628b99900be0ed4d29fac4181f374
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2026-04-06 21:24:22 -07:00
Hugo Buddelmeijer fadd4190d1 gnu: pyotherside: Update to 1.6.2 and fix build.
* gnu/packages/qt.scm (pyotherside): Update to 1.6.2.

Merges: https://codeberg.org/guix/guix/pulls/7641
Change-Id: I16e214dbe315886f2b7ee19f29b23ed7f374d7f5
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 22:59:52 +01:00
Hugo Buddelmeijer 17d745cf3f gnu: es: Update to 0.10.0 and fix build.
* gnu/packages/shells.scm (es): Update to 0.10.0.
[source]: Switch to git-fetch.
[native-inputs]: Add autoconf-2.72, automake, config, and procps, remove bison.

Merges: https://codeberg.org/guix/guix/pulls/7680
Change-Id: Ia159e315ed9006fdc6f63842918e97b2218483a1
Reviewed-by: Jonas Meeuws <jonas.meeuws@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 22:57:57 +01:00
Sharlatan Hellseher fa2ad6b8b9 gnu: Add go-github-com-baozisoftware-qrcode-terminal-go.
* gnu/packages/golang-xyz.scm (go-github-com-baozisoftware-qrcode-terminal-go): New variable.

Change-Id: I9c3073a78982008040667de7f6a7e42af95ddf91
2026-04-06 22:49:32 +01:00
Sharlatan Hellseher 79c56dcadf gnu: Add go-github-com-42wim-go-gitter.
* gnu/packages/golang-web.scm (go-github-com-42wim-go-gitter): New variable.

Change-Id: I5068befac87da5fae2e79548929888eb580e785c
2026-04-06 22:40:11 +01:00
Sharlatan Hellseher 3e4980c3eb gnu: Add go-github-com-mrexodia-wray.
* gnu/packages/golang-web.scm (go-github-com-mrexodia-wray): New variable.

Change-Id: I124b28d541a0f13411c672d55f3045f9636c9ae2
2026-04-06 22:39:33 +01:00
Denis 'GNUtoo' Carikli a98a265d97 gnu: matterbridge: Unbundle more vendor libraries.
The go-modernc-org-ccgo-v3, go-modernc-org-libc and
go-modernc-org-sqlite packages are in Guix, however using them bring a
dependency on go-modernc-org-cc-v4 which make tests fail.

* go-modernc-org-ccgo-v3(matterbridge): unbundle more libraries.
[sources]<#:snippet>: Remove empty vendor/github.com/mgutz directory;
unbundle more libraries.
[inputs]: Add go-github-com-apex-log, go-github-com-gomarkdown-markdown,
go-github-com-google-gops, go-github-com-gorilla-schema,
go-github-com-jeffail-gabs, go-github-com-labstack-echo-v4,
go-github-com-matterbridge-gomatrix, go-github-com-mattn-godown,
go-github-com-minio-md5-simd, go-github-com-pborman-uuid,
go-github-com-philhofer-fwd, go-github-com-remyoudompheng-bigfft,
go-github-com-tinylib-msgp, go-github-com-valyala-fasttemplate,
go-github-com-vmihailenco-msgpack-v5,
go-github-com-vmihailenco-tagparser, go-go-mau-fi-libsignal,
go-go-mau-fi-whatsmeow, go-lukechampine-com-uint128,
go-modernc-org-cc-v3, go-modernc-org-mathutil, go-modernc-org-memory,
go-modernc-org-opt, go-modernc-org-strutil, and go-modernc-org-token.

Merges: https://codeberg.org/guix/guix/pulls/7169
Change-Id: I9a8f75c42619ccfc29310b04bcc5450e93ee8a69
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 22:17:36 +01:00
Christopher Baines 61e4710cf0 gnu: Add hd-idle.
* gnu/packages/hardware.scm (hd-idle): New variable.

Merges: https://codeberg.org/guix/guix/pulls/7524
Change-Id: Ib15912adfb745fd39b961e9fe17e4ffa89716f50
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 22:11:38 +01:00
Christopher Baines b6ced8cbab gnu: Add go-github-com-benmcclelland-sgio.
* gnu/packages/golang-xyz.scm (go-github-com-benmcclelland-sgio): New
variable.

Change-Id: I3706afd47f23690a96db7f77c41d278058abf2f2
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 22:11:29 +01:00
Hugo Buddelmeijer a349056e82 gnu: delly: Update to 1.7.3.
* gnu/packages/bioinformatics.scm (delly): Update to 1.7.3.

Merges: https://codeberg.org/guix/guix/pulls/7710
Change-Id: Ib88fe130f3073bbda7725d00a15cf2045c5d60e6
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 22:05:27 +01:00
Roman Scherer 558b797d88 gnu: Add go-github-com-flynn-go-docopt.
* gnu/packages/golang-xyz.scm (go-github-com-flynn-go-docopt): New variable.

Relates-to: https://codeberg.org/guix/guix/issues/5190
Change-Id: Id42421fb19e1f1daf247d5b103ddc91c6c62d61c
Reviewed-by: Johannes Christ <jc@jchri.st>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 21:34:38 +01:00
Roman Scherer 14f4a8eaa0 gnu: Add go-github-com-muhammadmuzzammil1998-jsonc.
* gnu/packages/golang-xyz.scm (go-github-com-muhammadmuzzammil1998-jsonc): New variable.

Relates-to: https://codeberg.org/guix/guix/issues/5190
Change-Id: I30d7be35f9dfc2bd9fac539cf0c1874f1e9d1470
Reviewed-by: Johannes Christ <jc@jchri.st>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 21:32:43 +01:00
Roman Scherer 613cdc4b46 gnu: Add go-github-com-mattn-go-localereader.
* gnu/packages/golang-xyz.scm (go-github-com-mattn-go-localereader): New variable.

Relates-to: https://codeberg.org/guix/guix/issues/5190
Change-Id: I4fc964e87ad2c57342ca9e172ac10be8be414bb3
Reviewed-by: Johannes Christ <jc@jchri.st>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 21:32:43 +01:00
Roman Scherer 62058f9422 gnu: Add go-github-com-digitorus-timestamp.
* gnu/packages/golang-xyz.scm (go-github-com-digitorus-timestamp): New variable.

Relates-to: https://codeberg.org/guix/guix/issues/5190
Change-Id: Ic91b0bb224f85bc546bd6c29676d52b1629921c1
Reviewed-by: Johannes Christ <jc@jchri.st>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 21:32:43 +01:00
Roman Scherer 5c3a7b2206 gnu: Add go-github-com-digitorus-pkcs7.
* gnu/packages/golang-crypto.scm (go-github-com-digitorus-pkcs7): New variable.

Relates-to: https://codeberg.org/guix/guix/issues/5190
Change-Id: Idc459f1cfed08fdb063e4e432a2e93c0bf8aa349
Reviewed-by: Johannes Christ <jc@jchri.st>
Modified-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-04-06 21:32:43 +01:00
Sören Tempel a3042cb349 gnu: Add cvc5.
* gnu/packages/maths.scm (cvc5): New variable.

Change-Id: Ia8bb80d7763f1dcf8497ae31f35661f4935c853f
2026-04-06 21:21:57 +02:00
jgart 955c617d5c gnu: trealla: Update to 2.92.16.
* gnu/packages/prolog.scm (trealla): Update to 2.92.16.

Change-Id: I0852c705b515ad128d892cbb76fbf877f438138d
2026-04-06 09:27:01 -04:00
jgart 9215ffa155 gnu: toys: Update to 0.1.0.
* gnu/packages/package-management.scm (toys): Update to 0.1.0.
[version]: Use versioned release.

Change-Id: I314031dfae16b1c35de38ef1c947e8b6b99a3fca
2026-04-06 09:26:08 -04:00
Danny Milosavljevic 5d991cceea gnu: openjdk@11: Make Java AWT desktop API work.
* gnu/packages/java.scm (openjdk11)[inputs]: Add gtk+.

Change-Id: Ic6d250991c00d7b0476a5d1fdc71f610b90e7f74
2026-04-06 13:30:28 +02:00
Danny Milosavljevic 7c59b19fb0 gnu: openjdk@9: Make Java AWT desktop API work.
* gnu/packages/java.scm (openjdk9)[inputs]: Add gtk+.

Change-Id: I11906b3dd7bca1b36dc66f73a779beda505a6894
2026-04-06 13:30:28 +02:00
Danny Milosavljevic 62cbf9bb37 gnu: ibus-speech-to-text: Make audio capture work.
* gnu/packages/ibus.scm (ibus-speech-to-text)[inputs]: Add gst-plugins-good.

Change-Id: Ia6b37dede4805ff66f7735740fa296f2161a963b
2026-04-06 13:27:10 +02:00
Nicolas Goaziou 917d358203 gnu: giac: Update to 2.0.0-21.
* gnu/packages/algebra.scm (giac): Update to 2.0.0-21.

Change-Id: I92643bf5222ff632637ecd775d0b689ce800c0e8
2026-04-06 13:07:03 +02:00
Nicolas Goaziou 3166b940ee gnu: nauty: Update to 2.9.3.
* gnu/packages/maths.scm (nauty): Update to 2.9.3.

Change-Id: I86d77c73014b4564f3e05f4111665315bc7e701f
2026-04-06 13:07:03 +02:00
Nicolas Goaziou 4790471794 gnu: scummvm: Update to 2026.2.0.
* gnu/packages/emulators.scm (scummvm): Update to 2026.2.0.

Change-Id: I5fb49aca025e38f4c7ef2ea2c527901735b2b9ff
2026-04-06 13:07:03 +02:00
Nicolas Goaziou a00f183b31 gnu: crawl: Update to 0.34.1.
* gnu/packages/games.scm (crawl): Update to 0.34.1.

Change-Id: I2a69a0b8be6d69b83652e0db1b8ea91277444a7c
2026-04-06 13:07:02 +02:00
Hugo Buddelmeijer ebf8fa45e9 gnu: gtx: Fix build.
* gnu/packages/gnome.scm (gtx)[#:configure-flags]: Add
“-Wno-error=incompatible-pointer-types” to CFLAGS.

Change-Id: I157f32c20f4f1ea049f2ca8444b431854f5cfd4e
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2026-04-06 11:47:31 +02:00
Liliana Marie Prikler 66b39b0746 gnu: pitivi: Build with cvtracker plugin.
* gnu/packages/video.scm (pitivi)[inputs]: Update gst-plugins-bad selection to
also build “opencv” plugin.
2026-04-06 11:47:31 +02:00
Liliana Marie Prikler 861d8c1c7f gnu: pitivi: Fix launch.
* gnu/packages/video.scm (pitivi)[inputs]: Replace python-pygobject with
python-pygobject-3.50.
2026-04-06 11:47:30 +02:00
jgart 969918308b gnu: Add toys.
* gnu/packages/package-management.scm (toys): New variable.

Co-authored-by: unwox <me@unwox.com>

Merges guix/guix!7605

Change-Id: I900c0b197427982a6b1dfdc09d4e4d24a7cdfb73
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-04-06 11:46:23 +02:00
Efraim Flashner 2ad4fb70a0 gnu: vim-fugitive: Update to 3.7-1.3b753cf.
* gnu/packages/vim.scm (vim-fugitive): Update to 3.7-1.3b753cf.

Change-Id: I5c9268ebd8ddf36af933433a4dc0fa4ada8ec13f
2026-04-06 12:43:50 +03:00
Nicolas Goaziou f52f04210b gnu: openboard: Update to 1.7.7.
* gnu/packages/education.scm (openboard): Update to 1.7.7.

Change-Id: Ib723e25d8a598a98bd2c6d928d770e31c9c1f0b2
2026-04-06 11:41:13 +02:00
Nicolas Goaziou f8076b3537 gnu: li-ri: Update to 3.1.6.
* gnu/packages/games.scm (li-ri): Update to 3.1.6.

Change-Id: Ie869531199db0c82983f77bcf31abfd9c52c74c5
2026-04-06 11:15:39 +02:00
Nicolas Goaziou 447d01035d gnu: jumpnbump: Update to 1.70.
* gnu/packages/games.scm (jumpnbump): Update to 1.70. Modernize package.

Change-Id: I1428e2bba8ce50e883e2d62b3fc2e39493e34314
2026-04-06 11:12:00 +02:00
Nicolas Goaziou 67af20238d gnu: xournalpp: Update to 1.3.4.
* gnu/packages/pdf.scm (xournalpp): Update to 1.3.4.

Change-Id: I5500ed1183e768952db2c65d9b3a78a8379ed323
2026-04-06 10:58:34 +02:00
Patrick Norton 24397a022a gnu: wireshark: Update to 4.6.4.
* gnu/packages/networking.scm (wireshark): Update to 4.6.4.

Change-Id: I1e234131d5882d6f3c17c7931d1509c5e5a53dd9
Merges: https://codeberg.org/guix/guix/pulls/7673
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-06 15:24:07 +09:00
Nguyễn Gia Phong 8c87026305 gnu: Add lua5.4-filesystem.
* gnu/packages/lua.scm (lua5.4-filesystem): New variable.

Change-Id: I8097984be60196ba967a41c941ca08a3c3427414
2026-04-06 15:04:18 +09:00
Nguyễn Gia Phong 0240c7939c gnu: lua-filesystem: Update to 1.9.0.
* gnu/packages/lua.scm (make-lua-filesystem): Update to 1.9.0.

Change-Id: I51f7fea999b36b0a00045701b4402b8604d0257e
2026-04-06 15:04:18 +09:00
Nguyễn Gia Phong 429b259a37 gnu: Add lua5.4-lpeg.
* gnu/packages/lua.scm (lua5.4-lpeg): New variable.

Change-Id: I90b67baf05f3141db4d99188c7a50ed25d212dbe
2026-04-06 15:04:18 +09:00
Nguyễn Gia Phong e9cd44074f gnu: lua-lpeg: Update to 1.1.0.
* gnu/packages/lua.scm (make-lua-lpeg): Update to 1.1.0.

Change-Id: I2f52b622f2230cbcdf83f6791e5be9ade010b533
2026-04-06 15:04:14 +09:00
46 changed files with 1048 additions and 369 deletions
+1
View File
@@ -239,6 +239,7 @@ tests/guix-home\.sh @guix/home
tests/home-import\.scm @guix/home
tests/home-services\.scm @guix/home
gnu/packages/fabric-management\.scm @guix/hpc
gnu/packages/mpi\.scm @guix/hpc
gnu/packages/oneapi\.scm @guix/hpc
gnu/packages/opencl\.scm @guix/hpc
+4 -3
View File
@@ -48422,9 +48422,10 @@ A string denoting the name service (@pxref{Services in the NSS
configuration,,, libc, The GNU C Library Reference Manual}).
Note that name services listed here must be visible to nscd. This is
achieved by passing the @code{#:name-services} argument to
@code{nscd-service} the list of packages providing the needed name
services (@pxref{Base Services, @code{nscd-service}}).
achieved by providing the list of packages implementing the needed
services via the @code{name-services} field of the
@code{nscd-configuration} record to be used with the @code{nscd-service-type}
service (@pxref{Base Services, @code{nscd-configuration}}).
@item reaction
An action specified using the @code{lookup-specification} macro
+2 -1
View File
@@ -786,7 +786,8 @@ the haskell-build-system."
(team 'hpc
#:name "High-performance computing team"
#:description "High-performance computing (HPC) related packages."
#:scope (list "gnu/packages/mpi.scm"
#:scope (list "gnu/packages/fabric-management.scm"
"gnu/packages/mpi.scm"
"gnu/packages/oneapi.scm"
"gnu/packages/opencl.scm"
"gnu/packages/parallel.scm"
+3 -1
View File
@@ -1578,7 +1578,9 @@ dist_patch_DATA = \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
%D%/packages/patches/gtk4-demo-reproducible.patch \
%D%/packages/patches/gtk4-needs-udmabuf.patch \
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
+3 -3
View File
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023, 2024, 2025 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019, 2021, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2020-2022 Efraim Flashner <efraim@flashner.co.il>
@@ -406,7 +406,7 @@ precision.")
(define-public giac
(package
(name "giac")
(version "2.0.0-10")
(version "2.0.0-21")
(source
(origin
(method url-fetch)
@@ -418,7 +418,7 @@ precision.")
"https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/"
"stable/main/source/giac_" version ".tar.gz"))
(sha256
(base32 "1lzb0jjmkg5ml1qfl0m00qqng4sxgfqwrbq10gpkp4b301k2ckv1"))))
(base32 "1j6bip76hhqvycapf7xy26y0b8g5zzx4gwkfsr7bf6m2h71a2zry"))))
(build-system gnu-build-system)
(arguments
(list
+2 -2
View File
@@ -7335,7 +7335,7 @@ genome- and pangenome-scale queries using a laptop.")
(define-public delly
(package
(name "delly")
(version "0.8.3")
(version "1.7.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7343,7 +7343,7 @@ genome- and pangenome-scale queries using a laptop.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ibnplgfzj96w8glkx17v7sld3pm402fr5ybmf3h0rlcryabxrqy"))
(base32 "1ri7m7iv3wakm7zdwqdzm5m71y0swad9n78dzrzr9gs3j7j5yxjs"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "src/htslib"))))
+6 -6
View File
@@ -43,6 +43,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system meson)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
@@ -995,18 +996,17 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
(define-public libudfread
(package
(name "libudfread")
(version "1.1.2")
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://download.videolan.org/pub/videolan/libudfread/"
name "-" version ".tar.bz2"))
name "-" version ".tar.xz"))
(sha256
(base32
"05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
(build-system gnu-build-system)
(native-inputs
(list automake autoconf libtool pkg-config))
"03q5b1wm90vygx4rf4mzzrf0yhvhbvp72nyhv63pgz7v9jypqixv"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
(home-page "https://code.videolan.org/videolan/libudfread")
(synopsis "C library to read UDF file systems")
(description "@code{libudfread} is a C library for reading
+1 -1
View File
@@ -8760,7 +8760,7 @@ similar rank-based tests for equal probability distributions due to Neuhauser
(("^PKG_LIBS=.*")
(string-append "PKG_LIBS="
(assoc-ref inputs "libnode")
"/lib/libnode.so.137\n")))
"/lib/libnode.so.127\n")))
(setenv "INCLUDE_DIR"
(string-append
(assoc-ref inputs "libnode")
+3 -3
View File
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -385,7 +385,7 @@ not have any other specialized device.")
(define-public openboard
(package
(name "openboard")
(version "1.7.3")
(version "1.7.7")
(source
(origin
(method git-fetch)
@@ -394,7 +394,7 @@ not have any other specialized device.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1098pys5p82sx97xrhw54vlkn6jly0rhq8b09grmmx2h4mcpj2i2"))))
(base32 "1i27h84p77pl1chw791fjs3vyzsjvsqc9ky2mbw7g8xpzxz1nd9j"))))
(build-system qt-build-system)
(arguments
(list
+3 -3
View File
@@ -6,7 +6,7 @@
;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017-2024, 2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -3247,14 +3247,14 @@ that compiles to WebAssembly.")
(define-public scummvm
(package
(name "scummvm")
(version "2.9.1")
(version "2026.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
"/scummvm-" version ".tar.xz"))
(sha256
(base32 "1qspqawdazsxisxm1lxzgi0i4gx54qd10xyk3nmmirwxz9mg70ka"))))
(base32 "1wv0z9c4dnjywgla9zhbkgnzahj829ybvcx9jw67hdmagnbys42f"))))
(build-system gnu-build-system)
(arguments
(list
+22 -35
View File
@@ -30,7 +30,7 @@
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
@@ -8191,7 +8191,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl
(package
(name "crawl")
(version "0.34.0")
(version "0.34.1")
(source
(origin
(method git-fetch)
@@ -8200,7 +8200,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "16fsvrzcndrplw8zcn6nh8459x8zl5xdnf9r9hzh4ll2a4w9dkcr"))
(base32 "09x4n4w3rw8sldwprb03yg1igwh4m09iw00g2iq30466jryys6bv"))
(patches (search-patches "crawl-upgrade-saves.patch"))))
(build-system gnu-build-system)
(inputs
@@ -11355,46 +11355,33 @@ to remap axis and buttons and a way to calibrate joysticks.")
(define-public jumpnbump
(package
(name "jumpnbump")
(version "1.61")
(version "1.70")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/LibreGames/jumpnbump.git")
(commit version)))
(url "https://gitlab.com/LibreGames/jumpnbump.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"12lwl5sl5n009nb83r8l4lakb9286csqdf1ynpmwwydy17giqsdp"))))
"1irpssijxrfrjm023v642dl3aw4ldlv95fh073jlpdpl1mwqz71a"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ;no test
#:phases
(modify-phases %standard-phases
;; There is no configure script
(replace 'configure
(lambda _
(substitute* "Makefile"
(("-funroll-loops")
"-funroll-loops -fcommon")
(("SDL_CFLAGS =")
"SDL_CFLAGS = -fcommon"))))
(add-after 'unpack 'fix-sdl-path
;; XXX: For some reason, `sdl2-config' reports stand-alone SDL
;; directory, not SDL-union provided as an input to the package.
;; We force the latter with "--prefix=" option.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile"
(("sdl2-config" command)
(string-append command " --prefix=" (assoc-ref inputs "sdl")))))))))
(list
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output)
"SYSINSTALL=1")
#:tests? #f ;no test
#:phases
#~(modify-phases %standard-phases
(delete 'configure)))) ;no configure script
(inputs
`(("bzip2" ,bzip2)
("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net)))
("zlib" ,zlib)))
(list bzip2
(sdl-union (list sdl2 sdl2-mixer sdl2-net))
zlib))
(native-inputs
`(("gettext" ,gettext-minimal))) ;for msgfmt
(list gettext-minimal)) ;for msgfmt
(home-page "https://gitlab.com/LibreGames/jumpnbump")
(synopsis "Multiplayer platform game with bunnies")
(description "You, as a bunny, have to jump on your opponents to make them
@@ -11530,7 +11517,7 @@ player adaptability for character progression.")
(define-public li-ri
(package
(name "li-ri")
(version "3.1.5")
(version "3.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -11539,7 +11526,7 @@ player adaptability for character progression.")
(file-name (git-file-name name version))
(sha256
(base32
"1fd5hl9qhgvyix51la8sl34jzk4mcin8sai05gidy2r2grb1dy4s"))))
"09r6l0sbxp3q750kpbrx513yrafmg7a2769j4wgx812lsk92n3hg"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #false ;no tests
+1
View File
@@ -564,6 +564,7 @@ It is written in C using GObject and libsoup.")
(arguments
`(#:configure-flags
(list
"CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
"--disable-static"
"--enable-gtk-doc"
(string-append "--with-html-dir="
+30
View File
@@ -1229,6 +1229,36 @@ MetroHash}, a high quality, high performance hash algorithm.")
"This package provides a hashing function.")
(license license:expat)))
(define-public go-github-com-digitorus-pkcs7
(package
(name "go-github-com-digitorus-pkcs7")
(version "0.0.0-20250730155240-ffadbf3f398c")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/digitorus/pkcs7")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "0snamp6fbg5vir0lsw5wzvyagrdd832lw6k7cnvcahcgp8l084zc"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/digitorus/pkcs7"))
(native-inputs
(list openssl))
(home-page "https://github.com/digitorus/pkcs7")
(synopsis "PKCS#7 implementation for Go")
(description
"This package implements parsing and generation of some
PKCS#7/Cryptographic Message
Syntax (@url{https://www.rfc-editor.org/rfc/rfc2315},
@url{https://www.rfc-editor.org/rfc/rfc5652, RFC 2315}, RFC 5652) structures
for Go applications. It's an alternative fork of deprecated
@url{https://github.com/mozilla-services/pkcs7}.")
(license license:expat)))
(define-public go-github-com-dvsekhvalnov-jose2go
(package
(name "go-github-com-dvsekhvalnov-jose2go")
+56
View File
@@ -987,6 +987,34 @@ Gemini clients and servers.")
@url{https://1password.com/, 1Password} API.")
(license license:expat)))
(define-public go-github-com-42wim-go-gitter
(let ((commit "16aadfbb65c6641501ea8eebb6bcf23b9011912b")
(revision "0"))
(package
(name "go-github-com-42wim-go-gitter")
(version "0.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/42wim/go-gitter")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "07l07msyackkzvxhc9cljzgh81v5g48crravz29ph516smqj0x6c"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/42wim/go-gitter"))
(propagated-inputs
(list go-github-com-mreiferson-go-httpclient
go-github-com-mrexodia-wray))
(home-page "https://github.com/42wim/go-gitter")
(synopsis "Gitter API in Go")
(description
"This package provides a Gitter API for Golang.")
(license license:asl2.0))))
(define-public go-github-com-42wim-httpsig
(package
(name "go-github-com-42wim-httpsig")
@@ -11813,6 +11841,34 @@ forwarding and DNS resolution across host and VM boundaries.")
the standard library.")
(license license:expat)))
(define-public go-github-com-mrexodia-wray
(package
(name "go-github-com-mrexodia-wray")
(version "0.0.0-20160318003008-78a2c1f284ff")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mrexodia/wray")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "13fpq4sav9bb5g4vhq9lygimxzhslfp7nplfd5cyfgcxmckp5yrj"))))
(build-system go-build-system)
(arguments
(list
#:tests? #f ;tests are broken
#:import-path "github.com/mrexodia/wray"))
(native-inputs
(list go-github-com-smartystreets-goconvey))
(home-page "https://github.com/mrexodia/wray")
(synopsis "Faye client for golang")
(description
"Wray is a client for the @url{http://faye.jcoglan.com/, Faye}
publish-subscribe messaging service. It's alternative fork of
@url{https://github.com/pythonandchips/wray}.")
(license license:expat)))
(define-public go-github-com-muhlemmer-httpforwarded
(package
(name "go-github-com-muhlemmer-httpforwarded")
+169
View File
@@ -2850,6 +2850,32 @@ Unified Format}.")
(description "Package list implements a doubly linked list.")
(license license:bsd-3)))
(define-public go-github-com-baozisoftware-qrcode-terminal-go
(package
(name "go-github-com-baozisoftware-qrcode-terminal-go")
(version "0.0.0-20170407111555-c0650d8dff0f")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Baozisoftware/qrcode-terminal-go")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/Baozisoftware/qrcode-terminal-go"))
(propagated-inputs
(list go-github-com-mattn-go-colorable
go-github-com-skip2-go-qrcode))
(home-page "https://github.com/Baozisoftware/qrcode-terminal-go")
(synopsis "QRCode terminal for Golang")
(description
"This package implments a QR code generator for terminal for Golang.")
(license license:bsd-3)))
(define-public go-github-com-baulk-chardet
(package
(name "go-github-com-baulk-chardet")
@@ -2875,6 +2901,31 @@ Unified Format}.")
"The chardet package ports character set detection from ICU to Go.")
(license license:expat)))
(define-public go-github-com-benmcclelland-sgio
(package
(name "go-github-com-benmcclelland-sgio")
(version "0.0.0-20250710154739-45e823ff1f46")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/benmcclelland/sgio")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "1bkilgs6ikbgy31m0w2ixhv94mjcbicqnx8kl6mwddhb7qwznki8"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/benmcclelland/sgio"
#:test-flags #~(list "-vet=off")))
(home-page "https://github.com/benmcclelland/sgio")
(synopsis "SCSI commands using SG_IO ioctl")
(description
"This package provides support for issuing SCSI commands with SG_IO
ioctl.")
(license license:expat)))
(define-public go-github-com-beorn7-perks
(package
(name "go-github-com-beorn7-perks")
@@ -8222,6 +8273,43 @@ BIOS (@url{https://en.wikipedia.org/wiki/System_Management_BIOS, SMBIOS}) and
Desktop Management Interface (DMI) data and structures.")
(license license:asl2.0)))
(define-public go-github-com-digitorus-timestamp
(package
(name "go-github-com-digitorus-timestamp")
(version "0.0.0-20250524132541-c45532741eea")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/digitorus/timestamp")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "1bmnyhmymxhpvmygkcvvm9r2c2909hfrnafd3n19d0rxgl21lvhk"))
(modules '((guix build utils)))
(snippet
#~(begin
;; Fix example function name: ExampleCreateRequest_ParseResponse
;; implies a method ParseResponse on type CreateRequest, but both
;; are standalone functions. Rename to a valid package example.
(substitute* "timestamp_example_test.go"
(("ExampleCreateRequest_ParseResponse") "Example"))))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/digitorus/timestamp"
;; Skip example test that requires network access to freetsa.org.
#:test-flags #~(list "-skip" "Example")))
(propagated-inputs
(list go-github-com-digitorus-pkcs7))
(home-page "https://github.com/digitorus/timestamp")
(synopsis "RFC3161 Time-Stamp Protocol implementation for Go")
(description
"This package implements the Time-Stamp Protocol (TSP) as specified in
@url{https://www.rfc-editor.org/rfc/rfc3161, RFC3161} (Internet X.509 Public
Key Infrastructure Time-Stamp Protocol).")
(license license:bsd-2)))
(define-public go-github-com-dimchansky-utfbom
(package
(name "go-github-com-dimchansky-utfbom")
@@ -9796,6 +9884,31 @@ quoting, commenting, and escaping.")
(home-page "https://github.com/flynn-archive/go-shlex")
(license license:asl2.0))))
(define-public go-github-com-flynn-go-docopt
(package
(name "go-github-com-flynn-go-docopt")
(version "0.0.0-20140912013429-f6dd2ebbb31e")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/flynn/go-docopt")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "07s8fvnab40mcfmlsgrrddgvrirgm1krb7kaqgipcikjcmj8j6ql"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/flynn/go-docopt"
#:test-subdirs #~(list ".")))
(home-page "https://github.com/flynn/go-docopt")
(synopsis "Docopt command-line argument parser")
(description
"Package docopt parses command-line arguments based on a help message.
It's an alternative fork of @url{https://github.com/docopt/docopt.go}.")
(license license:expat)))
;; XXX: This project isn't maintained upstream, consider to find alternative
;; fork, see <https://github.com/fogleman/gg/issues/185> and remove the
;; package when it has no users.
@@ -17445,6 +17558,34 @@ to handle ANSI color escapes on Windows.")
whether a file descriptor points to a terminal and the type of the terminal.")
(license license:expat)))
(define-public go-github-com-mattn-go-localereader
(package
(name "go-github-com-mattn-go-localereader")
(version "0.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mattn/go-localereader")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0wcgqnpjk0drm7swc0q27j4r5ab63mhz29dgbjdnyn4sw68rqm96"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/mattn/go-localereader"
;; Tests reference NewCodePageDecoder which is only defined in
;; localereader_windows.go and doesn't compile on non-Windows.
#:tests? #f))
(home-page "https://github.com/mattn/go-localereader")
(synopsis "CodePage decoder for Windows")
(description
"This package provides a CodePage decoder for Windows, enabling Go programs
to read locale-specific character encodings such as Shift JIS. It handles
locale reading differently across Unix and Windows systems.")
(license license:expat)))
(define-public go-github-com-mattn-go-pointer
(package
(name "go-github-com-mattn-go-pointer")
@@ -19255,6 +19396,34 @@ Data type that can be converted:
@end itemize")
(license license:expat))))
(define-public go-github-com-muhammadmuzzammil1998-jsonc
(package
(name "go-github-com-muhammadmuzzammil1998-jsonc")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/muhammadmuzzammil1998/jsonc")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "037xi03p46hnfwwh5ylnkzm859h9bi3yn451647y4ghzjbwii1g4"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/muhammadmuzzammil1998/jsonc"))
(home-page "https://github.com/muhammadmuzzammil1998/jsonc")
(synopsis "JSON with comments parser for Go")
(description
"JSONC is a superset of JSON which supports comments. JSON formatted
files are readable to humans but the lack of comments decreases readability.
With JSONC, you can use block (@code{/* */}) and single line (@code{//} or
@code{#}) comments to describe functionality. Microsoft VS Code also uses
this format in configuration files like @file{settings.json},
@file{keybindings.json}, and @file{launch.json}.")
(license license:expat)))
(define-public go-github-com-muhlemmer-gu
(package
(name "go-github-com-muhlemmer-gu")
+32 -20
View File
@@ -578,7 +578,10 @@ This package provides the core library and elements.")
(substitute* "tests/check/meson.build"
;; This test causes nondeterministic failures (see:
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>).
((".*'elements/appsrc.c'.*") ""))
((".*'elements/appsrc.c'.*") "")
;; This one is flaky (see:
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/work_items/5016>).
((".*'elements/inputselector.c'.*") ""))
;; Some other tests fail on other architectures.
#$@(cond
((target-x86-32?)
@@ -766,7 +769,8 @@ model to base your own plug-in on, here it is.")
(build-system meson-build-system)
(arguments
(list
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled"
#:configure-flags #~(list "-Dgpl=enabled"
"-Dsctp-internal-usrsctp=disabled"
;; TODO: Figure out why audiovisualizer test
;; fails on riscv64-linux.
#$@(if (target-riscv64?)
@@ -776,6 +780,15 @@ model to base your own plug-in on, here it is.")
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "ext/resindvd/resindvdsrc.c"
;; `g_module_open' is a wrapper above dlopen; pass it the
;; absolute file name of the library to ensure it is always
;; found.
(("\"libdvdcss\"")
(format #f "~s"
(search-input-file inputs "lib/libdvdcss.so"))))))
(add-after 'unpack 'adjust-tests
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
@@ -789,18 +802,18 @@ model to base your own plug-in on, here it is.")
;; The 'elements_shm.test_shm_live' test sometimes times out
;; (see:
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790>).
((".*'elements/shm\\.c'.*") "")
;; The 'elements_curlhttpsrc' test sometimes times out.
((".*'elements/curlhttpsrc\\.c'.*") "")
;; The 'mxfdemux' test fails for unknown reasons (see:
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921).
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921>).
((".*'elements/mxfdemux.c'.*") "")
;; Unexpected critical/warning, see
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3000>
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/792>
((".*'elements/netsim\\.c'.*") "")
;; TODO: Figure out why this test fails on riscv64-linux.
@@ -809,30 +822,19 @@ model to base your own plug-in on, here it is.")
"'elements/viewfinderbin.c'], true, ],"))
'())
;; This test is flaky on at least some architectures.
;; This test is flaky.
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
#$@(if (member (%current-system)
'("aarch64-linux" "riscv64-linux"))
`((("'elements/camerabin\\.c'\\].*],")
"'elements/camerabin.c'], true, ],"))
'())
(("'elements/camerabin\\.c'\\].*],")
"'elements/camerabin.c'], true, ],")
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
((".*elements/dtls\\.c.*") "")
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921
((".*elements/mxfdemux\\.c.*") "")
;; Unable to create pipeline 'bin.
;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
;; no element "vulkanupload"
((".*elements/vkcolorconvert\\.c.*") "")
((".*elements/vkupload\\.c.*") ""))
(substitute* "tests/check/elements/zxing.c"
;; zxing 1.2.0 seemingly changed the type representation of
;; the EAN_13 structure; disable it.
((".*\"EAN_13\".*")
"")))))
((".*elements/vkupload\\.c.*") "")))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
@@ -1162,9 +1164,19 @@ after their category.")
(build-system meson-build-system)
(arguments
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags #~(list "-Dgpl=enabled")
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "ext/dvdread/dvdreadsrc.c"
;; `g_module_open' is a wrapper above dlopen; pass it the
;; absolute file name of the library to ensure it is always
;; found.
(("\"libdvdcss\"")
(format #f "~s"
(search-input-file inputs "lib/libdvdcss.so"))))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
+15 -8
View File
@@ -1123,7 +1123,7 @@ application suites.")
(define-public gtk
(package
(name "gtk")
(version "4.20.3")
(version "4.22.1")
(source
(origin
(method url-fetch)
@@ -1131,9 +1131,11 @@ application suites.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "0ly1gqc6ybxv5f2a9hvjp5k6l9mfzy2yv8iy2xqnr9l8628g4wr8"))
(base32 "1z2mkmazc2d51jbg3qwwdycycqiwswm88nhw6bxscz8j86f5lyyd"))
(patches
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
(search-patches "gtk4-demo-reproducible.patch"
"gtk4-needs-udmabuf.patch"
"gtk4-respect-GUIX_GTK4_PATH.patch"))
(modules '((guix build utils)))))
(build-system meson-build-system)
(outputs '("out" "bin" "doc"))
@@ -1201,6 +1203,9 @@ application suites.")
(("[ \t]*'empty-text.node',") "")
(("[ \t]*'testswitch.node',") "")
(("[ \t]*'widgetfactory.node',") "")
;; The gtklistitemmanager test is flaky (see:
;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6547>).
((".*'gtklistitemmanager.c',.*") "")
;; XXX: Figure out why this fails and report upstream.
((".*'memorytexture',.*") "")
((".*'yuv-matrix-dmabuf',.*") ""))
@@ -1257,8 +1262,10 @@ application suites.")
(setenv "XDG_CACHE_HOME" (getcwd))))
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &")
;; Tests require a running X server. The '-noreset' option is
;; necessary to avoid spurious "Failed to open display" test
;; errors.
(system "Xvfb :1 +extension GLX -screen 0 1024x768x24 -noreset &")
(setenv "DISPLAY" ":1")
;; Tests write to $HOME.
(setenv "HOME" (getcwd))
@@ -1301,6 +1308,7 @@ application suites.")
docbook-xsl
gettext-minimal
`(,glib "bin")
glibc-utf8-locales ;some tests require en_US.UTF-8
gobject-introspection ;for building introspection data
graphene
gtk-doc/stable ;for building documentation
@@ -1324,7 +1332,6 @@ application suites.")
(inputs
(list colord ;for color printing support
cups ;for CUPS print-backend
ffmpeg ;for ffmpeg media-backend
fribidi
gi-docgen
gstreamer ;for gstreamer media-backend
@@ -1368,8 +1375,8 @@ application suites.")
(native-search-paths
(list
(search-path-specification
(variable "GUIX_GTK4_PATH")
(files '("lib/gtk-4.0")))))
(variable "GUIX_GTK4_PATH")
(files '("lib/gtk-4.0")))))
(search-paths native-search-paths)
(home-page "https://www.gtk.org/")
(synopsis "Cross-platform widget toolkit")
+33
View File
@@ -112,6 +112,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system guile)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
@@ -310,6 +311,38 @@ sharing.")
(define-deprecated-package barrier
deskflow)
(define-public hd-idle
(package
(name "hd-idle")
(version "1.22")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/adelolmo/hd-idle")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "12nckzp00b3y91igp8jzlf6as353la6ar8gp6b646kn9gi2hrla3"))
(snippet
#~(begin
(use-modules (guix build utils))
(delete-file-recursively "vendor")))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/adelolmo/hd-idle"
#:install-source? #f))
(inputs
(list go-github-com-benmcclelland-sgio))
(home-page "https://github.com/adelolmo/hd-idle")
(synopsis "Spin down idle hard disks")
(description "@command{hd-idle} is a utility program for spinning down
external disks after a period of idle time. Since most USB hard drives do not
support setting the idle timer via @command{hdparm}, hd-idle can be used as a
workaround.")
(license license:gpl3+)))
(define-public hw-probe
(package
(name "hw-probe")
+1
View File
@@ -1133,6 +1133,7 @@ IBus-Table on IBus framework:
(string-append out "/libexec/ibus-setup-stt")))))))))
(inputs
(list bash-minimal
gst-plugins-good ; for pulsesrc
gst-vosk
gstreamer
gtk
+2
View File
@@ -1177,6 +1177,7 @@ new Date();"))))
fontconfig
freetype
giflib
gtk+
lcms
elfutils
libjpeg-turbo
@@ -1547,6 +1548,7 @@ new Date();"))))
fontconfig
freetype
giflib
gtk+
lcms
libjpeg-turbo
libpng
+2 -2
View File
@@ -164,14 +164,14 @@ resolution, asynchronous file system operations, and threading primitives.")
(package
(inherit libuv)
(name "libuv")
(version "1.51.0")
(version "1.49.2")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.libuv.org/dist/v" version
"/libuv-v" version ".tar.gz"))
(sha256
(base32
"1szqivvs7izbhw1a3nd1ipbk012yvqqkjg0sjmqxw1hi1fwmf1az"))))
"1a75p8wp4l43y2ffj1szs1ssm6nzjad7k51bqi2r04ngs9mp044c"))))
(properties '((hidden? . #t)))))
(define-public libuv-for-r-httpuv
+8 -8
View File
@@ -531,7 +531,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-6.19-version "6.19.10")
(define-public linux-libre-6.19-version "6.19.11")
(define-public linux-libre-6.19-gnu-revision "gnu")
(define deblob-scripts-6.19
(linux-libre-deblob-scripts
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
(define-public linux-libre-6.19-pristine-source
(let ((version linux-libre-6.19-version)
(hash (base32 "072s76238rnf87yhdy15nbxfyq7x3ch7p2v14dq4pq551qd48va6")))
(hash (base32 "16ymkc5r3hw05z7l7ih3qw406qlszz1l7b4g5yz0hv15ddxrs0r0")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.19)))
(define-public linux-libre-6.18-version "6.18.20")
(define-public linux-libre-6.18-version "6.18.21")
(define-public linux-libre-6.18-gnu-revision "gnu")
(define deblob-scripts-6.18
(linux-libre-deblob-scripts
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
(define-public linux-libre-6.18-pristine-source
(let ((version linux-libre-6.18-version)
(hash (base32 "0lrm76rdlr92kjq3g410qdff9v49mpdf400lmsh7hq74k2ymlyl3")))
(hash (base32 "0ks735y6jq4yy3jaicjsj4dn4n3kk2skf9dqh9dyifipn57j2f0w")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.18)))
@@ -565,7 +565,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-6.12-version "6.12.79")
(define-public linux-libre-6.12-version "6.12.80")
(define-public linux-libre-6.12-gnu-revision "gnu")
(define deblob-scripts-6.12
(linux-libre-deblob-scripts
@@ -575,7 +575,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
(define-public linux-libre-6.12-pristine-source
(let ((version linux-libre-6.12-version)
(hash (base32 "02vrl0m5iw4jiyhpcni2l8kcfzq279s69yagrdz5sany6cgpbyjb")))
(hash (base32 "0lrylj87bb8ky29pbplpncrfhmgqqbq3d49iqgdwv7p7jvc929f9")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.12)))
@@ -11580,7 +11580,7 @@ of Linux application development.")
(define-public wireplumber
(package
(name "wireplumber")
(version "0.5.12")
(version "0.5.14")
(source
(origin
(method git-fetch)
@@ -11590,7 +11590,7 @@ of Linux application development.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1dljz669ywy1lvvn0jh14ymynmbii45q5vay71zajpcg31249dyw"))))
(base32 "0rr2vlbwjjhgsk6lk2iwaww21gks2v63f0cs01rh2mdi8jpfz7h2"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Dsystemd=disabled"
+11 -4
View File
@@ -390,7 +390,7 @@ handy.")
(define (make-lua-filesystem name lua)
(package
(name name)
(version "1.7.0.2")
(version "1.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -401,7 +401,7 @@ handy.")
(file-name (git-file-name name version))
(sha256
(base32
"0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi"))))
"0vd1b9rnbjl24bbnk91jrkli81dc1b2kvpjlsx319azjmynlk0y6"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@@ -432,6 +432,9 @@ directory structure and file attributes.")
(define-public lua5.2-filesystem
(make-lua-filesystem "lua5.2-filesystem" lua-5.2))
(define-public lua5.4-filesystem
(make-lua-filesystem "lua5.4-filesystem" lua-5.4))
(define-public lua-bee
;; There are no releases; use the commit known to work with the packaged
;; luamake.
@@ -1061,13 +1064,14 @@ Notable examples are GTK+, GStreamer and Webkit.")
(define (make-lua-lpeg name lua)
(package
(name name)
(version "1.0.2")
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-"
version ".tar.gz"))
(sha256
(base32 "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"))))
(base32
"0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -1101,6 +1105,9 @@ Grammars (PEGs).")
(define-public lua5.2-lpeg
(make-lua-lpeg "lua5.2-lpeg" lua-5.2))
(define-public lua5.4-lpeg
(make-lua-lpeg "lua5.4-lpeg" lua-5.4))
(define (make-lua-luv name lua)
(package
(name name)
+67 -5
View File
@@ -30,7 +30,7 @@
;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
;;; Copyright © 2018, 2021, 2024 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2019, 2021-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019, 2021-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -159,6 +159,7 @@
#:use-module (gnu packages image-processing)
#:use-module (gnu packages java)
#:use-module (gnu packages less)
#:use-module (gnu packages libedit)
#:use-module (gnu packages lisp)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -446,6 +447,66 @@ programming languages.")
(home-page "https://stcorp.nl/coda")
(license license:gpl2+)))
(define-public cvc5
(package
(name "cvc5")
(version "1.3.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cvc5/cvc5/")
(commit (string-append "cvc5-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ynz7di4dyyiiydgmf0z9dc2jl7nm44xi0amch29rcgznwr4wy5m"))))
(build-system cmake-build-system)
(arguments
(list
#:build-type "Production"
#:configure-flags
;; Keep the flags in sync with the options set by `./configure --best`.
;; See <https://github.com/cvc5/cvc5/blob/cvc5-1.3.3/configure.sh#L216-L222>.
#~(list "-DBUILD_SHARED_LIBS=1"
"-DENABLE_GPL=ON"
"-DUSE_EDITLINE=ON"
"-DUSE_CLN=ON"
"-DUSE_POLY=ON"
"-DENABLE_IPO=ON"
"-DUSE_CRYPTOMINISAT=ON")
;; TODO: The reduce_constant_dup test fails, needs investigation.
#:test-exclude "reduce_constants_dup\\.smt2"
#:phases
#~(modify-phases %standard-phases
;; Guix's libedit package does not require -ltinfo.
(add-after 'unpack 'remove-tinfo
(lambda _
(substitute* "cmake/FindEditline.cmake"
((" tinfo")
""))))
;; The 'check phase requires test programs build using 'build-tests'.
(add-before 'check 'build-tests
(lambda _
(invoke "cmake" "--build" "." "--target" "build-tests"))))))
(inputs (list cadical-2.1
cln
cryptominisat
gmp
libedit
libpoly
symfpu))
(native-inputs (list pkg-config
python-minimal
python-tomli
python-pyparsing
python-pexpect))
(home-page "https://cvc5.github.io/")
(synopsis "Satisfiability modulo theories solver")
(description
"cvc5 is a solver for @acronym{SMT, satisfiability modulo theories}
problems. It processes input in the standard SMT-LIB format.")
(license (list license:expat license:bsd-3))))
(define-public qdldl
(package
(name "qdldl")
@@ -5015,6 +5076,7 @@ book.")
(lambda _
(let ((chuffed #$(this-package-input "chuffed"))
(gecode #$(this-package-input "gecode"))
(or-tools #$(this-package-input "or-tools"))
(pkgdatadir (string-append #$output
"/share/minizinc")))
(call-with-output-file (string-append pkgdatadir
@@ -5035,11 +5097,11 @@ book.")
(copy-recursively
(string-append solver "/share/minizinc/solvers")
(string-append pkgdatadir "/solvers")))
(list gecode chuffed))))))))
(list chuffed gecode or-tools))))))))
(native-inputs
(list bison flex))
(inputs
(list cbc chuffed gecode zlib))
(list cbc chuffed gecode or-tools zlib))
(home-page "https://www.minizinc.org")
(synopsis "High-level constraint modeling language")
(description "MiniZinc is a high-level modeling language for constraint
@@ -9470,7 +9532,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
(define-public nauty
(package
(name "nauty")
(version "2.9.1")
(version "2.9.3")
(source
(origin
(method url-fetch)
@@ -9478,7 +9540,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
"https://pallini.di.uniroma1.it/"
"nauty" (string-join (string-split version #\.) "_") ".tar.gz"))
(sha256
(base32 "0gl7rpl2viahrqmjrrgv0iq31xz093p5sk1ns9r2qdqas43ak3s8"))))
(base32 "0nqvri1jfi95xswrcvn9dkyriy7pkjry6nwqhdc0z2pq0jpfvi4z"))))
(build-system gnu-build-system)
(outputs '("out" "lib"))
(arguments
+57 -12
View File
@@ -101,6 +101,7 @@
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-maths)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages graphviz)
@@ -3234,6 +3235,7 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
(snippet '(for-each delete-file-recursively
;; TODO: unbundle the rest as well
'("vendor/filippo.io"
"vendor/github.com/apex"
"vendor/github.com/blang"
"vendor/github.com/d5"
"vendor/github.com/davecgh"
@@ -3243,25 +3245,31 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
"vendor/github.com/go-asn1-ber"
"vendor/github.com/golang"
"vendor/github.com/golang-jwt"
"vendor/github.com/google/uuid"
"vendor/github.com/gorilla/websocket"
"vendor/github.com/gomarkdown"
"vendor/github.com/google"
"vendor/github.com/gorilla"
"vendor/github.com/hashicorp"
"vendor/github.com/Jeffail"
"vendor/github.com/jpillora"
"vendor/github.com/json-iterator"
"vendor/github.com/kballard"
"vendor/github.com/klauspost"
"vendor/github.com/labstack/echo"
"vendor/github.com/magiconair"
"vendor/github.com/mattn/go-colorable"
"vendor/github.com/mattn/go-isatty"
"vendor/github.com/mattn/go-runewidth"
"vendor/github.com/mgutz/ansi"
"vendor/github.com/matterbridge/gomatrix"
"vendor/github.com/mattn"
"vendor/github.com/mgutz"
"vendor/github.com/minio/md5-simd"
"vendor/github.com/minio/sha256-simd"
"vendor/github.com/mitchellh"
"vendor/github.com/modern-go"
"vendor/github.com/opentracing"
"vendor/github.com/pborman"
"vendor/github.com/pelletier"
"vendor/github.com/philhofer"
"vendor/github.com/pkg"
"vendor/github.com/pmezard"
"vendor/github.com/remyoudompheng"
"vendor/github.com/rivo"
"vendor/github.com/russross"
"vendor/github.com/sirupsen"
@@ -3269,15 +3277,24 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
"vendor/github.com/spf13"
"vendor/github.com/stretchr"
"vendor/github.com/subosito"
"vendor/github.com/valyala/bytebufferpool"
"vendor/github.com/vmihailenco/tagparser"
"vendor/github.com/tinylib"
"vendor/github.com/valyala"
"vendor/github.com/vmihailenco"
"vendor/go.mau.fi"
"vendor/go.uber.org"
"vendor/golang.org"
"vendor/google.golang.org/protobuf/"
"vendor/google.golang.org"
"vendor/gopkg.in/ini.v1"
"vendor/gopkg.in/natefinch"
"vendor/gopkg.in/yaml.v2"
"vendor/gopkg.in/yaml.v3")))
"vendor/gopkg.in/yaml.v3"
"vendor/lukechampine.com"
"vendor/modernc.org/cc"
"vendor/modernc.org/mathutil"
"vendor/modernc.org/memory"
"vendor/modernc.org/opt"
"vendor/modernc.org/strutil"
"vendor/modernc.org/token")))
(sha256
(base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80"))))
(build-system go-build-system)
@@ -3300,12 +3317,13 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
go-golang-org-x-time
go-golang-org-x-tools
;; google.golang.org
go-google-golang-org-appengine
go-google-golang-org-protobuf
;; gopkg.in
go-gopkg-in-ini-v1
go-gopkg-in-natefinch-lumberjack-v2
go-gopkg-in-yaml-v2
go-gopkg-in-yaml-v3
go-gopkg-in-natefinch-lumberjack-v2
;; filippo.io
go-filippo-io-edwards25519
;; uber.org
@@ -3313,6 +3331,7 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
go-go-uber-org-multierr
go-go-uber-org-zap
;; github.com
go-github-com-apex-log
go-github-com-blang-semver
go-github-com-d5-tengo-v2
go-github-com-davecgh-go-spew
@@ -3322,32 +3341,43 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
go-github-com-go-asn1-ber-asn1-ber
go-github-com-golang-jwt-jwt
go-github-com-golang-protobuf
go-github-com-gomarkdown-markdown
go-github-com-google-gops
go-github-com-google-uuid
go-github-com-gorilla-schema
go-github-com-gorilla-websocket
go-github-com-hashicorp-errwrap
go-github-com-hashicorp-go-multierror
go-github-com-hashicorp-golang-lru
go-github-com-hashicorp-hcl
go-github-com-jeffail-gabs
go-github-com-jpillora-backoff
go-github-com-json-iterator-go
go-github-com-kballard-go-shellquote
go-github-com-klauspost-compress
go-github-com-klauspost-cpuid-v2
go-github-com-labstack-echo-v4
go-github-com-magiconair-properties
go-github-com-matterbridge-gomatrix
go-github-com-mattn-go-colorable
go-github-com-mattn-go-isatty
go-github-com-mattn-go-runewidth
go-github-com-mattn-godown
go-github-com-mgutz-ansi
go-github-com-minio-md5-simd
go-github-com-minio-sha256-simd
go-github-com-mitchellh-go-homedir
go-github-com-mitchellh-mapstructure
go-github-com-modern-go-concurrent
go-github-com-modern-go-reflect2
go-github-com-opentracing-opentracing-go
go-github-com-pborman-uuid
go-github-com-pelletier-go-toml
go-github-com-pelletier-go-toml-v2
go-github-com-philhofer-fwd
go-github-com-pkg-errors
go-github-com-pmezard-go-difflib
go-github-com-remyoudompheng-bigfft
go-github-com-rivo-uniseg
go-github-com-russross-blackfriday
go-github-com-sirupsen-logrus
@@ -3359,8 +3389,23 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
go-github-com-spf13-viper
go-github-com-stretchr-testify
go-github-com-subosito-gotenv
go-github-com-tinylib-msgp
go-github-com-valyala-bytebufferpool
go-github-com-vmihailenco-tagparser))
go-github-com-valyala-fasttemplate
go-github-com-vmihailenco-msgpack-v5
go-github-com-vmihailenco-tagparser
;; go.mau.fi
go-go-mau-fi-libsignal
go-go-mau-fi-whatsmeow
;; lukechampine.com
go-lukechampine-com-uint128
;; modernc.org
go-modernc-org-cc-v3
go-modernc-org-mathutil
go-modernc-org-memory
go-modernc-org-opt
go-modernc-org-strutil
go-modernc-org-token))
(synopsis "Bridge together various messaging networks and protocols")
(description
"Relays messages between different channels from various
+5 -2
View File
@@ -614,6 +614,9 @@ Android, and ChromeOS.")
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "tests/meson.build"
;; This test is flaky (see:
;; <https://gitlab.freedesktop.org/libnice/libnice/-/work_items/210>).
((".*'test-send-recv',.*") "")
;; test-set-port-range.c:66:main: assertion failed:
;; (nice_agent_gather_candidates (agent, stream1))
(("'test-set-port-range'" all)
@@ -2041,7 +2044,7 @@ of the same name.")
(define-public wireshark
(package
(name "wireshark")
(version "4.6.3")
(version "4.6.4")
(source
(origin
(method git-fetch)
@@ -2050,7 +2053,7 @@ of the same name.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0j49gnvc1x37sf7dq3wklzlhp5gihi7d926mmfqb1avyb68n7qjn"))))
(base32 "05jivnnlmbbhc6b3r7zdahiw22fvb9r6pg4pc83ascnja49xlyq6"))))
(build-system qt-build-system)
(arguments
(list
+2 -2
View File
@@ -2324,7 +2324,7 @@ a string consisting of a number and a time unit is converted to milliseconds.")
(define-public node-nan
(package
(name "node-nan")
(version "2.26.2")
(version "2.22.0")
(source
(origin
(method git-fetch)
@@ -2333,7 +2333,7 @@ a string consisting of a number and a time unit is converted to milliseconds.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "18xv0m40jgy3sc4pldw95w6p72ms5a5h0x2sm2mimlwlmxmrjlmb"))))
(base32 "02gqm23x26glffvyxrnk610hy3hg0kwh2v58dhnb032l0jhjzqvp"))))
(build-system node-build-system)
(arguments
`(#:phases
+58 -48
View File
@@ -274,7 +274,7 @@
(lambda (file stat)
(executable-file? file))
#:stat lstat)))))
(add-after 'install 'fix-node-gyp-reference
(add-after 'install 'install-npmrc
;; Note: programs like node-gyp only receive these values if
;; they are started via `npm` or `npx`.
;; See: https://github.com/nodejs/node-gyp#npm-configuration
@@ -482,7 +482,7 @@ Node.js and web browsers.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nodejs/llparse-builder.git")
(url "https://github.com/indutny/llparse-builder.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@@ -491,6 +491,10 @@ Node.js and web browsers.")
(modules '((guix build utils)))
(snippet
'(begin
;; FIXME: Unneeded runtime dependency.
;; https://github.com/indutny/llparse-builder/pull/2
(substitute* "package.json"
(("\"@types/debug.*,") ""))
;; Fix imports for esbuild.
;; https://github.com/evanw/esbuild/issues/477
(substitute* '("src/node/invoke.ts"
@@ -517,8 +521,7 @@ Node.js and web browsers.")
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(modify-json (delete-dependencies
`("@types/debug"
"@types/mocha"
`("@types/mocha"
"@types/node"
"mocha"
"ts-node"
@@ -536,7 +539,7 @@ Node.js and web browsers.")
(list node-binary-search-bootstrap node-debug-bootstrap))
(native-inputs
(list esbuild))
(home-page "https://github.com/nodejs/llparse-builder#readme")
(home-page "https://github.com/indutny/llparse-builder#readme")
(properties '((hidden? . #t)))
(synopsis "Graph builder for consumption by llparse")
(description "This package builds graphs for consumption by llparse.")
@@ -550,7 +553,7 @@ Node.js and web browsers.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nodejs/llparse-frontend.git")
(url "https://github.com/indutny/llparse-frontend.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@@ -599,7 +602,7 @@ Node.js and web browsers.")
(list node-debug-bootstrap node-llparse-builder-bootstrap))
(native-inputs
(list esbuild))
(home-page "https://github.com/nodejs/llparse-frontend#readme")
(home-page "https://github.com/indutny/llparse-frontend#readme")
(properties '((hidden? . #t)))
(synopsis "Frontend for the llparse compiler")
(description "This package is a frontend for the llparse compiler.")
@@ -608,17 +611,17 @@ Node.js and web browsers.")
(define-public node-llparse-bootstrap
(package
(name "node-llparse")
(version "7.3.0")
(version "7.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nodejs/llparse.git")
(url "https://github.com/indutny/llparse.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"09hqjcynkz5iv7aydzdwgs42r7y2zylplv0ff7w0vkdsgb08j22a"))
"10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -642,14 +645,10 @@ Node.js and web browsers.")
(add-after 'patch-dependencies 'delete-dependencies
(lambda args
(modify-json (delete-dependencies
`("@stylistic/eslint-plugin"
"@typescript-eslint/eslint-plugin"
"@typescript-eslint/parser"
"@types/debug"
`("@types/debug"
"@types/mocha"
"@types/node"
"esm"
"eslint"
"llparse-test-fixture"
"mocha"
"ts-node"
@@ -677,7 +676,7 @@ parser definition into a C output.")
(define-public llhttp-bootstrap
(package
(name "llhttp")
(version "9.3.0")
(version "9.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -686,7 +685,7 @@ parser definition into a C output.")
(file-name (git-file-name name version))
(sha256
(base32
"0yz4ys94pjq2fs2pihpqjvmxj2mbpm8k5prlm445z4qlajzlr4kb"))
"0mzg19aqb1am498gms0z75cwd5kmfg9p78b1hhxw67019nsjcbac"))
(patches (search-patches "llhttp-ponyfill-object-fromentries.patch"))
(modules '((guix build utils)))
(snippet
@@ -748,14 +747,14 @@ source files.")
(define-public node-lts
(package
(inherit node-bootstrap)
(version "24.14.1")
(version "22.14.0")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.gz"))
(sha256
(base32
"1cri5lp3a9jhh34dbd48hq2zyb7xjb9qs6zl36l3q2blawgwz642"))
"12msprh604s6qdsgwymxw4kl8ivaldbaydf4v37lbp02aznk2kkc"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -771,17 +770,13 @@ source files.")
"deps/icu-small"
"deps/nghttp2"
"deps/ngtcp2"
"deps/llhttp"
"deps/uv"
"deps/zlib"
"deps/zstd"))))))
"deps/zlib"))))))
(arguments
(substitute-keyword-arguments arguments
((#:configure-flags configure-flags)
''("--shared-cares"
"--shared-libuv"
"--shared-http-parser"
"--shared-http-parser-libname=llhttp"
"--shared-nghttp2"
"--shared-openssl"
"--shared-zlib"
@@ -789,7 +784,6 @@ source files.")
"--with-intl=system-icu"
"--shared-ngtcp2"
"--shared-nghttp3"
"--shared-zstd"
;;Needed for correct snapshot checksums
"--v8-enable-snapshot-compression"))
((#:phases phases)
@@ -852,11 +846,9 @@ source files.")
(for-each delete-file
'("test/parallel/test-https-agent-unref-socket.js"))
;; These tests are timing-sensitive, and fail sporadically on
;; This test is timing-sensitive, and fails sporadically on
;; slow, busy, or even very fast machines.
(for-each delete-file
'("test/parallel/test-fs-utimes.js"
"test/sequential/test-performance-eventloopdelay.js"))
(delete-file "test/parallel/test-fs-utimes.js")
;; FIXME: This test fails randomly:
;; https://github.com/nodejs/node/issues/31213
@@ -907,6 +899,18 @@ source files.")
"test/parallel/test-http2-invalid-last-stream-id.js")
(("client\\.connect\\(address\\)")
"client.connect(address.port)"))))
(add-after 'delete-problematic-tests 'replace-llhttp-sources
(lambda* (#:key inputs #:allow-other-keys)
;; Replace pre-generated llhttp sources
(let ((llhttp (assoc-ref inputs "llhttp")))
(copy-file (string-append llhttp "/src/llhttp.c")
"deps/llhttp/src/llhttp.c")
(copy-file (string-append llhttp "/src/api.c")
"deps/llhttp/src/api.c")
(copy-file (string-append llhttp "/src/http.c")
"deps/llhttp/src/http.c")
(copy-file (string-append llhttp "/include/llhttp.h")
"deps/llhttp/include/llhttp.h"))))
;; npm installs dependencies by copying their files over a tar
;; stream. A file with more than one hardlink is marked as a
;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a
@@ -931,22 +935,30 @@ source files.")
;; https://github.com/npm/pacote/issues/285
(add-after 'install 'ignore-number-of-hardlinks
(lambda* (#:key outputs #:allow-other-keys)
(let ((dir (string-append (assoc-ref outputs "out")
"/lib/node_modules/npm/node_modules"
"/tar/dist")))
(substitute*
(list (string-append dir "/esm/write-entry.js")
(string-append dir "/commonjs/write-entry.js"))
(let ((file (string-append (assoc-ref outputs "out")
"/lib/node_modules/npm/node_modules"
"/tar/lib/write-entry.js")))
(substitute* file
(("this.stat.nlink > 1") "false")))))
(replace 'fix-node-gyp-reference
(add-after 'install 'install-node-gyp-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (spec)
(wrap-program (string-append out spec)
`("npm_package_config_node_gyp_nodedir" = (,out))))
'("/bin/npm"
"/bin/npx")))))))))
(let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/lib/node_modules/npm/bin/node-gyp-bin"))
(file (string-append dir "/node-gyp")))
(mkdir-p dir)
;; See https://github.com/npm/cli/issues/6842
(call-with-output-file file
(lambda (port)
(format port "#!~a/bin/sh
if [ \"x$npm_config_node_gyp\" = \"x\" ]; then
~a/bin/node \"~a/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js\" \"$@\"
else
\"$npm_config_node_gyp\" \"$@\"
fi"
(assoc-ref inputs "bash")
out
out)))
(chmod file #o555))))))))
(native-inputs
(list ;; Runtime dependencies for binaries used as a bootstrap.
c-ares-for-node-lts
@@ -962,8 +974,7 @@ source files.")
pkg-config
procps
python
util-linux
gcc-14))
util-linux))
(inputs
(list bash-minimal
coreutils
@@ -976,8 +987,7 @@ source files.")
nghttp3
`(,nghttp2 "lib")
openssl
zlib
`(,zstd-1.5.7 "lib")))
zlib))
(supported-systems
(cons "riscv64-linux" (package-supported-systems node-bootstrap)))
(properties (alist-delete 'hidden? (package-properties node-bootstrap)))))
@@ -993,6 +1003,6 @@ source files.")
`(cons* "--shared" "--without-npm" ,flags))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(delete 'fix-node-gyp-reference)
(delete 'install-npmrc)
(delete 'patch-nested-shebangs)
(delete 'ignore-number-of-hardlinks)))))))
+43 -1
View File
@@ -21,7 +21,7 @@
;;; Copyright © 2021, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023, 2025-2026 jgart <jgart@dismail.de>
;;; Copyright © 2023 Wojtek Kosior <koszko@koszko.org>
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
@@ -31,6 +31,7 @@
;;; Copyright © 2025 Tomás Ortín Fernández <quanrong@mailbox.org>
;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
;;; Copyright © 2025 unwox <me@unwox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -797,6 +798,47 @@ with the @command{module} command commonly found on @acronym{HPC,
high-performance computing} clusters.")
(license license:gpl3+)))
(define-public toys
(package
(name "toys")
(version "0.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~whereiseveryone/toys")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"169jxh5knp5f2y9wbnc454jjdvvyqb5r0ydv3qkpm332vr0cl6p9"))))
(build-system guile-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'register-guix-extension
(lambda* (#:key outputs #:allow-other-keys)
(let ((ext-path (string-append #$output "/share/guix/extensions")))
(mkdir-p ext-path)
(copy-recursively "guix/extensions" ext-path))))
(add-after 'register-guix-extension 'clean-up
(lambda* _
(delete-file "channels.scm")
(delete-file-recursively "guix"))))))
(native-inputs (list guile-3.0-latest))
(inputs
(list guile-json-4
guile-readline
guile-sqlite3
guix))
(native-search-paths (list $GUIX_EXTENSIONS_PATH))
(home-page "https://toys.whereis.social/")
(synopsis "Search engine for Guix channels")
(description "Toys is a search engine for collecting and displaying Guix
channel data found across the internet. Toys provides a command-line
interface for interacting with the application.")
(license license:gpl3+)))
(define-public guix-xsearch
(package
(name "guix-xsearch")
@@ -0,0 +1,35 @@
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
Upstream-status: Patch prepared by upstream, not yet committed.
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 0118304bf8..6bf4d4bb93 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -275,6 +275,16 @@ compare_render_tests = [
'zero-length-path-stroke',
]
+# These tests use dmabufs and fail in testrunners that have
+# dmabuf support but no access to /dev/udmabuf.
+# For that purpose we add them to the 'needs-udmabuf' suite
+# with this list
+needs_udmabuf = [
+ 'yuv-matrix-dmabuf-nv12',
+ 'yuv-matrix-dmabuf-rgba',
+ 'yuv-matrix-dmabuf-yuyv',
+]
+
# These tests are either slow or need lots of memory.
# So we don't run them in parallel with other such tests to not
# cause CI failures
@@ -386,6 +396,9 @@ foreach renderer : renderers
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
extra_suites += ['failing']
endif
+ if needs_udmabuf.contains(testname)
+ extra_suites += ['needs-udmabuf']
+ endif
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
protocol: 'tap',
args: [
@@ -0,0 +1,79 @@
Upstream-status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9675
diff --git a/demos/gtk-demo/geninclude.py b/demos/gtk-demo/geninclude.py
index 2ebfaeb625..5864a608f5 100755
--- a/demos/gtk-demo/geninclude.py
+++ b/demos/gtk-demo/geninclude.py
@@ -2,19 +2,20 @@
# -*- coding: utf-8 -*-
import sys
-import re
-import os
from collections import *
+
def add_quotes(s):
return "\"" + s.lower() + "\""
+
def wordify(s):
return s.strip().rstrip(".,;:")
+
def is_keyword(s):
if s == "GTK":
- return False
+ return False
elif s.startswith(("Gtk", "Gdk", "Pango")):
return True
elif s.startswith("G") and s[1].isupper():
@@ -22,6 +23,7 @@ def is_keyword(s):
else:
return False
+
out_file = sys.argv[1]
in_files = sys.argv[2:]
@@ -82,6 +84,10 @@ for demo in demos:
parent_index = parent_index + 1
+# Sort demos by title
+demos = sorted(demos, key=lambda x: x[1])
+
+
# For every child with a parent, generate a list of child demos
i = 0
for parent in parents:
@@ -91,15 +97,12 @@ for parent in parents:
for child in demos:
if child[1].startswith(parent + "/"):
title = child[1][child[1].rfind('/') + 1:]
- file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, child[2])) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
+ file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(child[2]))) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
file_output += " { NULL }\n};\n"
i = i + 1
-# Sort demos by title
-demos = sorted(demos, key=lambda x: x[1])
-
file_output += "\nDemoData gtk_demos[] = {\n"
for demo in demos:
# Do not generate one of these for demos with a parent demo
@@ -118,10 +121,10 @@ for demo in demos:
if demo[5] != -1:
child_array = "child" + str(demo[5])
- file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, keywords)) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
+ file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(keywords))) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
-file_output += " { NULL }\n};\n"
+file_output += " { NULL }\n};\n"
ofile = open(out_file, "w")
ofile.write(file_output)
ofile.close()
@@ -0,0 +1,35 @@
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
Upstream-status: Patch prepared by upstream, not yet committed.
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 0118304bf8..6bf4d4bb93 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -275,6 +275,16 @@ compare_render_tests = [
'zero-length-path-stroke',
]
+# These tests use dmabufs and fail in testrunners that have
+# dmabuf support but no access to /dev/udmabuf.
+# For that purpose we add them to the 'needs-udmabuf' suite
+# with this list
+needs_udmabuf = [
+ 'yuv-matrix-dmabuf-nv12',
+ 'yuv-matrix-dmabuf-rgba',
+ 'yuv-matrix-dmabuf-yuyv',
+]
+
# These tests are either slow or need lots of memory.
# So we don't run them in parallel with other such tests to not
# cause CI failures
@@ -386,6 +396,9 @@ foreach renderer : renderers
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
extra_suites += ['failing']
endif
+ if needs_udmabuf.contains(testname)
+ extra_suites += ['needs-udmabuf']
+ endif
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
protocol: 'tap',
args: [
+2 -2
View File
@@ -1346,7 +1346,7 @@ using a stylus.")
(define-public xournalpp
(package
(name "xournalpp")
(version "1.3.3")
(version "1.3.4")
(source
(origin
(method git-fetch)
@@ -1355,7 +1355,7 @@ using a stylus.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1dzjp0hi54h2f5sbh9jmhywls3q52lc8j2bi2zyq6pl0y4nvfx80"))))
(base32 "1rs3x9k4nnlwpml49fzjsnp3hs807i7y8ccgffgngmb71999bla4"))))
(build-system cmake-build-system)
(arguments
(list
+2 -2
View File
@@ -236,7 +236,7 @@ it.")
(define-public trealla
(package
(name "trealla")
(version "2.92.15")
(version "2.92.16")
(source
(origin
(method git-fetch)
@@ -245,7 +245,7 @@ it.")
(url "https://github.com/trealla-prolog/trealla")
(commit (string-append "v" version))))
(sha256
(base32 "15kmal7pja5y0jxzl7kycr028513gc4y00dlvvs2f7gcviiddbxh"))
(base32 "1246f15amc2f5d43s59ncq1i7k97yfxsjz057k2prymglyns0sgk"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
+2 -2
View File
@@ -173,7 +173,7 @@ rates.")
(define-public pulseaudio
(package
(name "pulseaudio")
(version "16.1")
(version "17.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -181,7 +181,7 @@ rates.")
name "-" version ".tar.xz"))
(sha256
(base32
"1r2aa0g7al9jhrrbrnih6i3bfznd73kkbafrbzwpjyflj7735vwf"))
"1dc7xdfbn5rknwsvv5m2ijfwnqrap208liwyhiykjghsczb98dq5"))
(modules '((guix build utils)))
(snippet
;; Disable console-kit support by default since it's deprecated
+7 -7
View File
@@ -16898,12 +16898,11 @@ the @code{sendfile(2)} system call.")
(arguments
(list
#:test-flags
#~(list "-k" "not TestCommandLineParser"
#$@(if (target-aarch64?)
;; TimeoutError: timed out
'((string-append "--deselect=pyftpdlib/test/test_functional.py"
"::TestTimeouts::test_idle_data_timeout2"))
'()))))
#~(list
"-k" "not TestCommandLineParser"
;; These contains flaky tests.
"--deselect=pyftpdlib/test/test_functional.py"
"--deselect=pyftpdlib/test/test_functional_ssl.py")))
(native-inputs
(list python-psutil
python-pytest
@@ -20956,7 +20955,8 @@ into 22 character URL-safe base64 slug representation.")
(sha256
(base32 "0zwjry4ylqncqvxrywp0km96jng4f288dgz8kz5vymk7nr2z21m1"))))
(build-system pyproject-build-system)
;; tests: 856 passed, 24 skipped
;; The test_brokenpipeerror is flaky.
(arguments (list #:test-flags #~(list "-k" "not test_brokenpipeerror")))
(native-inputs
(list python-poetry-core
python-pytest
+15 -6
View File
@@ -1090,11 +1090,16 @@ tst_qt_cmake_create.cpp"
;; See https://bugreports.qt.io/browse/QTBUG-113371
;; Adding glibc-utf8-locales to native-inpus is no help.
;; TODO: when core-updates is merged, check again.
"tst_selftests"
;; The 'tst_qsqlthread' test sometimes fails.
"tst_qsqlthread"
;; The qsqldatabase test is flaky (see:
;; <https://qt-project.atlassian.net/browse/QTBUG-145385>).
"tst_qsqldatabase"
;; The 'tst_qtimer' test has a propensity to hang and
;; fail (see:
;; <https://qt-project.atlassian.net/browse/QTBUG-145261>).
"tst_qtimer_no_glib"
;; The 'tst_qthread' test is also flaky, despite the
;; patch applied that promised to fix it.
@@ -1193,7 +1198,11 @@ tst_qt_cmake_create.cpp"
;; This test may fail non-deterministically as reported
;; in Guix bug#73233 and upstream at
;; https://bugreports.qt.io/browse/QTBUG-119321.
"tst_qsharedmemory")
"tst_qsharedmemory"
;; This test fails deterministically on a non-privileged
;; daemon.
"tst_qstandardpaths")
#$@(cond
((target-ppc64le?)
#~((list
@@ -4549,7 +4558,7 @@ instances.")
(define-public pyotherside
(package
(name "pyotherside")
(version "1.6.0")
(version "1.6.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4558,7 +4567,7 @@ instances.")
(file-name (git-file-name name version))
(sha256
(base32
"0vwl088p8zjkh2rwmzwpz5mkjs2rfyb80018dq4r571c9vpwp2r0"))))
"1nn0rmdwrxz6j95plzfy4r6s2jfq9ddqj7danbn4rx2nnd81brnq"))))
(build-system qt-build-system)
(arguments
(list
+12 -8
View File
@@ -403,22 +403,26 @@ has a small feature set similar to a traditional Bourne shell.")
(define-public es
(package
(name "es")
(version "0.9.2")
(version "0.10.0")
(source
(origin
(method url-fetch/tarbomb)
(uri (string-append "https://github.com/wryun/es-shell/releases/"
"download/v" version "/es-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/wryun/es-shell")
(commit (string-append "v" version))))
(sha256
(base32 "1pgmqhsk14wyvl489sxdy7kdl2gwrsq1xvkip0z90kh888mlh9n9"))
(file-name (string-append name "-" version ".tar.gz"))))
(base32 "11zykg28r018vl9n0sw82jwv3m2yk1r9d25y2mjrvpkxf0dj2va6"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
(list #:test-target "test"))
(list
#:test-target "test"))
(inputs
(list readline))
(native-inputs
(list bison))
(list autoconf-2.72 ;2.69 does not detect that some files are missing
automake
procps)) ;for tests
(synopsis "Extensible shell with higher-order functions")
(description
"Es is an extensible shell. The language was derived from the Plan 9
+54 -57
View File
@@ -50,7 +50,7 @@
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2021 David Wilson <david@daviwil.com>
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2021-2026 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
@@ -3573,38 +3573,21 @@ soon as it starts.")
(define-public libbluray
(package
(name "libbluray")
(version "1.3.4")
(version "1.4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.videolan.org/videolan/"
name "/" version "/"
name "-" version ".tar.bz2"))
name "-" version ".tar.xz"))
(sha256
(base32
"0aszpsz3pc7p7z6yahlib4na585m6pqbg2d9dkpyipgml1lgv3s7"))))
(build-system gnu-build-system)
"0jglp44wsjpp5k3mrxskfj9b488ksn7cj2dhxfjdqa3z150drdbn"))))
(build-system meson-build-system)
(arguments
(list
#:configure-flags #~(list "--disable-bdjava-jar" "--disable-static")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'move-packages-to-libs
;; Avoid the need to propagate libxml2 et al. by referring to them
;; directly.
(lambda* (#:key inputs #:allow-other-keys)
(define (search-input-vicinity lib)
(dirname
(search-input-file inputs
(string-append "lib/lib" lib ".so"))))
(substitute* "src/libbluray.pc.in"
(("@PACKAGES@") "")
(("^Libs.private:" field)
(string-append field
" -L" (search-input-vicinity "xml2")
" -L" (search-input-vicinity "freetype")
" -L" (search-input-vicinity "fontconfig")
" -lxml2 -lfreetype -lfontconfig")))))
(add-before 'build 'fix-dlopen-paths
(add-after 'unpack 'fix-dlopen-paths
(lambda* (#:key inputs #:allow-other-keys)
(define (lib/no.so library)
(let ((found (search-input-file inputs library)))
@@ -3612,11 +3595,29 @@ soon as it starts.")
(string-length ".so")))))
(substitute* "src/libbluray/disc/aacs.c"
(("\"libaacs\"")
(string-append "\"" (lib/no.so "lib/libaacs.so") "\""))
(string-append "\"" (lib/no.so "lib/libaacs.so") "\"")))
(substitute* "src/libbluray/disc/bdplus.c"
(("\"libbdplus\"")
(string-append "\"" (lib/no.so "lib/libbdplus.so") "\""))))))))
(string-append "\"" (lib/no.so "lib/libbdplus.so") "\"")))))
(add-after 'install 'move-packages-to-libs
;; Avoid the need to propagate libxml2 et al. by referring to them
;; directly.
(lambda* (#:key inputs #:allow-other-keys)
(define (search-input-vicinity lib)
(dirname
(search-input-file inputs
(string-append "lib/lib" lib ".so"))))
(substitute* (string-append #$output
"/lib/pkgconfig/libbluray.pc")
(("^Requires.private.*") "")
(("^Libs.private:" field)
(string-append field
" -L" (search-input-vicinity "xml2")
" -L" (search-input-vicinity "freetype")
" -L" (search-input-vicinity "fontconfig")
" -lxml2 -lfreetype -lfontconfig"))))))))
(native-inputs (list pkg-config))
(inputs (list fontconfig freetype libaacs libbdplus libxml2))
(inputs (list fontconfig freetype libaacs libbdplus libudfread libxml2))
(home-page "https://www.videolan.org/developers/libbluray.html")
(synopsis "Blu-Ray Disc playback library")
(description
@@ -3627,22 +3628,18 @@ players, like VLC or MPlayer.")
(define-public libdvdread
(package
(name "libdvdread")
(version "6.1.3")
(version "7.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.videolan.org/videolan/"
"libdvdread/" version "/"
"libdvdread-" version ".tar.bz2"))
"libdvdread-" version ".tar.xz"))
(sha256
(base32
"0sakl4c8y2kkp09km0b5353w66pvfc72y8wi1vjwn252jx4ladff"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-libdvdcss=yes")))
(native-inputs
(list pkg-config))
(propagated-inputs
(list libdvdcss))
"01ylalrr9lw6x7fz7z030243kln1hfd1pbh3m9ikjp610nih8gif"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
(propagated-inputs (list libdvdcss))
(home-page "http://dvdnav.mplayerhq.hu/")
(synopsis "Library for reading video DVDs")
(description
@@ -3706,16 +3703,16 @@ MPEG-2 stream containing VOB packets.")
(define-public libdvdnav
(package
(name "libdvdnav")
(version "6.1.1")
(version "7.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.videolan.org/videolan/"
"libdvdnav/" version "/"
"libdvdnav-" version ".tar.bz2"))
"libdvdnav-" version ".tar.xz"))
(sha256
(base32
"0j4ds6c4xl34dijkfpw805vj7s0vzg095kw0fvzj7ls7b53sg4f1"))))
(build-system gnu-build-system)
"07i2gdj4nfah4lwlc6hl14xjbyh6b12bc1lipxs3q4vdsdd8z8d2"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
(propagated-inputs (list libdvdread)) ;in 'Requires.private' of dvdnav.pc
(home-page "http://dvdnav.mplayerhq.hu/")
@@ -3736,16 +3733,16 @@ encapsulated.")
(define-public libdvdcss
(package
(name "libdvdcss")
(version "1.4.3")
(version "1.5.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.videolan.org/pub/"
name "/" version "/"
name "-" version ".tar.bz2"))
name "-" version ".tar.xz"))
(sha256
(base32
"0y800y33spblb20s1lsjbaiybknmwwmmiczmjqx5s760blpwjg13"))))
(build-system gnu-build-system)
"16f3lnwcldy0ssq2yah97qsb0b8scsvhsivfbhpgizmys7j6752j"))))
(build-system meson-build-system)
(home-page "https://www.videolan.org/developers/libdvdcss.html")
(synopsis "Library for accessing DVDs as block devices")
(description
@@ -5201,19 +5198,18 @@ specifications.")
(define-public libaacs
(package
(name "libaacs")
(version "0.11.0")
(version "0.11.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/"
version "/libaacs-" version ".tar.bz2"))
(sha256
(base32 "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"))))
(inputs
(list libgcrypt))
(native-inputs
(list bison flex))
(base32 "0f8ax9dp49mrm1484bl2df659b34xyrjmngzmvvpg2n9wkms12m8"))))
(inputs (list libgcrypt))
(native-inputs (list bison flex))
(build-system gnu-build-system)
(arguments (list #:configure-flags #~(list "--disable-static")))
(home-page "https://www.videolan.org/developers/libaacs.html")
(synopsis "Library for decrypting certain Blu-Ray discs")
(description "libaacs is a library which implements the Advanced Access
@@ -5983,12 +5979,13 @@ tools for styling them, including a built-in real-time video preview.")
gstreamer
gst-plugins-base
gst-plugins-good
;; TODO: Add the 'cvtracker' plugin after our gstreamer packages
;; has been upgraded to version 1.20.
(gst-plugins/selection gst-plugins-bad #:plugins
'("debugutils" "transcode")
#:configure-flags
#~'("-Dintrospection=enabled"))
(package
(inherit (gst-plugins/selection
gst-plugins-bad
#:plugins '("debugutils" "opencv" "transcode")
#:configure-flags
#~'("-Dintrospection=enabled")))
(inputs (modify-inputs inputs (prepend opencv))))
gst-libav
gsound
gtk+
@@ -6001,7 +5998,7 @@ tools for styling them, including a built-in real-time video preview.")
python-numpy
python-matplotlib
python-pycairo
python-pygobject))
python-pygobject-3.50)) ; bump along with libpeas
;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
;; otherwise pitivi fails to launch.
(propagated-inputs (list (librsvg-for-system)))
+21 -18
View File
@@ -551,27 +551,30 @@ similar to CoqIDE or ProofGeneral.")
(append python-minimal)))))
(define-public vim-fugitive
(package
(name "vim-fugitive")
(version "3.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(let ((commit "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0")
(revision "1"))
(package
(name "vim-fugitive")
(version (git-version "3.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tpope/vim-fugitive")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "138290g2aph1jjhaza6biky5qi4ka6435s01bwxivllgb53g3irc"))))
(build-system vim-build-system)
(arguments
(list #:plugin-name "fugitive"))
(home-page "https://github.com/tpope/vim-fugitive")
(synopsis "Vim plugin to work with Git")
(description "Vim-fugitive is a wrapper for Vim that complements the
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "12254b827ps68naihdhzdhvcr0v0ksdxwks2yvq63vwwr85xpbqq"))))
(build-system vim-build-system)
(arguments
(list #:plugin-name "fugitive"))
(home-page "https://github.com/tpope/vim-fugitive")
(synopsis "Vim plugin to work with Git")
(description
"Vim-fugitive is a wrapper for Vim that complements the
command window, where you can stage and review your changes before the next
commit or run any Git arbitrary command.")
(license license:vim))) ; distributed under the same license as vim
(license license:vim)))) ; distributed under the same license as vim
(define-public vim-airline
(package
+17
View File
@@ -1672,6 +1672,23 @@ client/daemon pair that lets you open any number of terminal windows from
within a single process.")
(license license:gpl3+)))
(define-public rxvt-unicode-terminfo
(package
(name "rxvt-unicode-terminfo")
(version (package-version rxvt-unicode))
(source rxvt-unicode)
(build-system copy-build-system)
(arguments (list #:install-plan #~'(("share/terminfo" "share/terminfo"))))
(native-search-paths
(list (search-path-specification
(variable "TERMINFO_DIRS")
(files '("share/terminfo")))))
(home-page (package-home-page rxvt-unicode))
(synopsis "Terminfo for rxvt-unicode")
(description "This package provides terminfo files for the
@command{rxvt-unicode} terminal.")
(license (package-license rxvt-unicode))))
(define-public xcape
(package
(name "xcape")
+1 -1
View File
@@ -116,7 +116,7 @@ knowledge of the Z-Wave protocol.")
(lambda _
(substitute* "binding.gyp"
(("std=c\\+\\+11")
"std=c++20"))))
"std=c++17"))))
(replace 'build
;; For some reason, `npm install` doesn't build
;; the addon automatically, so we do it explicitly here.
+1 -1
View File
@@ -54,7 +54,7 @@
;; Lookup specification (info "(libc) Actions in the NSS Configuration").
(define-enumeration lookup-action
(return continue)
(return continue merge)
make-lookup-action)
(define-enumeration lookup-status
+7 -13
View File
@@ -30,16 +30,10 @@
#:use-module (guix search-paths)
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
#:export (%default-lockfiles
%node-build-system-modules
#:export (%node-build-system-modules
node-build
node-build-system))
(define %default-lockfiles
(list "package-lock.json"
"yarn.lock"
"npm-shrinkwrap.json"))
(define %node-build-system-modules
;; Build-side modules imported by default.
`((guix build node-build-system)
@@ -53,10 +47,6 @@
"Return the default Node package, resolved lazily."
(@* (gnu packages node) node-lts))
(define (default-guile-json)
"Return the default guile-json package, resolved lazily."
(@* (gnu packages guile) guile-json-4))
(define* (lower name
#:key source inputs native-inputs outputs system target
(node (default-node))
@@ -88,12 +78,17 @@
(build node-build)
(arguments (strip-keyword-arguments private-keywords arguments)))))
(define (default-guile-json)
"Return the default guile-json package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((mod (resolve-interface '(gnu packages guile))))
(module-ref mod 'guile-json-4)))
(define* (node-build name inputs
#:key
source
(npm-flags ''())
(test-target "test")
(lockfiles %default-lockfiles)
(tests? #t)
(phases '%standard-phases)
(outputs '("out"))
@@ -115,7 +110,6 @@
#:system #$system
#:npm-flags #$npm-flags
#:test-target #$test-target
#:lockfiles '#$lockfiles
#:tests? #$tests?
#:phases #$phases
#:outputs #$(outputs->gexp outputs)
-4
View File
@@ -105,7 +105,6 @@
source
(phases '%standard-phases)
(grammar-directories '("."))
(lockfiles %default-lockfiles)
(tests? #t)
(outputs '("out" "js"))
(search-paths '())
@@ -124,7 +123,6 @@
#:source #+source
#:system #$system
#:phases #$phases
#:lockfiles '#$lockfiles
#:tests? #$tests?
#:grammar-directories '#$grammar-directories
#:outputs #$(outputs->gexp outputs)
@@ -147,7 +145,6 @@
guile source
(phases '%standard-phases)
(grammar-directories '("."))
(lockfiles %default-lockfiles)
(tests? #t)
(outputs '("out" "js"))
(search-paths '())
@@ -182,7 +179,6 @@
#:build #$build
#:target #$target
#:phases #$phases
#:lockfiles '#$lockfiles
#:tests? #$tests?
#:grammar-directories '#$grammar-directories
#:outputs #$(outputs->gexp outputs)
+116 -78
View File
@@ -5,7 +5,6 @@
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2024 Daniel Khodabakhsh <d.khodabakhsh@gmail.com>
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,7 +29,6 @@
#:use-module (ice-9 match)
#:use-module (json)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-71)
#:export (%standard-phases
delete-dependencies
@@ -42,6 +40,34 @@
replace-fields
with-atomic-json-file-replacement))
(define* (assoc-ref* alist key #:optional default)
"Like assoc-ref, but return DEFAULT instead of #f if no value exists."
(match (assoc key alist)
(#f default)
((_ . value) value)))
(define* (alist-pop alist key #:optional (= equal?))
"Return two values, the first pair in ALIST with key KEY, and the other
elements. Equality calls are made as (= KEY ALISTCAR)."
(define (found? pair)
(= key (car pair)))
(let ((before after (break found? alist)))
(if (pair? after)
(values (car after) (append before (cdr after)))
(values #f before))))
(define* (alist-update alist key proc #:optional (= equal?))
"Return an association list like ALIST, but with KEY mapped to the result of
PROC applied to the first value found under the comparison (= KEY ALISTCAR).
If no such value exists, return the list unchanged.
Unlike acons, this removes the previous association of KEY (assuming it is
unique), but the result may still share storage with ALIST."
(let ((pair rest (alist-pop alist key =)))
(if (pair? pair)
(acons key (proc (cdr pair)) rest)
alist)))
;;;
;;; package.json modification procedures
;;;
@@ -80,19 +106,23 @@ listed in 'dependencies-to-remove', a list of strings naming npm packages.
To prevent the deleted dependencies from being reintroduced, use this function
only after the 'patch-dependencies' phase."
(let ((predicate (lambda (dependency)
(member (car dependency) dependencies-to-remove)))
(dependency? (cut member <> (list "devDependencies"
"dependencies"
"peerDependencies"
"optionalDependencies"))))
(lambda (pkg-meta)
(map (match-lambda
(((? dependency? key) . dependencies)
(cons key (remove predicate dependencies)))
(otherwise
otherwise))
pkg-meta))))
(lambda (pkg-meta)
(fold
(lambda (dependency-key pkg-meta)
(alist-update
pkg-meta
dependency-key
(lambda (dependencies)
(remove
(lambda (dependency)
(member (car dependency) dependencies-to-remove))
dependencies))))
pkg-meta
(list
"devDependencies"
"dependencies"
"peerDependencies"
"optionalDependencies"))))
(define* (modify-json-fields
fields
@@ -206,7 +236,8 @@ only after the 'patch-dependencies' phase."
(begin
(mkdir dir)
(setenv "HOME" (string-append (getcwd) "/" dir))
(format #t "set HOME to ~s~%" (getenv "HOME"))))))))
(format #t "set HOME to ~s~%" (getenv "HOME")))))))
#t)
(define (module-name module)
(let* ((package.json (string-append module "/package.json"))
@@ -226,65 +257,67 @@ only after the 'patch-dependencies' phase."
(for-each (lambda (dir)
(let ((nm (string-append dir "/lib/node_modules")))
(for-each (lambda (module)
(hash-set! index (module-name module)
(string-append "file://" module)))
(hash-set! index (module-name module) module))
(list-modules nm))))
input-paths)
index))
(define* (patch-dependencies #:key inputs #:allow-other-keys)
"Replace versions by paths when found among INPUTS in `package.json'."
(define resolve-dependencies
(let ((index (index-modules (map cdr inputs))))
(cut map
(match-lambda
((dependency . version)
(cons dependency (hash-ref index dependency version))))
<>)))
(define index (index-modules (map cdr inputs)))
(define (resolve key getter)
(define (resolve-dependencies dependencies)
(map
(match-lambda
((dependency . version)
(cons dependency (hash-ref index dependency version))))
dependencies))
(with-atomic-json-file-replacement
(lambda (pkg-meta)
(assoc-set! pkg-meta key
(resolve-dependencies (getter pkg-meta)))))
(fold
(lambda (proc pkg-meta) (proc pkg-meta))
pkg-meta
(list
(lambda (pkg-meta)
(alist-update pkg-meta "devDependencies" resolve-dependencies))
(lambda (pkg-meta)
(assoc-set!
pkg-meta
"dependencies"
(resolve-dependencies
; Combined "peerDependencies" and "dependencies" dependencies
; with "dependencies" taking precedent.
(fold
(lambda (dependency dependencies)
(assoc-set! dependencies (car dependency) (cdr dependency)))
(assoc-ref* pkg-meta "peerDependencies" '())
(assoc-ref* pkg-meta "dependencies" '())))))))))
#t)
(modify-json
(resolve "devDependencies"
(lambda (pkg-meta)
(or (assoc-ref pkg-meta "devDependencies") '())))
(resolve "dependencies"
;; Combined "peerDependencies" and "dependencies" dependencies
;; with "dependencies" taking precedent.
(lambda (pkg-meta)
(fold
(lambda (dependency dependencies)
(assoc-set! dependencies
(car dependency) (cdr dependency)))
(or (assoc-ref pkg-meta "peerDependencies") '())
(or (assoc-ref pkg-meta "dependencies") '()))))))
(define* (delete-lockfiles #:key lockfiles #:allow-other-keys)
"Delete LOCKFILES if they exist."
(define* (delete-lockfiles #:key inputs #:allow-other-keys)
"Delete 'package-lock.json', 'yarn.lock', and 'npm-shrinkwrap.json', if they
exist."
(for-each (lambda (pth)
(when (file-exists? pth)
(delete-file pth)))
lockfiles))
'("package-lock.json"
"yarn.lock"
"npm-shrinkwrap.json"))
#t)
(define* (configure #:key inputs #:allow-other-keys)
(define* (configure #:key outputs inputs #:allow-other-keys)
(let ((npm (string-append (assoc-ref inputs "node") "/bin/npm")))
(invoke npm "--offline"
"--ignore-scripts"
"--install-links"
"--no-audit"
"install")))
(invoke npm "--offline" "--ignore-scripts" "--install-links" "install")
#t))
(define* (build #:key inputs #:allow-other-keys)
(let* ((package-meta (call-with-input-file "package.json" json->scm))
(scripts (assoc-ref package-meta "scripts")))
(if (and scripts (assoc-ref scripts "build"))
(let ((package-meta (call-with-input-file "package.json" json->scm)))
(if (assoc-ref* (assoc-ref* package-meta "scripts" '()) "build" #f)
(let ((npm (string-append (assoc-ref inputs "node") "/bin/npm")))
(invoke npm "run" "build"))
(format #t "there is no build script to run~%"))))
(format #t "there is no build script to run~%"))
#t))
(define* (check #:key tests? inputs test-target #:allow-other-keys)
"Run 'npm run TEST-TARGET' if TESTS?"
@@ -301,7 +334,8 @@ only after the 'patch-dependencies' phase."
"--owner=0"
"--group=0"
"--numeric-owner"
"-czf" "../package.tgz" "."))
"-czf" "../package.tgz" ".")
#t)
(define* (install #:key outputs inputs #:allow-other-keys)
"Install the node module to the output store item."
@@ -313,7 +347,8 @@ only after the 'patch-dependencies' phase."
"--loglevel" "info"
"--production"
"--install-links"
"install" "../package.tgz")))
"install" "../package.tgz")
#t))
(define* (avoid-node-gyp-rebuild #:key outputs #:allow-other-keys)
"Adjust the installed 'package.json' to remove an 'install' script that
@@ -341,25 +376,28 @@ would try to run 'node-gyp rebuild'."
;; For further details, see:
;; - https://docs.npmjs.com/cli/v8/configuring-npm/package-json#default-values
;; - https://docs.npmjs.com/cli/v8/using-npm/scripts#best-practices
(let* ((installed-package.json
(search-input-file outputs (string-append "/lib/node_modules/"
(module-name ".")
"/package.json")))
;; We don't want to use an atomic replacement here, because we often
;; don't even need to overwrite this file. Therefore, let's use some
;; helpers that we'd otherwise not need.
(pkg-meta (call-with-input-file installed-package.json json->scm))
(scripts (or (assoc-ref pkg-meta "scripts") '())))
(when (equal? "node-gyp rebuild" (assoc-ref scripts "install"))
(call-with-output-file installed-package.json
(lambda (out)
(scm->json
(assoc-set! pkg-meta
"scripts"
(assoc-set! scripts
"install"
"echo Guix: avoiding node-gyp rebuild"))
out))))))
(define installed-package.json
(search-input-file outputs (string-append "/lib/node_modules/"
(module-name ".")
"/package.json")))
;; We don't want to use an atomic replacement here, because we often don't
;; even need to overwrite this file. Therefore, let's use some helpers
;; that we'd otherwise not need.
(define pkg-meta
(call-with-input-file installed-package.json json->scm))
(define scripts
(assoc-ref* pkg-meta "scripts" '()))
(when (equal? "node-gyp rebuild" (assoc-ref* scripts "install" #f))
(call-with-output-file installed-package.json
(lambda (out)
(scm->json
(assoc-set! pkg-meta
"scripts"
(assoc-set! scripts
"install"
"echo Guix: avoiding node-gyp rebuild"))
out)))))
(define %standard-phases
(modify-phases gnu:%standard-phases