1
0
forked from tribes/guix

Compare commits

..

25 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
135 changed files with 2429 additions and 5936 deletions
-1
View File
@@ -141,7 +141,6 @@
(eval . (put 'substitute* 'scheme-indent-function 1))
(eval . (put 'match-record 'scheme-indent-function 3))
(eval . (put 'match-record-lambda 'scheme-indent-function 2))
(eval . (put 'with-fluids 'scheme-indent-function 2))
;; TODO: Contribute these to Emacs' scheme-mode.
(eval . (put 'let-keywords 'scheme-indent-function 3))
-6
View File
@@ -13,7 +13,6 @@ gnu/packages/fluidplug\.scm @guix/audio
gnu/packages/music\.scm @guix/audio
gnu/packages/xiph\.scm @guix/audio
gnu/packages/beam-.+\.scm$ @guix/beam
gnu/packages/elixir(-.+|)\.scm$ @guix/beam
guix/build/mix-build-system\.scm @guix/beam
guix/build-system/mix\.scm @guix/beam
@@ -21,12 +20,7 @@ gnu/packages/erlang(-.+|)\.scm$ @guix/beam
guix/build/rebar-build-system\.scm @guix/beam
guix/build-system/rebar\.scm @guix/beam
guix/import/hexpm\.scm @guix/beam
guix/import/mix\.scm @guix/beam
guix/import/mix/mix-lock\.scm @guix/beam
guix/scripts/import/hexpm\.scm @guix/beam
guix/scripts/import/mix\.scm @guix/beam
tests/import/hexpm\.scm @guix/beam
tests/import/mix\.scm @guix/beam
gnu/packages/bioinformatics\.scm @guix/bioinformatics
+11 -16
View File
@@ -22,7 +22,6 @@
# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
# Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
# Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
# Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
#
# This file is part of GNU Guix.
#
@@ -321,8 +320,6 @@ MODULES = \
guix/import/launchpad.scm \
guix/import/luanti.scm \
guix/import/minetest.scm \
guix/import/mix.scm \
guix/import/mix/mix-lock.scm \
guix/import/nuget.scm \
guix/import/npm-binary.scm \
guix/import/opam.scm \
@@ -380,7 +377,6 @@ MODULES = \
guix/scripts/import/json.scm \
guix/scripts/import/luanti.scm \
guix/scripts/import/minetest.scm \
guix/scripts/import/mix.scm \
guix/scripts/import/npm-binary.scm \
guix/scripts/import/nuget.scm \
guix/scripts/import/opam.scm \
@@ -581,7 +577,6 @@ SCM_TESTS = \
tests/import/hackage.scm \
tests/import/hexpm.scm \
tests/import/luanti.scm \
tests/import/mix.scm \
tests/import/npm-binary.scm \
tests/import/nuget.scm \
tests/import/opam.scm \
@@ -807,17 +802,17 @@ EXTRA_DIST += \
etc/manifests/upgrade.scm \
scripts/guix.in \
tests/cve-sample.json \
tests/keys/openpgp/civodul.pub \
tests/keys/openpgp/dsa.pub \
tests/keys/openpgp/ed25519-2.pub \
tests/keys/openpgp/ed25519-2.sec \
tests/keys/openpgp/ed25519-3.pub \
tests/keys/openpgp/ed25519-3.sec \
tests/keys/openpgp/ed25519.pub \
tests/keys/openpgp/ed25519.sec \
tests/keys/openpgp/rsa.pub \
tests/keys/openpgp/signing-key.pub \
tests/keys/openpgp/signing-key.sec \
tests/keys/civodul.pub \
tests/keys/dsa.pub \
tests/keys/ed25519-2.pub \
tests/keys/ed25519-2.sec \
tests/keys/ed25519-3.pub \
tests/keys/ed25519-3.sec \
tests/keys/ed25519.pub \
tests/keys/ed25519.sec \
tests/keys/rsa.pub \
tests/keys/signing-key.pub \
tests/keys/signing-key.sec \
tests/test.drv \
$(TESTS)
+2 -2
View File
@@ -73,8 +73,8 @@ then
# Copy the keys so that the secret key has the right permissions (the
# daemon errors out when this is not the case.)
mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
cp "@abs_top_srcdir@/tests/keys/openpgp/signing-key.sec" \
"@abs_top_srcdir@/tests/keys/openpgp/signing-key.pub" \
cp "@abs_top_srcdir@/tests/keys/signing-key.sec" \
"@abs_top_srcdir@/tests/keys/signing-key.pub" \
"$GUIX_CONFIGURATION_DIRECTORY"
chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
fi
-105
View File
@@ -29,7 +29,6 @@ Copyright @copyright{} 2025 45mg@*
Copyright @copyright{} 2023 Marek Felšöci@*
Copyright @copyright{} 2023 Konrad Hinsen@*
Copyright @copyright{} 2023 Philippe Swartvagher@*
Copyright @copyright{} 2026 Igorj Gorjaĉev@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -141,7 +140,6 @@ Programmable and automated package definition
Packaging Workflows
* Packaging Rust Crates::
* Packaging Elixir Applications::
Packaging Rust Crates
@@ -1634,7 +1632,6 @@ systems, serving as extensions to the concise packaging guidelines
@menu
* Packaging Rust Crates::
* Packaging Elixir Applications::
@end menu
@node Packaging Rust Crates
@@ -1990,108 +1987,6 @@ method, one of the most popular choices for Traditional Chinese users.")
(license license:lgpl2.1+)))
@end lisp
@node Packaging Elixir Applications
@subsection Packaging Elixir Applications
In preparation, add the following packages to your environment:
@example
$ guix shell elixir elixir-depscheck elixir-mix-audit
@end example
In this example, we package @uref{https://livebook.dev, livebook},
which is an interactive, web-based notebook environment for writing,
running, and sharing Elixir code with rich documentation and
visualizations.
@enumerate
@item
We retrieve the @code{livebook} source code with the latest version
from the corresponding @code{git} repository:
@example
$ git clone --branch v0.18.2 --depth 1 \
https://github.com/livebook-dev/livebook
@end example
We should prepare the following definiton for this package (the suggested
location for this definition should be @code{gnu/packages/beam-packages.scm}
or up to your mind):
@lisp
(define-public livebook
(package
(name "livebook")
(version "0.18.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/livebook-dev/livebook")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1pq227nabslr7gh4qvg24wj4320djc0vrh6x6l23g3468x6znxjm"))))
(build-system mix-build-system)
(arguments
(list
#:tests? #f ; TODO: make them work a little bit later
#:vendorize? #t
#:phases
#~(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(copy-recursively "_build/prod/rel/livebook/"
out)))))))
(inputs (mix-inputs 'livebook))
(synopsis "Web application for writing code notebooks")
(description "This package provides @code{Livebook}, a web application
for writing interactive and collaborative code notebooks.")
(home-page "https://livebook.dev/")
(license license:asl2.0)))
@end lisp
The identifier used to invoke @code{mix-inputs}, in this case the scheme
symbol @code{'livebook}, must be unique, usually matching the variable name
of the package.
@item
Navigate to the unpacked directory, then run the following commands:
@example
$ mix deps.get
$ mix deps.audit
$ mix depscheck --verbose
@end example
@command{mix deps.audit} checks known vulnerabilities and @command{mix
depscheck --verbose} checks licenses, for all the dependencies. We must
have an acceptable output (i.e. message ``No vulnerabilities found.'') of
@command{mix deps.audit} and ensure all dependencies are licensed with our
supported licenses (@pxref{Defining Packages,,, guix, GNU Guix Reference Manual}).
@item
Import dependencies from the lockfile:
@example
$ guix import --insert=gnu/packages/beam-packages.scm \
mix --lockfile=/path/to/mix.lock livebook
# or:
$ guix import -i gnu/packages/beam-packages.scm \
mix -f /path/to/mix.lock livebook
@end example
After that the package could be build by using the following command:
@example
$ guix build livebook
@end example
@end enumerate
@c *********************************************************************
@node System Configuration
+35 -72
View File
@@ -151,7 +151,6 @@ Copyright @copyright{} 2025 Noé Lopez@*
Copyright @copyright{} 2026 David Elsing@*
Copyright @copyright{} 2026 Nguyễn Gia Phong@*
Copyright @copyright{} 2026 Yarl Baudig@*
Copyright @copyright{} 2026 Igorj Gorjaĉev@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -15389,31 +15388,6 @@ Additional options include:
Traverse the dependency graph of the given upstream package recursively
and generate package expressions for all those packages that are not yet
in Guix.
@item --mix-inputs
@itemx -m
Use vendored @code{mix-inputs} for @code{input} field instead of common
dependencies.
@end table
@item mix
@cindex mix
Import metadata from the @file{mix.lock}, Elixir's
@uref{https://hexdocs.pm/elixir/introduction-to-mix.html, mix} lock file,
as in this example:
@example
guix import mix -f mix.lock yourapp
@end example
Mandatory options are:
@table @code
@item --lockfile=@var{file}
@itemx -f @var{file}
@option{--lockfile} must be a @file{mix.lock} file.
@xref{Packaging Elixir Applications,,, guix-cookbook, GNU Guix Cookbook}, for
packaging workflow utilizing it.
@end table
@end table
@@ -19174,10 +19148,6 @@ swap file is encrypted because the entire device is encrypted.
@xref{Swap Space}, or @xref{Preparing for Installation,,Disk
Partitioning}, for an example.
When using GRUB as the bootloader, the LUKS password is only requested
once: GRUB passes the master key to the initial RAM disk automatically.
@xref{Bootloader Configuration, Automatic LUKS Master Key Passing}, for
details.
@end defvar
@@ -48898,56 +48868,49 @@ This option in enabled by default. In some cases involving the
in RAM, it can be handy to disable the option by setting it to
@code{#f}.
@subsubheading Automatic LUKS Master Key Passing
When booting from a LUKS-encrypted device using GRUB, the password is
normally requested twice: once by GRUB to access @file{/boot}, and a
second time by the initial RAM disk to mount the root file system.
When GRUB's @code{cryptomount} command unlocks a LUKS device, GRUB
retains the volume's master key in memory. The @code{cryptodisk}
module exposes these master keys via a GRUB-internal virtual file
system called @dfn{procfs}, accessible as @code{(proc)/luks_script}.
Each line of this virtual file has the form:
@example
luks_mount @var{uuid} @var{offset} @var{sector-size} @var{cipher-mode-iv} @var{hex-master-key}
@end example
@noindent
(or @code{luks2_mount} for LUKS2 volumes).
When the store resides on an encrypted device, the generated GRUB
configuration automatically injects this virtual file into the initial
RAM disk using GRUB's @code{newc:} initrd prefix---a documented
mechanism for synthesizing a CPIO archive on the fly
(@pxref{GNU/Linux,,, grub, GNU GRUB manual}). The resulting initrd
line is equivalent to:
@example
initrd newc:etc/luks_script:(proc)/luks_script @dots{} /boot/initrd
@end example
@noindent
The initial RAM disk then reads @file{/etc/luks_script}, looks up the
matching UUID, and calls @command{cryptsetup open --volume-key-file} to
unlock the device without prompting for a password a second time. If
the master key is missing or does not match, the system falls back to
an interactive password prompt, so this mechanism is transparent to the
user.
No configuration is required: GRUB's @code{procfs} and @code{luks}
modules are loaded automatically when encrypted devices are declared
via @code{luks-device-mapping} (@pxref{Mapped Devices}).
@item @code{extra-initrd} (default: @code{#f})
File name of an additional initrd to load during the boot. It may or
may not point to a file in the store, but the main use case is for
out-of-store files containing secrets.
In order to be able to provide decryption keys for LUKS devices, they
need to be available in the initial RAM disk. However they cannot be
stored inside the usual initrd, since it is stored in the store and
being world-readable (as files in the store are) is not a desired
property for an initrd containing decryption keys. You can therefore
use this field to instruct GRUB to also load a manually created initrd
not stored in the store.
For any use case not involving secrets, you should use regular initrd
(@pxref{operating-system Reference, @code{initrd}}) instead.
Suitable image can be created for example like this:
@example
echo /key-file.bin | cpio -oH newc >/key-file.cpio
chmod 0000 /key-file.cpio
@end example
After it is created, you can use it in this manner:
@lisp
;; Operating system with encrypted boot partition
(operating-system
@dots{}
(bootloader (bootloader-configuration
(bootloader grub-efi-bootloader)
(targets '("/boot/efi"))
;; Load the initrd with a key file...
(extra-initrd "/key-file.cpio")))
(mapped-devices
(list (mapped-device
(source (uuid "12345678-1234-1234-1234-123456789abc"))
(target "my-root")
(type luks-device-mapping)
;; ... and use it to unlock the root device.
(arguments '(#:key-file "/key-file.bin"))))))
@end lisp
Be careful when using this option, since pointing to a file that is not
readable by the grub while booting will cause the boot to fail and
require a manual edit of the initrd line in the grub menu.
+3 -9
View File
@@ -482,21 +482,15 @@ already exists. Lookup team IDs among CURRENT-TEAMS."
#:name "Erlang/Elixir/BEAM team"
#:description "The virtual machine at the core of the Erlang Open
Telecom Platform (OTP), Erlang and Elxir languages and packages, development
of Rebar and Mix build systems, Hex.pm and Mix importers."
#:scope (list (make-regexp* "^gnu/packages/beam-.+\\.scm$")
(make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
of Rebar and Mix build systems and Hex.pm importer."
#:scope (list (make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
"guix/build/mix-build-system.scm"
"guix/build-system/mix.scm"
(make-regexp* "^gnu/packages/erlang(-.+|)\\.scm$")
"guix/build/rebar-build-system.scm"
"guix/build-system/rebar.scm"
"guix/import/hexpm.scm"
"guix/import/mix.scm"
"guix/import/mix/mix-lock.scm"
"guix/scripts/import/hexpm.scm"
"guix/scripts/import/mix.scm"
"tests/import/hexpm.scm"
"tests/import/mix.scm")))
"guix/scripts/import/hexpm.scm")))
(define-team bioinformatics
(team 'bioinformatics
-44
View File
@@ -1,44 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2026 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
;; This manifest lists all MPI-related packages: useful for 'guix refresh',
;; 'guix build', etc.
(use-modules (guix)
(gnu packages fabric-management)
(gnu packages linux)
(gnu packages mpi)
(gnu packages parallel))
;; The packages below are what constitutes the MPI stack: helper libraries,
;; interconnect drivers, and MPI implementations.
(packages->manifest
(list cassini-headers
cxi-driver
hwloc
libcxi
libfabric
mpich
openmpi-5
openpmix
opensm
prrte
psm
psm2
rdma-core
ucx))
+3 -12
View File
@@ -404,10 +404,7 @@ when booting a root file system on a Btrfs subvolume."
(initrd (normalize-file (menu-entry-initrd entry)
device-mount-point
store-directory-prefix))
(extra-initrd (bootloader-configuration-extra-initrd config))
(luks-script-initrd
(and (pair? store-crypto-devices)
"newc:etc/luks_script:(proc)/luks_script")))
(extra-initrd (bootloader-configuration-extra-initrd config)))
;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point.
;; Use the right file names for LINUX and INITRD in case
;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a
@@ -415,20 +412,14 @@ when booting a root file system on a Btrfs subvolume."
;; When STORE-DIRECTORY-PREFIX is defined, prepend it the linux and
;; initrd paths, to allow booting from a Btrfs subvolume.
;; When the store is on an encrypted device, inject GRUB's
;; (proc)/luks_script into the initrd as /etc/luks_script so the
;; initrd can use the already-decrypted master key to open LUKS
;; volumes without prompting for the password a second time.
#~(format port "menuentry ~s {
~a
linux ~a ~a
initrd ~a ~a ~a
initrd ~a ~a
}~%"
#$label
#$(grub-root-search device linux)
#$linux (string-join (list #$@arguments))
(or #$luks-script-initrd "")
(or #$extra-initrd "")
#$initrd)))
(multiboot-kernel
@@ -473,7 +464,7 @@ menuentry ~s {
;; Other type of devices aren't implemented.
#~()))
(let ((devices (map crypto-device->cryptomount store-crypto-devices))
(modules #~(format port "insmod procfs~%insmod luks~%insmod luks2~%")))
(modules #~(format port "insmod luks~%insmod luks2~%")))
(if (null? devices)
devices
(cons modules devices))))
+9 -8
View File
@@ -75,7 +75,6 @@
# Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
# Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
# Copyright © 2025 bdunahu <bdunahu@operationnull.com>
# Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
#
# This file is part of GNU Guix.
#
@@ -176,9 +175,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/bash.scm \
%D%/packages/batik.scm \
%D%/packages/bdw-gc.scm \
%D%/packages/beam-apps.scm \
%D%/packages/beam-packages.scm \
%D%/packages/beam-sources.scm \
%D%/packages/benchmark.scm \
%D%/packages/bioconductor.scm \
%D%/packages/bioinformatics.scm \
@@ -427,7 +423,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/kde-utils.scm \
%D%/packages/kerberos.scm \
%D%/packages/kodi.scm \
%D%/packages/kubernetes.scm \
%D%/packages/language.scm \
%D%/packages/lc0.scm \
%D%/packages/lean.scm \
@@ -1174,7 +1169,6 @@ dist_patch_DATA = \
%D%/packages/patches/curlftpfs-fix-memory-leak.patch \
%D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvc5-reproducible-build.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-fix-time-h.patch \
%D%/packages/patches/d-feet-drop-unused-meson-argument.patch \
@@ -1232,7 +1226,6 @@ dist_patch_DATA = \
%D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch \
%D%/packages/patches/elixir-path-length.patch \
%D%/packages/patches/elixir-vendoring-support.patch \
%D%/packages/patches/elm-ghc9.2.patch \
%D%/packages/patches/exaile-gstreamer-1.28.patch \
%D%/packages/patches/python-treelib-remove-python2-compat.patch \
@@ -1585,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 \
@@ -1657,6 +1652,7 @@ dist_patch_DATA = \
%D%/packages/patches/inkscape-libxml2.patch \
%D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/inetutils-hurd64.patch \
%D%/packages/patches/insight-toolkit-fix-build.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \
@@ -1688,6 +1684,7 @@ dist_patch_DATA = \
%D%/packages/patches/jfsutils-gcc-compat.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
%D%/packages/patches/john-the-ripper-jumbo-with-gcc-11.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/jsonnet-include-cstdint-for-gcc-13-builds.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
@@ -1813,6 +1810,7 @@ dist_patch_DATA = \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
%D%/packages/patches/libsepol-versioned-docbook.patch \
%D%/packages/patches/libskk-fix-invalid-escape.patch \
%D%/packages/patches/libsoup-auth-digest-fix-crash.patch \
%D%/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch \
%D%/packages/patches/libsoup-fix-merge-of-ranges.patch \
@@ -2339,6 +2337,7 @@ dist_patch_DATA = \
%D%/packages/patches/rapidcheck-fix-libs.patch \
%D%/packages/patches/ratpoison-shell.patch \
%D%/packages/patches/retroarch-unbundle-spirv-cross.patch \
%D%/packages/patches/rct-add-missing-headers.patch \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/renpy-python-3.11-compat.patch \
%D%/packages/patches/renpy-fix-integer-slots.patch \
@@ -2348,6 +2347,7 @@ dist_patch_DATA = \
%D%/packages/patches/r-sapa-lapack.patch \
%D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
%D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \
%D%/packages/patches/racket-launcher-config-dir.patch \
@@ -2380,6 +2380,7 @@ dist_patch_DATA = \
%D%/packages/patches/ruby-flores-fix-deprecations.patch \
%D%/packages/patches/ruby-latex-decode-fix-test.patch \
%D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
%D%/packages/patches/ruby-pg-fix-connect-timeout.patch \
%D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \
%D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \
%D%/packages/patches/rust-1.70-fix-rustix-build.patch \
+30 -23
View File
@@ -1302,14 +1302,14 @@ re-executing them as necessary.")
(define-public inetutils
(package
(name "inetutils")
(version "2.7")
(version "2.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/inetutils/inetutils-"
version ".tar.gz"))
(sha256
(base32
"11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))))
"0q1257ci22g2jbdiqs00mharc1lqkbibdlkhj23f3si6qjxkn17s"))))
(build-system gnu-build-system)
(arguments
(list
@@ -1340,7 +1340,17 @@ re-executing them as necessary.")
"\\\""))
;; On some systems, 'libls.sh' may fail with an error such as:
;; "Failed to tell switch -a apart from -A".
#:parallel-tests? #f))
#:parallel-tests? #f
#:phases (if (target-hurd64?)
#~(modify-phases %standard-phases
(add-after 'unpack 'apply-hurd64-patch
(lambda _
(let ((patch
#$(local-file
(search-patch
"inetutils-hurd64.patch"))))
(invoke "patch" "--force" "-p1" "-i" patch)))))
#~%standard-phases)))
(inputs
(list coreutils
shadow ;for login (used in telnetd and rlogind)
@@ -1363,7 +1373,7 @@ hostname.")
(define-public shadow
(package
(name "shadow")
(version "4.19.0")
(version "4.13")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1371,7 +1381,7 @@ hostname.")
"download/" version "/shadow-" version ".tar.xz"))
(sha256
(base32
"0crbcfdp7ayyii33srinwd0yr27dkx9mbzglx1d0mvhr1z28xclw"))))
"0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))
(build-system gnu-build-system)
(arguments
`(;; Assume System V `setpgrp (void)', which is the default on GNU
@@ -1380,9 +1390,7 @@ hostname.")
'(,@(if (target-hurd?)
'()
'("--with-libpam"))
"--disable-logind" ;; no systemd
"--without-libbsd" ;; no libbsd
"shadow_cv_logdir=/var/log"
"shadow_cv_logdir=/var/log"
"ac_cv_func_setpgrp_void=yes")
#:phases
(modify-phases %standard-phases
@@ -1418,8 +1426,15 @@ hostname.")
;; The top-level Makefile.am wrongfully has "SUBDIRS += man"
;; under "if ENABLE_REGENERATE_MAN", even though prebuilt man
;; pages are available. Thus, install them manually.
(invoke "make" "-C" "man" "install"))))))
(native-inputs (list pkg-config))
(invoke "make" "-C" "man" "install")))
(add-after 'install-man-pages 'remove-groups
(lambda* (#:key outputs #:allow-other-keys)
;; Remove `groups', which is already provided by Coreutils.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man (string-append out "/share/man")))
(delete-file (string-append bin "/groups"))
(for-each delete-file (find-files man "^groups\\."))))))))
(inputs
(append (if (target-hurd?)
'()
@@ -3141,7 +3156,7 @@ track changes in important system configuration files.")
(define-public libcap-ng
(package
(name "libcap-ng")
(version "0.9.3")
(version "0.9")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3150,20 +3165,12 @@ track changes in important system configuration files.")
(file-name (git-file-name name version))
(sha256
(base32
"13iy7dddcslpmmdhybgvfcgznsvpaa4r3fp9ldlpkq592lw8yyva"))))
"0izrrh2kmhi6dcy5iqcccmx90nwlaqcglhc60sl8n5ds8il14pi8"))))
(build-system gnu-build-system)
(arguments
(list
#:configure-flags
#~(list "--disable-static"
"--without-python")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-configure-ac
(lambda _
(substitute* "configure.ac"
(("linux/sock_diag.h" all)
(string-append all " \\"))))))))
`(#:configure-flags
(list "--disable-static"
"--without-python")))
(inputs
(list libbpf))
(native-inputs
-1
View File
@@ -43,7 +43,6 @@
(uri (git-reference
(url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
(commit (string-append "adns-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
-1
View File
@@ -1387,7 +1387,6 @@ mounted via FUSE.")
(uri (git-reference
(url "https://github.com/anestisb/android-simg2img")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0drwvqxbhajka580j93z8ldckhjlpr0i84nh20krdpxcp54xvldh"))))
+13 -21
View File
@@ -30,26 +30,20 @@
#:use-module (guix packages)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages algebra)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages java)
#:use-module (gnu packages maths)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages readline)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages xorg))
#:use-module (gnu packages sqlite))
(define-public apl
(let ((revision 1977))
(let ((revision 1550))
(package
(name "apl")
(version (string-append "2.0.1-r" (number->string revision)))
(version (string-append "1.8-r" (number->string revision)))
(source
(origin
(method svn-fetch)
@@ -58,18 +52,12 @@
(revision revision)))
(file-name (git-file-name name version))
(sha256
(base32 "1llm1hqpfd71jrhd4pizhmvvca5wr18v8zqfajwmvjjxcmzfkvv1"))))
(base32 "1bgc3a09f35zrqq2irhm1hspppnxjqas0fmcw14hkc7910br9ip3"))))
(build-system gnu-build-system)
(home-page "https://www.gnu.org/software/apl/")
(native-inputs (list gettext-minimal which pkg-config))
(inputs
(list gettext-minimal
libxcb
fftw
openblas
gsl
libpng
gtk+
pcre2
readline
sqlite))
@@ -81,11 +69,15 @@
#~(modify-phases %standard-phases
(add-before 'configure 'fix-configure
(lambda _
(substitute* "configure"
;; Manually set the SVN revision, since the directory
;; is unversioned and we know it anyway.
(("\\$apl_ARCHIVE_SVNINFO")
#$(number->string revision))))))))
(substitute* "buildtag.sh"
;; Don't exit on failed SVN-related calls.
(("^ +return 0\n") "")
;; Manually set the SVN revision, since the directory is
;; unversioned and we know it anyway.
(("^SVNINFO=.*")
(string-append "SVNINFO=" #$(number->string revision) "\n"))
;; Requires running svn info on a versioned directory.
(("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"")))))))
(synopsis "APL interpreter")
(description
"GNU APL is a free interpreter for the programming language APL. It is
+2 -2
View File
@@ -34,14 +34,14 @@
(define-public apr
(package
(name "apr")
(version "1.7.6")
(version "1.7.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/apr/apr-"
version ".tar.bz2"))
(sha256
(base32
"0cpbbmng9ir8rjl9nxwljkzmrkpk4b1nsj8vg4ssfpapsa90s0s9"))
"0xsmqgjiyw3s6va5dm86djnjzg9r0qc1zsldwz4sd8pkhglqsr7w"))
(patches
(search-patches "apr-skip-getservbyname-test.patch"))
(patch-flags '("-p0"))))
+25 -25
View File
@@ -532,7 +532,7 @@ Library with namespaces, exception handling, and member template functions.")
"See License.txt in the distribution."))))
(define-public celestia
;; 1.6.4 was placed in 2023 while master migrated to Qt6, use the latest
;; 1.6.4 was placed in 2023 while master migrated to Qt6, use the lates
;; commit for now.
(let ((commit "6de0339a85be38e85e2ad34f58850700be4342c5")
(revision "1"))
@@ -561,7 +561,7 @@ Library with namespaces, exception handling, and member template functions.")
"-DUSE_QT6=ON")
#:phases
#~(modify-phases %standard-phases
;; TODO: Wrap celestia-content instead of copying it, if possible.
;; TODO: Wrap celestia-content instead of copping it, if posible.
(add-after 'install 'install-content
(lambda _
(copy-recursively
@@ -602,7 +602,7 @@ accurately in real time at any rate desired.")
(license license:gpl2+))))
(define-public celestia-content
;; No releases or version tags.
;; No rleases or version tags.
(let ((commit "54e4760132be3617e4782fee8eefcfce6694f4ff")
(revision "6"))
(package
@@ -783,7 +783,7 @@ analysis.")
(arguments
;; pycpl expects to find a lib/esopipes-plugins directory. This is
;; overruled by the PYESOREX_PLUGIN_DIR search path, but the default
;; directory is still consulted and therefore needs to exist.
;; directory is still consulted and therefor needs to exist.
(list
#:phases
#~(modify-phases %standard-phases
@@ -1490,7 +1490,7 @@ more.")
(list
;; XXX: All tests fail, figure out how to fix them.
#:tests? #f
;; It fails with segmentation fault in parallel build
;; It failes with segmentation fault in parallel build
#:parallel-build? #f
;; No such file or directory .../lib/iraf/lib/libmemdbg.a
#:validate-runpath? #f
@@ -1569,7 +1569,7 @@ release from 2013.")
(description
"This package provides a @acronym{Centre de Données astronomiques de
Strasbourg, CDS} implementation in Java of the @acronym{Hierarchical Equal
Area isoLatitude Pixelization of a sphere , HEALPix} tessellation.")
Area isoLatitude Pixelization of a sphere , HEALPix} tesselation.")
(license license:bsd-3)))
(define-public libnova
@@ -2847,7 +2847,7 @@ simulated Astronomical data in Python.")
(build-system pyproject-build-system)
;; Tests are not thread save, see
;; <https://github.com/kyleaoman/martini/issues/98>.
;;
;;
;; tests: 2529 passed, 11 skipped, 4 xfailed, 8 warnings
(native-inputs
(list python-pytest
@@ -2905,7 +2905,7 @@ of functions to execute the desired steps in the mock-observing process.")
"--ignore=astroML/density_estimation/tests/test_bayesian_blocks.py"
"--ignore=astroML/density_estimation/tests/test_hist_binwidth.py"
"--ignore=astroML/density_estimation/tests/test_hist_binwidth.py"
;; Disable tests with NumPy, see
;; Disalbe tests with NumPy, see
;; <https://github.com/astroML/astroML/issues/281>.
"--ignore=astroML/tests/test_resample.py"
"-k" (string-append "not astroML.density_estimation.empirical.EmpiricalDistribution"
@@ -3304,7 +3304,7 @@ celestial-to-terrestrial coordinate transformations.")
(list
;; Tests are not thread save, see:
;; <https://github.com/astropy/astroquery/issues/2968>.
;;
;;
;; tests: 1823 passed, 21 skipped, 2047 deselected, 2 xfailed
#:test-flags
#~(list "--pyargs" "astroquery"
@@ -3467,7 +3467,7 @@ aim of simplifying and streamlining data conversion and standardization.")
"@code{BayesicFitting} is a package for model fitting and Bayesian
evidence calculation, it is a Python version of the the fitter classes in
@acronym{HCSS, Herschel Common Science System}. HCSS was the all encompassing
software system for the operations and analysis of the ESA satellite Herschel.")
software system for the operations and analysis of the ESA satelite Herschel.")
(license license:gpl3+)))
(define-public python-bdsf
@@ -3576,12 +3576,12 @@ Origins Spectrograph}.")
#:test-flags #~(list "camb.tests.camb_test")
#:phases
#~(modify-phases %standard-phases
;; XXX: It may be set via FORUTILSPATH environment variable but
;; XXX: It may be set via FORUTILSPATH environemnt variable but
;; build fails with error:
;; mkdir: cannot create directory Releaselib: Read-only file system
(add-after 'unpack 'copy-forutils
(lambda _
;; It's a git submodule to <https://github.com/cmbant/forutils>.
;; It's a git sumbodule to <https://github.com/cmbant/forutils>.
(copy-recursively
#+(package-source (this-package-native-input "fortran-forutils"))
"forutils"))))))
@@ -3660,7 +3660,7 @@ in fast modern Fortran.")
"casa_cube is a python package that provides an interface to data cubes
generates by CASA or Gildas. It allows the user to perform simple tasks such
plotting given channel maps, moment maps, line profile in various units,
correcting for cloud extinction, reconvolving with a beam taper, trimming a
correcting for cloud extinction, reconvolving with a beam taper, triming a
cube. The syntax is similar to pymcfost to perform quick and easy comparison
with models.")
(license license:expat)))
@@ -3941,7 +3941,7 @@ data in the CHIANTI database.")
(version "2.0.2")
(source
(origin
(method git-fetch)
(method git-fetch)
(uri (git-reference
(url "https://github.com/yt-project/cmyt")
(commit (string-append "v" version))))
@@ -4226,7 +4226,7 @@ Spectrograph}.")
;; updates, see:
;; <https://github.com/spacetelescope/crds/blob/13.1.1/TESTING>.
#~(list #$@(map (lambda (file) (string-append "--ignore=" file))
;; Network access to <https://hst-crds.stsci.edu> or
;; Network acces to <https://hst-crds.stsci.edu> or
;; additional test data is required.
(list "test/bestrefs/test_bestrefs.py"
"test/bestrefs/test_special.py"
@@ -4847,7 +4847,7 @@ Euclid Consortium should be used.")
(version "2.1.0")
(source
(origin
(method git-fetch)
(method git-fetch)
(uri (git-reference
(url "https://github.com/cta-observatory/pyeventio")
(commit (string-append "v" version))))
@@ -5549,7 +5549,7 @@ and a 3D volume rendering viewer.")
(list
#:test-flags
;; See: <https://github.com/Hazboun6/gw_sky/issues/2>.
;;
;;
;; 0.1.0 was released in 2023 and might be not compatible with some
;; function in Jupyter: subprocess.CalledProcessError: Command
;; '['jupyter', 'nbconvert', <...>
@@ -6205,7 +6205,7 @@ etc.).")
(base32 "14m1a6z884vg2n5ndwwhpnzpb5h28hh58a53dfjwwbjakwmixb0p"))))
(build-system pyproject-build-system)
(arguments
(list #:tests? #f)) ; no tests in PyPI tarball, tests require networking
(list #:tests? #f)) ; no tests in PyPI tarball, tests requir networking
(native-inputs
(list python-setuptools
python-wheel))
@@ -7370,7 +7370,7 @@ position-frequency slice.")
(build-system pyproject-build-system)
(arguments
;; See: <https://github.com/sczesla/PyAstronomy/issues/64>.
(list #:tests? #f))
(list #:tests? #f))
(native-inputs
(list python-ipython-minimal
python-nbconvert
@@ -9748,7 +9748,7 @@ over many parameters:
(build-system pyproject-build-system)
(arguments
(list
;; tests: 19 passed, 1 deselected
;; tests: 19 passed, 1 deselected
#:test-flags
;; Test fails due to numerical uncertainties.
;; See: <https://github.com/vrodgom/statmorph/issues/17>.
@@ -10231,7 +10231,7 @@ Institute, STScI} utility functions.")
;; Failed to load Vega spectrum from
;; /grp/redcat/trds/calspec/alpha_lyr_stis_010.fits;
;;
;; Data is available by the lnks: <https://ssb.stsci.edu/trds/calspec/>,
;; Data is availalbe by the lnks: <https://ssb.stsci.edu/trds/calspec/>,
;; <https://archive.stsci.edu/hlsp/reference-atlases>.
#:tests? #f))
(native-inputs
@@ -10421,8 +10421,8 @@ and @code{astropy}.")
(build-system pyproject-build-system)
(arguments
(list
;; TODO: tests require some removed data, find out how to run bare minimal
;; unit tests without it.
;; TODO: tests require some remove data, findout how to run bare minmal
;; unit tests withou it.
#:tests? #f))
(native-inputs
(list python-setuptools
@@ -11277,7 +11277,7 @@ crowded star fields.")
(license license:gpl3+)))
(define-public sgp4
;; Version tag v1.0 is dated to <2021-01-11>, use the latest commit instead.
;; Version tag v1.0 is dated to <2021-01-11>, use the lates commit instead.
(let ((commit "6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91")
(revision "2"))
(package
@@ -11967,7 +11967,7 @@ any knowledge of SQL
including auto-parallelising custom analysis
@item customization with multiple Python modules such as @code{pynbody} or
@code{yt} to process raw simulation data
@item supports file-based database SQLite, server-based MySQL and PostgreSQL
@item suports file-based database SQLite, server-based MySQL and PostgreSQL
@end itemize")
(license license:bsd-3)))
-1
View File
@@ -8043,7 +8043,6 @@ Home Page}.")
(commit version)
;; For test files.
(recursive? #true)))
(file-name (git-file-name name version))
(sha256
(base32 "065x43hx670rjrclxi4hiqxscllb16v9s7myjvg7rd5pd3y0k7sg"))))
(build-system pyproject-build-system)
+1 -1
View File
@@ -547,7 +547,7 @@ remain fully idle, saving power and producing less noise.")
"0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
(build-system gnu-build-system)
(inputs
(list librsync))
(list librsync-0.9))
(arguments
`(#:make-flags `("CFLAGS=-fcommon"
,(string-append "PREFIX=" (assoc-ref %outputs "out"))
-25
View File
@@ -1,25 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages beam-apps)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system mix))
-43
View File
@@ -1,43 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages beam-packages)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system mix)
#:use-module (gnu packages beam-sources)
#:export (lookup-mix-inputs))
;;;
;;; This file is managed by guix import. Do NOT add definitions manually.
;;;
;;; BEAM libraries fetched from hex.pm.
;;;
(define aaaa-separator 'begin-of-beam-packages)
(define cccc-separator 'end-of-beam-packages)
;;;
;;; Mix inputs.
;;;
(define-mix-inputs lookup-mix-inputs)
-29
View File
@@ -1,29 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages beam-sources)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system mix))
;;;
;;; BEAM libraries requiring modification.
;;; These packages are hidden, as they are not interesting to users.
;;;
+147 -42
View File
@@ -4897,29 +4897,26 @@ relying on a complex dependency tree.")
(define-public biosoup
(package
(name "biosoup")
(version "0.11.0")
(version "0.10.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rvaser/biosoup")
(commit version)))
;; Corresponds to version 0.10.0
(commit "38181f09854ff42cbd9632200a2ec9fb37a4b7b6")))
(file-name (git-file-name name version))
(sha256
(base32
"0vn1hj3h152iwahnrzghqll34qaphchi07klb3j70vgc248micbz"))))
"02hvyka703zagx0nvv2yx3dkc748zc8g6qbrpya7r8kfkcl7y8hw"))))
(build-system cmake-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'enable-testing
(lambda _
(substitute* "CMakeLists.txt"
(("target_link_libraries\\(biosoup_test")
"enable_testing()
add_test(NAME biosoup-test COMMAND biosoup_test)
target_link_libraries(biosoup_test")))))))
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./bin/biosoup_test")))))))
(native-inputs
(list googletest))
(home-page "https://github.com/rvaser/biosoup")
@@ -4931,29 +4928,26 @@ used for storage and logging in bioinformatics tools.")
(define-public bioparser
(package
(name "bioparser")
(version "3.1.0")
(version "3.0.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rvaser/bioparser")
(commit version)))
;; Corresponds to tag 3.0.13
(commit "13341e6e0855c6b358ffcea6dad216e1009e1287")))
(file-name (git-file-name name version))
(sha256
(base32
"057zb3g8qyvbkbfzgkygrf0iphz3v4icm13pchxzrafiy7zkbmrq"))))
"0c5p2dl8jb12ci9f427jzrmmm9cgvc1k4fxsn2ggkfsin6r1r82i"))))
(build-system cmake-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'enable-testing
(lambda _
(substitute* "CMakeLists.txt"
(("target_link_libraries\\(bioparser_test")
"enable_testing()
add_test(NAME bioparser-test COMMAND bioparser_test)
target_link_libraries(bioparser_test")))))))
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./bin/bioparser_test")))))))
(inputs
(list biosoup))
(propagated-inputs
@@ -4967,6 +4961,113 @@ bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib
compressed files.")
(license license:expat)))
(define-public circtools
(package
(name "circtools")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Kevinzjy/circtools")
;; Corresponds to tag v1.0.0
(commit "79380de59013601021ca3b1352d6f64d2fb89646")
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"0wg1s927g32k25j967kfr8l30nmr4c0p4zvy5igvy7cs6chd60lh"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f
#:install-source? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-writable
(lambda _
(for-each make-file-writable (find-files "."))))
(add-after 'unpack 'prepare-spoa-dependencies
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "vendor/spoa/CMakeLists.txt"
(("find_package\\(bioparser 3.0.13 QUIET\\)")
"find_package(bioparser 3.0.13 CONFIG)")
(("find_package\\(biosoup 0.10.0 QUIET\\)")
"find_package(biosoup 0.10.0 CONFIG)")
(("GTest_FOUND") "TRUE")))))))
(inputs
(cons* bioparser biosoup (cargo-inputs 'circtools)))
(native-inputs
(list cmake-minimal pkg-config googletest))
(home-page "https://github.com/Kevinzjy/circtools")
(synopsis "Accelerating functions in CIRI toolkit")
(description "This package provides accelerated functions for the CIRI
toolkit. It also provides the @code{ccs} executable to scan for circular
consensus sequences.")
(license license:expat)))
(define-public ciri-long
(package
(name "ciri-long")
(version "1.0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bioinfo-biols/CIRI-long")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "10k88i1fcqchrrjv82rmylwvbwqfba0n51palhig9hsg71xs0dbi"))
;; Delete bundled binary
(snippet '(delete-file "libs/ccs"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
(("'argparse[^']*',")
"") ;only for python2
(("==")
">=")
;; This package changed names.
(("python-Levenshtein")
"levenshtein"))))
(add-before 'build 'build-libssw
(lambda _
(with-directory-excursion "libs/striped_smith_waterman"
(invoke "make" "libssw.so"))))
(add-before 'build 'fix-reference-to-ccs
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CIRI_long/pipeline.py"
(("'ccs -i")
(string-append "'"
(assoc-ref inputs "circtools") "/bin/ccs"
" -i")))
;; yuck!
(substitute* "CIRI_long/main.py"
(("os.chmod\\(lib_path.*")
"")))))))
(inputs (list circtools
python-biopython
python-bwapy
python-levenshtein
python-mappy
python-numpy
python-pandas
python-pysam
python-pyspoa
python-scikit-learn
python-scipy))
(native-inputs (list python-cython python-pynose python-setuptools))
(home-page "https://ciri-cookbook.readthedocs.io/")
(synopsis "Circular RNA identification for Nanopore sequencing")
(description "CIRI-long is a package for circular RNA identification using
long-read sequencing data.")
(license license:expat)))
(define-public python-circe
(package
(name "python-circe")
@@ -7074,16 +7175,14 @@ CWL descriptions.")
(package
(name "ravanan")
(version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arunisaac/ravanan")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1ap9h2d92wjvnn8914baqkx6xn8zdanxmpjfg81v3qx35pn938al"))))
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/arunisaac/ravanan/releases/download/v"
version "/ravanan-" version ".tar.lz"))
(sha256
(base32
"00ayvxsgvma3231ja1759f5fr99a4nw3j23i8qz616wfxa54745s"))))
(arguments
(list #:make-flags
#~(list (string-append "prefix=" #$output)
@@ -7117,7 +7216,7 @@ CWL descriptions.")
(inputs
(list bash-minimal
node
(lookup-package-input guix "guile")
guile-3.0
guile-filesystem
guile-gcrypt
guile-json-4
@@ -13116,22 +13215,28 @@ differently labelled data.")
(define-public r-pando
(package
(name "r-pando")
(version "1.1.1")
(version "1.0.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/quadbio/Pando")
(commit (string-append "v" version))))
(url "https://github.com/quadbiolab/Pando")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1zcsg3my1ka2wprvlx8p08cdz3dqphga54d5rp418zfhcyjy4fkp"))))
(base32 "04kr1b28p5j7h48g32cldkg87xcmxnmd4kspygkfs7a4amihpi66"))))
(properties `((upstream-name . "Pando")))
(build-system r-build-system)
(arguments
(list
;; The test file data/test_seurat.rds is not included.
#:tests? #false))
#:tests? #false
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
(substitute* "DESCRIPTION"
((" \\(==.*,") ",")))))))
(propagated-inputs
(list r-bayestestr
r-foreach
+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
@@ -253,7 +253,7 @@ as well as some desktop-wide documents.")
pkg-config
xorg-server-for-tests))
(inputs
(list at-spi2-core
(list atk
cinnamon-desktop
exempi
gsettings-desktop-schemas
+51
View File
@@ -695,6 +695,57 @@ Kcov uses DWARF debugging information for compiled programs to make it
possible to collect coverage information without special compiler switches.")
(license license:gpl2+)))
(define-public rtags
(package
(name "rtags")
(version "2.18")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Andersbakken/rtags")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(patches (search-patches "rtags-separate-rct.patch"))
(modules '((guix build utils)))
(snippet
;; Part of spliting rct with rtags.
;; Substitute #include "rct/header.h" with #include <rct/header.h>.
'(with-directory-excursion "src"
(delete-file-recursively "rct") ;remove bundled copy
(let ((files (find-files "." ".*\\.cpp|.*\\.h")))
(substitute* files
(("#include ?\"rct/(.*.h)\"" all header)
(string-append "#include <rct/" header ">")))
#t)))
(sha256
(base32
"0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"))))
(build-system cmake-build-system)
(arguments
'(#:build-type "RelWithDebInfo"
#:configure-flags
'("-DRTAGS_NO_ELISP_FILES=1")
#:tests? #f))
(native-inputs
(list pkg-config))
(inputs
(list bash-completion
clang
llvm
lua
rct
selene))
(home-page "https://github.com/Andersbakken/rtags")
(synopsis "Indexer for the C language family with Emacs integration")
(description
"RTags is a client/server application that indexes C/C++ code and keeps a
persistent file-based database of references, declarations, definitions,
symbolnames etc. Theres also limited support for ObjC/ObjC++. It allows you
to find symbols by name (including nested class and namespace scope). Most
importantly we give you proper follow-symbol and find-references support.")
(license license:gpl3+)))
(define-public colormake
(package
(name "colormake")
+32
View File
@@ -683,6 +683,38 @@ computer program to introspect and modify an object at runtime. It is also
the name of the library itself, which is written in C++.")
(license license:expat)))
(define-public rct
(let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a")
(revision "2"))
(package
(name "rct")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Andersbakken/rct")
(commit commit)))
(sha256
(base32
"1m2931jacka27ghnpgf1z1plkkr64z0pga4r4zdrfpp2d7xnrdvb"))
(patches (search-patches "rct-add-missing-headers.patch"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DWITH_TESTS=ON" ; To run the test suite
"-DRCT_RTTI_ENABLED=ON")))
(native-inputs
(list cppunit pkg-config))
(inputs
(list openssl zlib))
(home-page "https://github.com/Andersbakken/rct")
(synopsis "C++ library providing Qt-like APIs on top of the STL")
(description "Rct is a set of C++ tools that provide nicer (more Qt-like)
APIs on top of Standard Template Library (@dfn{STL}) classes.")
(license (list license:expat ; cJSON
license:bsd-4))))) ; everything else (LICENSE.txt)
(define-public plutovg
(package
(name "plutovg")
+14 -4
View File
@@ -135,10 +135,20 @@
(search-patches
"ath9k-htc-firmware-binutils.patch")))
((target-mingw? target)
(package-with-extra-patches binutils
(search-patches
"binutils-cross-windres.patch"
"binutils-mingw-w64-deterministic.patch")))
(package-with-extra-patches
(package-with-extra-configure-variable
;; mingw binutils does not work correctly when configured
;; with `--enable-compressed-debug-sections`. An error
;; like the following will occur whenever you try to link:
;;
;; x86_64-w64-mingw32-ld: final link failed: bad value
;;
;; TODO: This seems like a deeper problem that warrants
;; deeper investigation.
binutils "--enable-compressed-debug-sections" "no")
(search-patches
"binutils-cross-windres.patch"
"binutils-mingw-w64-deterministic.patch")))
(else binutils))
target)))
+27 -61
View File
@@ -1545,17 +1545,17 @@ and high-availability (HA).")
(license license:gpl2))) ;'COPYING' says "version 2" only
;; Don't forget to update the other postgresql packages when upgrading this one.
(define-public postgresql-17
(define-public postgresql-16
(package
(name "postgresql")
(version "17.7")
(version "16.4")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"1dg9labqgph2idaypb8khdvbag29pr3h4bqv5w8k7kgc08rk97pg"))
"0vvd73rzj0sl294v15bh8yslakqv412bxqzlkqxyjwxa8pb6c5wp"))
(patches (search-patches
"postgresql-disable-normalize_exec_path.patch"))))
(build-system gnu-build-system)
@@ -1585,22 +1585,18 @@ and high-availability (HA).")
(add-after 'build 'build-contrib
(lambda _
(invoke "make" "-C" "contrib")))
;; FIXME: Install manpages too.
;; The 'install-mangpages phase in postgresql-16 fails silently here.
(add-after 'install 'install-contrib
(lambda _
(invoke "make" "-C" "contrib" "install"))))))
(invoke "make" "-C" "contrib" "install")))
(add-after 'install 'install-manuals
(lambda _
(with-directory-excursion "doc/src/sgml"
(invoke "make" "install-man")
(invoke "make" "postgres.info")
(install-file "postgres.info"
(string-append #$output "/share/info"))))))))
(native-inputs
(list bison
docbook-xml-4.5
docbook-xsl
docbook2x
flex
libxml2
libxslt
perl
pkg-config
texinfo))
(list docbook-xml-4.5 docbook2x libxml2 perl pkg-config texinfo))
(inputs
(list icu4c readline `(,util-linux "lib") openssl zlib))
(home-page "https://www.postgresql.org/")
@@ -1614,49 +1610,18 @@ TIMESTAMP. It also supports storage of binary large objects, including
pictures, sounds, or video.")
(license (license:x11-style "file://COPYRIGHT"))))
(define-public postgresql-16
(package
(inherit postgresql-17)
(name "postgresql")
(version "16.10")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0hib575m9x3z8c71gkcv9jsyq77d3qk7q2zgzvfy6clwrvs8b16y"))
(patches (search-patches
"postgresql-disable-normalize_exec_path.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments postgresql-17)
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(add-after 'install 'install-manuals
(lambda _
(with-directory-excursion "doc/src/sgml"
(invoke "make" "install-man")
(invoke "make" "postgres.info")
(install-file "postgres.info"
(string-append #$output "/share/info")))))))))
(native-inputs (modify-inputs (package-native-inputs postgresql-17)
(delete "bison")
(delete "docbook-xsl")
(delete "flex")
(delete "libxslt")))))
(define-public postgresql-15
(package
(inherit postgresql-16)
(name "postgresql")
(version "15.15")
(version "15.8")
(source (origin
(method url-fetch)
(inherit (package-source postgresql-16))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"1ais46b2ij38y75i1w336as03pybyndsd2pp2q8gdjq9igmsllsp"))
"0snbxmlygf7m4cxjpscmz3yjn4lnqsw313y9xgpv7vk9k9gm20s4"))
(patches (search-patches
"postgresql-disable-resolve_symlinks.patch"))))
(native-inputs (modify-inputs native-inputs
@@ -1668,26 +1633,26 @@ pictures, sounds, or video.")
(package
(inherit postgresql-15)
(name "postgresql")
(version "14.20")
(version "14.13")
(source (origin
(inherit (package-source postgresql-15))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0sv45dsmyplfys6dfdjdwmrczl46s82x35xdh311nxj02q7z29vm"))))))
"0misc5yiklflz96n7wxcdzzg0lcc4ahd0flzqsg6mcjs955krajr"))))))
(define-deprecated/public postgresql-13 #f
(define-public postgresql-13
(package
(inherit postgresql-14)
(version "13.23")
(version "13.16")
(source (origin
(inherit (package-source postgresql-14))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"1mhz0h7b3dmc0nnxz1wp46j95jhyi3girykkr3gbg4mg4qkwihvf"))))))
"0rc8rpsw2lwa5af35zd8iifah02wg2rnn1i890h2h8zh55hvpjy9"))))))
(define-public postgresql postgresql-14)
@@ -1726,7 +1691,7 @@ pictures, sounds, or video.")
(define-public timescaledb
(package
(name "timescaledb")
(version "2.26.1")
(version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1735,7 +1700,7 @@ pictures, sounds, or video.")
(file-name (git-file-name name version))
(sha256
(base32
"0zfm224jyz874pk4r9qlz5c2mn1xjvairhxh6widlbh3mn62m3j8"))
"1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
@@ -1745,7 +1710,8 @@ pictures, sounds, or video.")
'("scripts/c_license_header-timescale.h"
"scripts/license_tsl.spec"
"scripts/sql_license_tsl.sql"
"test/t/001_replication_telemetry.pl"
"test/perl/AccessNode.pm"
"test/perl/DataNode.pm"
"test/perl/TimescaleNode.pm"))))))
(build-system cmake-build-system)
(arguments
@@ -1829,7 +1795,7 @@ pictures, sounds, or video.")
(lambda* (#:rest args)
(apply (assoc-ref gnu:%standard-phases 'check)
#:test-target "regresschecklocal" args))))))
(inputs (list openssl postgresql-17))
(inputs (list openssl postgresql))
(home-page "https://www.timescale.com/")
(synopsis "Time-series extension for PostgreSQL")
(description
@@ -3078,7 +3044,7 @@ temporary directory, and destroys it when the perl script exits.")
(define-public unixodbc
(package
(name "unixodbc")
(version "2.3.14")
(version "2.3.9")
(source (origin
(method url-fetch)
(uri
@@ -3086,7 +3052,7 @@ temporary directory, and destroys it when the perl script exits.")
"ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-"
version ".tar.gz"))
(sha256
(base32 "0wa7a82h5dsba23155gfhh1sp4dsbaxq6pppp6q31z017vg18a2f"))))
(base32 "01xj65d02i3yjy7p9z08y9jakcs5szmz4rask868n7387nn3x0sj"))))
(build-system gnu-build-system)
(synopsis "Data source abstraction library")
(description "Unixodbc is a library providing an API with which to access
+2 -2
View File
@@ -79,7 +79,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "317")
(version "315")
(source
(origin
(method git-fetch)
@@ -88,7 +88,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "13r96c49wrpx0xa8bbkki832w58gjdgqb4khjsaawk5mb5yv4c39"))))
(base32 "1q2q60hw36d1capqdrg6gp2220dg87bmxgmk52m7yml4xw13zi2p"))))
(build-system pyproject-build-system)
(arguments
(list
+2 -2
View File
@@ -1231,7 +1231,7 @@ passphrases.")
(define-public ndctl
(package
(name "ndctl")
(version "84")
(version "78")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1240,7 +1240,7 @@ passphrases.")
(file-name (git-file-name name version))
(sha256
(base32
"0jal7w4mk5l5j0qfays27kya8n1h2qwkncl0s317rfxp56bkjp6y"))))
"0rhmxjajxxslsikixlf9cdg5vcn42h7zzqkqj5p5pshxch368kn0"))))
(build-system meson-build-system)
(arguments
;; The test suite runs but SKIPs all tests: do not consider this tested!
-1
View File
@@ -549,7 +549,6 @@ when coding custom template tags.")
(uri (git-reference
(url "https://github.com/jazzband/django-taggit")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1i8an3wcl7nygl5f565jcpyhyws9gabawazggxpf6m3vklxn3cj0"))))
+1 -5
View File
@@ -70,7 +70,6 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages tex)
#:use-module (gnu packages uglifyjs)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
@@ -109,13 +108,10 @@
#$output)
(("\\$cfg\\{'TMPSPACE'\\} = q'[^']*'")
"$cfg{'TMPSPACE'} = q'/tmp'")))))))
(propagated-inputs (list texlive-preview texlive-xcolor texlive-dvips))
(inputs (list perl netpbm ghostscript))
(synopsis "LaTeX documents to HTML")
(description "LaTeX2HTML is a utility that converts LaTeX documents to web
pages in HTML. Since there are many different latex packages, it is expected
that the user has their latex installation set up correctly when invoking
@code{latex2html}.")
pages in HTML.")
(home-page "https://www.latex2html.org/")
(license license:gpl2+)))
+45 -47
View File
@@ -240,8 +240,8 @@ are also taken from the original.")
(license license:gpl3+))))
(define-public abc
(let ((commit "80c8a9a1928ef8148a6b504e9590ec07c55c8bcf")
(revision "10"))
(let ((commit "c18b9a24de46d3b0209afa416511b7a1127344f9")
(revision "9"))
(package
(name "abc")
(version (git-version "0.0" revision commit))
@@ -253,7 +253,7 @@ are also taken from the original.")
(file-name (git-file-name name version))
(sha256
(base32
"1fbnwsd841z86vfv45443qfpx0l199vf08sgms8wyz19jw7m5ds6"))))
"12fjhlr9r34l6kw2jyaalh53fs783r1h2zx0ldzaxxrbcslb0bxh"))))
(build-system gnu-build-system)
(inputs
(list readline))
@@ -278,7 +278,7 @@ formal verification.")
(package
(inherit abc)
(name "abc-yosyshq")
(version "0.64")
(version "0.63")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -287,7 +287,7 @@ formal verification.")
(file-name (git-file-name name version))
(sha256
(base32
"1jk74yq7dnrnai8r9hqc10jcjmgj50jxj6hsflmvc61acm1r3f8r"))))
"1nwj4zhjqjgvb7fh877j51kfccwzrc591ag25qm9jirycgq1cqx6"))))
(home-page "https://github.com/YosysHQ/abc/")
(description "ABC is a program for sequential logic synthesis and
formal verification. This is the Yosyshq fork of ABC.")
@@ -296,7 +296,7 @@ formal verification. This is the Yosyshq fork of ABC.")
(define-public apycula
(package
(name "apycula")
(version "0.32")
(version "0.31")
;; The pypi tar.gz file includes the necessary .pickle files, not available
;; in the home-page repository.
(source
@@ -304,7 +304,7 @@ formal verification. This is the Yosyshq fork of ABC.")
(method url-fetch)
(uri (pypi-uri "apycula" version))
(sha256
(base32 "0zz6mz1s7razbqsysaji7qwfsjj19av4mg7zclxaigz4hmq9ar0d"))))
(base32 "0pf43cd071kv5ann78hl5qrcj9vhndr46ds2g12sgnfjfvh6pfpg"))))
(build-system pyproject-build-system)
(arguments
(list #:tests? #f ;requires Gowin EDA tools
@@ -467,7 +467,7 @@ individual low-level driver modules.")
(define-public eqy
(package
(name "eqy")
(version "0.64")
(version "0.63")
(source
(origin
(method git-fetch)
@@ -476,7 +476,7 @@ individual low-level driver modules.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1lsf8wm10wq67lmwz1ck30inl3byfy27ya39fj93gym5ys815ma6"))))
(base32 "05rk6gy0xnaksxqdkpm08i3ngh0adavfyfjyscw5l1b7d7yhfavh"))))
(build-system gnu-build-system)
(arguments
(list
@@ -1502,7 +1502,7 @@ an embedded event driven algorithm.")
(define-public librelane
(package
(name "librelane")
(version "3.0.2")
(version "3.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1511,7 +1511,7 @@ an embedded event driven algorithm.")
(file-name (git-file-name name version))
(sha256
(base32
"1v43adkw5c624nd06g11cb609v8pj3prfyyawbq3i4k1w1law597"))))
"01zi2v5qi26h09hwjafsq9k0anrc5g5fc6q5vg87k9lcwyfsi685"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -2018,7 +2018,7 @@ which allows one to install the M8 firmware on any Teensy.")
(define-public magic
(package
(name "magic")
(version "8.3.633")
(version "8.3.625")
(source
(origin
(method git-fetch)
@@ -2027,7 +2027,7 @@ which allows one to install the M8 firmware on any Teensy.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1rwrhb0q99rpv4lbiw1sqykwzf9gj1my2wkh6mp8g36rab2vhii3"))))
(base32 "0ld238cdq8mzzcx7vgk67aqim0ypbfyks486z59q19yzxpr6c42s"))))
(build-system gnu-build-system)
(arguments
(list
@@ -2057,7 +2057,7 @@ versus schematic} tests and can assist with automatic routing.")
(define-public mcy
(package
(name "mcy")
(version "0.64")
(version "0.63")
(source
(origin
(method git-fetch)
@@ -2120,7 +2120,7 @@ coverage.")
(define-public netgen
(package
(name "netgen")
(version "1.5.318")
(version "1.5.316")
(source
(origin
(method git-fetch)
@@ -2129,7 +2129,7 @@ coverage.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "19rd8y2pspycr2296nhm60fhsgnzlyzb09wx2kgqzg6s7h6cmrr5"))))
(base32 "1923mynqw1wjhlcij639gdqrkifyb5lcks1x11gwpgp4gijwj3qb"))))
(build-system gnu-build-system)
(arguments
(list
@@ -2690,20 +2690,20 @@ formats.")
(define-public openroad
(package
(name "openroad")
(version "26Q2")
(version "26Q1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/The-OpenROAD-Project/OpenROAD")
(commit version)
(commit "e06ca0f5f2e641cd7b138a4d9b4fdd290359eca8")
;; 26Q1 Uses:
;; - forked, custom opensta: v2.2.0-1952-g43177bba
;; - forked, custom (berkeley) abc: 20260301.0445-g17cadca08
;; - forked, custom opensta: v2.2.0-1579-g9c9b5659
;; - forked, custom (berkeley) abc: 20260104.1628-g4c756ffb8
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32 "152j78c47wyq4sw42bwlxdhvs5g47a8jqz1qz5yzdsk9z5y4y7vl"))))
(base32 "13x4kqi4j489k4sz56ws4aqhp60nff1i18z6hjd6xx8y7flaik0c"))))
(build-system qt-build-system)
(arguments
(list
@@ -2737,7 +2737,7 @@ formats.")
flex
googletest
pkg-config
swig-4.4))
swig-4.0))
(inputs
(list abseil-cpp
boost
@@ -2776,6 +2776,7 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.")
(package
(inherit openroad)
(name "openroad-cli")
(build-system cmake-build-system)
(arguments
(delkw
#:qtbase
@@ -3459,7 +3460,7 @@ form of AXI, AXI lite, and AXI stream modules.")
(define-public python-edalize
(package
(name "python-edalize")
(version "0.6.6")
(version "0.6.5")
(source
(origin
(method git-fetch)
@@ -3468,7 +3469,7 @@ form of AXI, AXI lite, and AXI stream modules.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
(base32 "1drmc126a12zlynx8ps9iwghaqs058pqj2xpdysxnrj26hg3sp15"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -3495,17 +3496,17 @@ form of AXI, AXI lite, and AXI stream modules.")
(native-inputs
(list python-pytest python-setuptools python-setuptools-scm))
(propagated-inputs
(list python-importlib-metadata python-jinja2 python-pandas))
(list python-importlib-metadata python-jinja2))
(home-page "https://github.com/olofk/edalize/")
(synopsis "Python Library for interacting with EDA tools")
(description
"This package can create project files for supported tools and run them in
batch or GUI mode. All EDA tools such as Icarus, Yosys, ModelSim, Vivado,
Verilator, GHDL, Quartus etc get input HDL files (Verilog and VHDL) and some
tool-specific files (constraint files,memory initialization files, IP
description files etc). Together with the files, perhaps a couple of Verilog
`defines, some top-level parameters/generics or some tool-specific options are
set.")
"This package implements a functionality to create project files for
supported tools and run them in batch or GUI mode. All EDA tools such as
Icarus, Yosys, ModelSim, Vivado, Verilator, GHDL, Quartus etc get input HDL
files (Verilog and VHDL) and some tool-specific files (constraint files,memory
initialization files, IP description files etc). Together with the files,
perhaps a couple of Verilog `defines, some top-level parameters/generics or
some tool-specific options are set.")
(license license:bsd-2)))
(define-public fusesoc
@@ -3999,7 +4000,7 @@ input and outputs an XML dataset.")
(define-public qucs-s
(package
(name "qucs-s")
(version "26.1.0") ;update qucsator-rf accordingly
(version "25.2.0") ;update qucsator-rf accordingly
(source
(origin
(method git-fetch)
@@ -4009,7 +4010,7 @@ input and outputs an XML dataset.")
(file-name (git-file-name name version))
(sha256
(base32
"0aiyrcrxln4v6qm2dmigb54wl0mj499q3g18pz87m1s2lfgicpb1"))))
"0328irynm8vy4xjdip5286fd8nag1zdp0p6rcbhdhp4fca6wp5ak"))))
(build-system qt-build-system)
(arguments
(list
@@ -4231,7 +4232,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
(define-public sby
(package
(name "sby")
(version "0.64")
(version "0.63")
(source
(origin
(method git-fetch)
@@ -4240,7 +4241,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0jksspdgq2grk4a80i5yfc9bazfij37wpmrlkvygpz9ys5ny1432"))))
(base32 "1p23w9jd95b86n7f94zpqdaz19fn2b2lyww1p8dcy9p3zrcn7750"))))
(build-system gnu-build-system)
(arguments
(list
@@ -4289,8 +4290,8 @@ front-end program for Yosys-based formal hardware verification flows.")
(license license:isc)))
(define-public sby-gui
(let ((commit "0a89301bf347c9f42932186e49ba2c0014ff3661")
(revision "1"))
(let ((commit "6c977084c17c4842c504829c6d455a07d67e119c")
(revision "0"))
(package
(name "sby-gui")
(version (git-version "0" revision commit))
@@ -4302,13 +4303,10 @@ front-end program for Yosys-based formal hardware verification flows.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1zp2c7zqclsfvl5xhb8zlc1dclp2s36w2nd0x80fazsxp7ksw5gr"))))
(base32 "137x3s5mwbzlcv2p6671ijvbafzwhxpvszzfi9wifq0wcli6cxxg"))))
(build-system qt-build-system)
(arguments
(list
#:qtbase qtbase ;for Qt 6
#:tests? #f)) ;no tests
(native-inputs (list python-minimal-wrapper))
(list #:tests? #f)) ;no tests
(propagated-inputs (list sby))
(home-page "https://github.com/YosysHQ/sby-gui/")
(synopsis "Graphical user interface for code{sby}")
@@ -4663,7 +4661,7 @@ parallel computing platforms. It also supports serial execution.")
(define-public yosys
(package
(name "yosys")
(version "0.64")
(version "0.63")
(source
(origin
(method git-fetch)
@@ -4671,7 +4669,7 @@ parallel computing platforms. It also supports serial execution.")
(url "https://github.com/YosysHQ/yosys")
(commit (string-append "v" version))))
(sha256
(base32 "13gw5msk1kv05jkb330nybvx2s0ixm6l6mdpyapnqmv3lkhby1mj"))
(base32 "1iaafzsc0pbd61m5hh12nzr2z4rn4n7i68l6ij9vli4m5zsxw39k"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
@@ -4784,12 +4782,12 @@ parallel computing platforms. It also supports serial execution.")
(git-reference
(url "https://github.com/povik/yosys-slang")
;; No tags, nor releases.
(commit "4e53d772996184b07e9bfe784060f96e6cb0a267")
(commit "d82b0b163a725fc1a401fbb6b465cd862517ec1f")
(recursive? #t))) ;requires slang and fmt
(file-name "yosys-slang")
(sha256
(base32
"1jjr1b6xd1sr9fkyfyl4y2wkzl51m7g10bw97mnw81v2mzssrs2q")))))
"07h4qssphggd4mbn376vldqwzj1i16y1ix455xzr4lgx6s2q9ryg")))))
;; Optional dependencies increase considerably package closure.
;; - gtkwave: required only for vcd2fst binary, used by sim command.
;; - graphviz, xdot: used by show command to display schematics.
+1 -71
View File
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
;;; Copyright © 2024, 2026 Igorj Gorjaĉev <igor@goryachev.org>
;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
;;;
;;; This file is part of GNU Guix.
@@ -24,7 +24,6 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages compression)
#:use-module (gnu packages base)
#:use-module (gnu packages erlang)
#:use-module (gnu packages erlang-xyz)
#:use-module (gnu packages gettext)
#:use-module (gnu packages)
@@ -424,25 +423,6 @@ implementing function decorators for Elixir.")
(home-page "https://hexdocs.pm/decorator/")
(license license:expat)))
(define-public elixir-depscheck
(package
(name "elixir-depscheck")
(version "1.0.11")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "depscheck" version))
(sha256
(base32 "1v33ml2i19s59518j9031bsvipbf4xxr4xk49qx6xs3qby0018aw"))))
(build-system mix-build-system)
(synopsis "Checking dependency license compatibility in Elixir projects")
(description "This package provides @code{elixir-depscheck}, a @code{CI/CD}
tool for checking dependency license compatibility in Elixir projects. Reads
license information from local hex metadata files and validates compatibility
with your project's license using industry-standard rules.")
(home-page "https://hexdocs.pm/depscheck/")
(license license:expat)))
(define-public elixir-erlex
(package
(name "elixir-erlex")
@@ -751,28 +731,6 @@ Elixir.")
(home-page "https://hexdocs.pm/mimic/")
(license license:asl2.0)))
(define-public elixir-mix-audit
(package
(name "elixir-mix-audit")
(version "2.1.5")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "mix_audit" version))
(sha256
(base32 "0s9dnk42n5665s6l22qf05x63ly11n37am2kmybzccns4672kyc7"))))
(build-system mix-build-system)
(propagated-inputs
(list elixir-jason
elixir-yaml-elixir))
(synopsis "Scanning Mix dependencies for security vulnerabilities")
(description "This package provides @code{elixir-mix-audit}, a
@code{mix deps.audit} task to scan @code{Mix} dependencies for security
vulnerabilities. It draw its inspiration from tools like npm audit and
bundler-audit.")
(home-page "https://hexdocs.pm/mix_audit/")
(license license:bsd-3)))
(define-public elixir-mox
(package
(name "elixir-mox")
@@ -1269,34 +1227,6 @@ provides a polyfill for @code{dbg} which was introduced in Elixir 1.14.")
(home-page "https://hexdocs.pm/verbs/")
(license license:expat)))
(define-public elixir-yaml-elixir
(package
(name "elixir-yaml-elixir")
(version "2.12.0")
(source
(origin
(method url-fetch)
(uri (hexpm-uri "yaml_elixir" version))
(sha256
(base32 "1ihknd9qy8y533zd150ch2yag2h895hsp86wamqpm4dcgfpaqsya"))))
(build-system mix-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-yamerl-hrl-path
(lambda _
(substitute* "lib/yaml_elixir/records.ex"
(("internal\\/yamerl_constr\\.hrl")
"yamerl_constr.hrl")))))))
(propagated-inputs
(list erlang-yamerl))
(synopsis "YAML parser for Elixir based on native Erlang implementation")
(description "This package provides @code{elixir-yaml-elixir}, a @code{YAML}
parser for @code{Elixir} based on native @code{Erlang} implementation.")
(home-page "https://hexdocs.pm/yaml_elixir/")
(license license:expat)))
(define-public elixir-zest
(package
(name "elixir-zest")
+1 -2
View File
@@ -51,8 +51,7 @@
(file-name (git-file-name name version))
(sha256
(base32 "1i10a5d7mlcrav47k7qirqvrqn2kbl5265fbcp8fzavr86xz67m6"))
(patches (search-patches "elixir-path-length.patch"
"elixir-vendoring-support.patch"))))
(patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system)
(arguments
(list
+79 -166
View File
@@ -9435,40 +9435,35 @@ column by drawing a thin line down the length of the editing window.")
(license license:gpl3+)))
(define-public emacs-greader
(package
(name "emacs-greader")
(version "0.19.0")
(source
(origin
(uri (git-reference
(url "https://gitlab.com/michelangelo-rodriguez/greader")
(commit (string-append "v" version))))
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32 "08c4i5qbr0ndbbps6y5kpp0lzfmxnwifrxssqkd9qdzj068k69k3"))))
(build-system emacs-build-system)
(arguments
(list #:tests? #f ;no tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'make-info
(lambda _
(invoke "makeinfo" "--no-split" "greader.texi"))))))
(inputs (list emacs-compat espeak-ng))
(native-inputs (list texinfo))
(home-page "https://gitlab.com/michelangelo-rodriguez/greader")
(synopsis
"Gnamù Reader, or Greader, sends buffer contents to a speech engine")
(description
"Greader is a module that sends any Emacs buffer to a @acronym{TTS,
(let ((commit "b25974aeae49f11b91bb78d94ab51913fdfcdc05")) ;version bump
(package
(name "emacs-greader")
(version "0.13.1")
(source
(origin
(uri (git-reference
(url "https://gitlab.com/michelangelo-rodriguez/greader")
(commit commit)))
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32 "1qkszb4yrfnzb2rqkf6vmzca53w68p78zb58frcxslxn7s5l7ih1"))))
(build-system emacs-build-system)
(arguments
(list #:tests? #f)) ;no tests
(inputs (list emacs-compat espeak-ng))
(home-page "https://gitlab.com/michelangelo-rodriguez/greader")
(synopsis
"Gnamù Reader, or Greader, sends buffer contents to a speech engine")
(description
"Greader is a module that sends any Emacs buffer to a @acronym{TTS,
Text To Speech} engine, such as Espeak-NG or Speech Dispatcher.
The mode supports timer reading, automatic scrolling of buffers in modes like
Info mode, and repeating reading of regions or the whole buffer. It also
includes a feature to facilitate the compilation of Espeak-NG
pronunciations.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-grep-a-lot
(package
@@ -15322,33 +15317,35 @@ them easier to distinguish from other, less important buffers.")
(license license:expat)))
(define-public emacs-embark
(package
(name "emacs-embark")
(version "1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/oantolin/embark")
(commit version)))
(sha256
(base32 "1y97kibzz36wrzcjv997qp5pliikda0dhsm9461pin3q5gv8y6kq"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
(list
#:tests? #false ;no tests
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'makeinfo
(lambda _ (emacs-makeinfo))))))
(native-inputs (list texinfo))
(propagated-inputs
(list emacs-avy emacs-consult))
(home-page "https://github.com/oantolin/embark")
(synopsis "Emacs mini-buffer actions rooted in keymaps")
(description
"This package provides a sort of right-click contextual menu for Emacs
(let ((commit "0bdfd38d281d6375e6e675ce6f1bd597a9e3b136")
(revision "1"))
(package
(name "emacs-embark")
(version (git-version "1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/oantolin/embark")
(commit commit)))
(sha256
(base32 "0m9y2wraapi744fg7y6cgz6y2gx0xzaglnxqalynz44ca9z6m6y4"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
(list
#:tests? #false ;no tests
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'makeinfo
(lambda _ (emacs-makeinfo))))))
(native-inputs (list texinfo))
(propagated-inputs
(list emacs-avy emacs-consult))
(home-page "https://github.com/oantolin/embark")
(synopsis "Emacs mini-buffer actions rooted in keymaps")
(description
"This package provides a sort of right-click contextual menu for Emacs
offering you relevant @emph{actions} to use on a @emph{target} determined by
the context.
@@ -15362,7 +15359,7 @@ get offered actions like deleting, copying, renaming, visiting in another
window, running a shell command on the file, etc. For buffers the actions
include switching to or killing the buffer. For package names the actions
include installing, removing or visiting the homepage.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-prescient
(package
@@ -17372,11 +17369,11 @@ accessing slash commands.")
(define-public emacs-claude-code-ide
;; Upstream does not make versioned releases.
(let ((commit "56db02ee386d009ddb8b1482310f1f9beeefb810")
(revision "2"))
(let ((commit "5f12e60c6d2d1802c8c1b7944bbdf935d5db1364")
(revision "1"))
(package
(name "emacs-claude-code-ide")
(version (git-version "0.2.7" revision commit))
(version (git-version "0.2.6" revision commit))
(source
(origin
(method git-fetch)
@@ -17385,7 +17382,7 @@ accessing slash commands.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "060n6alwgnxqpqcl74c1ixjm0am1pfj2kx7v3wi4bys6dsf50zd8"))))
(base32 "148xcrqff6khpwf8nnadcyvz8h6mk45xz1498k0wbzy80yzd2axn"))))
(build-system emacs-build-system)
(arguments
(list
@@ -24482,27 +24479,6 @@ key-bindings, avoiding most if not all the hassle introduced by key-binding
conflicts.")
(license license:gpl3+)))
(define-public emacs-meow-tree-sitter
(package
(name "emacs-meow-tree-sitter")
(version "2.0.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://stable.melpa.org/packages/meow-tree-sitter-" version
".tar"))
(sha256
(base32 "1sxa1flngzsj3hh3sp3kccwgsxq6d40wsn8vzgv0ahrxkz2s6fxg"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-meow))
(home-page "https://github.com/skissue/meow-tree-sitter")
(synopsis "Tree-sitter powered motions for Meow")
(description
"This package integrates the treesitter library in modern Emacs with
Meows motions.")
(license (list license:gpl3+ license:mpl2.0))))
(define-public emacs-xelb
(package
(name "emacs-xelb")
@@ -24999,91 +24975,36 @@ with Eglot.")
(define-public emacs-jabber
(package
(name "emacs-jabber")
(version "0.10.3")
(version "0.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.thanosapollo.org/emacs-jabber")
(commit version)))
(url "https://codeberg.org/emacs-jabber/emacs-jabber")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1v1a09h6ndqhkwyn44cnx1b0l4p155a09mfjrfmg62li50hvw1zm"))))
"0ain52p79sxll0bnsb4llfp1h4pqcqx3l6im4ibia06lg2aiqhpv"))))
(build-system emacs-build-system)
(arguments
(list
#:lisp-directory "lisp"
#:include #~(cons "^[^/]*\\.so$"
%default-include)
#:emacs emacs ;requires gnutls
#:test-command #~(list "make" "-C" ".." "test")
#:test-command #~(list "ert-runner" "../tests")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'build-native-module
(add-after 'unpack 'make-info
(lambda _
(invoke "make" "-C" "../src")))
(add-before 'build-native-module 'unpack-picomemo
(lambda _
(copy-recursively
#$(this-package-native-input
"emacs-jabber-picomemo")
"../src/picomemo")
(invoke "chmod" "--recursive" "u+w"
"../src/picomemo")))
(add-after 'unpack 'fix-test-runner
(lambda _
;; Replace grep -oP (Perl regex) with a
;; POSIX-compatible alternative so the test
;; runner counts results correctly.
(substitute* "../Makefile"
(("grep -oP '\\^Ran \\\\K\\[0-9\\]\\+'")
(string-append
"grep -o 'Ran [0-9]*'"
" | grep -o '[0-9]*'")))))
(add-after 'unpack 'disable-failing-tests
(lambda _
;; These 4 tests pass outside the build
;; environment but fail inside it.
(define skip "\n (skip-unless nil)")
(substitute*
"../tests/jabber-disco-tests.el"
((".*query-if-needed-cache-miss \\(\\)"
all)
(string-append all skip))
((".*process-caps-modern.*queries \\(\\)"
all)
(string-append all skip)))
(substitute*
(string-append
"../tests/"
"jabber-message-correct-tests.el")
((".*correct-last-uses-original-id \\(\\)"
all)
(string-append all skip))
((".*mam-syncing-skipped.*dispatch \\(\\)"
all)
(string-append all skip))))))))
(native-inputs
(list pkg-config
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mierenhoop/picomemo")
(commit "1.1.0")))
(file-name "emacs-jabber-picomemo")
(sha256
(base32
"044xd1gn9lpd5yrb3c1lmvqsc1chbkhd3vnh7800hxn23a0hxbzj")))))
(inputs (list mbedtls))
(propagated-inputs (list emacs-fsm))
(home-page "https://thanosapollo.org/projects/jabber/")
(invoke "makeinfo" "../jabber.texi"))))))
(native-inputs (list emacs-ert-runner texinfo))
(propagated-inputs (list emacs-fsm emacs-srv gnutls))
(home-page "https://codeberg.org/emacs-jabber/emacs-jabber")
(synopsis "XMPP (Jabber) client for Emacs")
(description
"@code{jabber.el} is an XMPP client for Emacs. XMPP (also known as
\"Jabber\") is an instant messaging system; see @url{https://xmpp.org} for
more information. It supports OMEMO end-to-end encryption via picomemo.")
(license (list license:gpl3+ ;gpl2+ elisp, gpl3+ C
license:isc)))) ;picomemo
more information.")
(license license:gpl2+)))
(define-public emacs-jarchive
(package
@@ -28222,7 +28143,7 @@ match and total match information in the mode-line in various search modes.")
(define-public emacs-pg
(package
(name "emacs-pg")
(version "0.6.4")
(version "0.63")
(source (origin
(method git-fetch)
(uri (git-reference (url "https://github.com/emarsden/pg-el")
@@ -28230,7 +28151,7 @@ match and total match information in the mode-line in various search modes.")
(file-name (git-file-name name version))
(sha256
(base32
"0w9a8y3s2dbmpqbbnxycxd38niqq2slzr26bfl4v1pfcm0w7skfz"))))
"19hh45mlb4j6a3ys3wvivj0bm5xy5vjwscnvn68b656b5jk5himh"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-peg))
(home-page "https://github.com/emarsden/pg-el")
@@ -41143,7 +41064,7 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
(define-public emacs-fj
(package
(name "emacs-fj")
(version "0.34")
(version "0.33")
(source
(origin
(method git-fetch)
@@ -41152,10 +41073,10 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l"))))
(base32 "0cfzw9shd6jjir9zqcqbsz8vidsvs609a58aakh54dylngp52qmh"))))
(build-system emacs-build-system)
(arguments (list #:tests? #f)) ;depends on exemplify-ert
(propagated-inputs (list emacs-fedi emacs-magit emacs-tp emacs-transient))
(propagated-inputs (list emacs-fedi emacs-magit emacs-tp))
(home-page "https://codeberg.org/martianh/fj.el")
(synopsis "Client for Forgejo instances")
(description
@@ -42216,10 +42137,10 @@ service, and connect it with Emacs via inter-process communication.")
(license license:gpl3+))))
(define-public emacs-telega
(let ((commit "8078beccf88c132d504ba9031062a6a2c65a1c8b"))
(let ((commit "805819bf81dffe2922e9e06ae02d58429d03aa1a"))
(package
(name "emacs-telega")
(version "0.8.620") ; see telega-version in telega.el
(version "0.8.601") ; see telega-version in telega.el
(source
(origin
(method git-fetch)
@@ -42227,7 +42148,7 @@ service, and connect it with Emacs via inter-process communication.")
(url "https://github.com/zevlg/telega.el")
(commit commit)))
(sha256
(base32 "1m7gs90hrmmwm7pvf5iz3y4v39psp6kbnw1d97q6v55hhgq3isxz"))
(base32 "0d02ymr5fw6fknzf9ikaky48swd9yfp5zn846zlwb5083p6bpmis"))
(file-name (git-file-name "emacs-telega" version))
(patches
(search-patches "emacs-telega-test-env.patch"))))
@@ -46682,7 +46603,7 @@ Fennel code within Emacs.")
(define-public emacs-org-modern
(package
(name "emacs-org-modern")
(version "1.13")
(version "1.12")
(source
(origin
(method git-fetch)
@@ -46690,18 +46611,10 @@ Fennel code within Emacs.")
(url "https://github.com/minad/org-modern")
(commit version)))
(sha256
(base32 "16i1nwdilhpjlphpbwi8vjfwfb721gm0mm37hjx570wx4sskvg30"))
(base32 "01p5k85hj677x2vk7j7a88gchp51ybiaj6iqmdhxivmcw3lb6ibi"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
(list
#:tests? #f ;no tests
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'makeinfo
(lambda _ (emacs-makeinfo))))))
(propagated-inputs (list emacs-compat))
(native-inputs (list texinfo))
(home-page "https://github.com/minad/org-modern")
(synopsis "Modern Org style")
(description
+27
View File
@@ -644,6 +644,32 @@ editor (console only)")
(description "This Emacs build implements graphical UI purely in terms
of GTK.")))
(define-public emacs-xwidgets
(package/inherit emacs
(name "emacs-xwidgets")
(synopsis "The extensible, customizable, self-documenting text
editor (with xwidgets support)")
(arguments
(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
#~(cons "--with-xwidgets" #$flags))))
(inputs
(modify-inputs inputs
(prepend webkitgtk-with-libsoup2 libxcomposite)))))
(define-public emacs-pgtk-xwidgets
(package
(inherit emacs-pgtk)
(name "emacs-pgtk-xwidgets")
(synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support")
(arguments
(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
#~(cons "--with-xwidgets" #$flags))))
(inputs
(modify-inputs inputs
(prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
(define-public emacs-lucid
(package/inherit emacs-no-x
(name "emacs-lucid")
@@ -748,6 +774,7 @@ editor (with wide ints)" )
(define-public emacs-next (emacs->emacs-next emacs))
(define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
(define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
(define-deprecated-package emacs-next-tree-sitter
emacs-next)
+21 -23
View File
@@ -65,7 +65,6 @@
#:use-module (gnu packages libffi)
#:use-module (gnu packages libftdi)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages messaging)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
@@ -2068,27 +2067,26 @@ operations.")
(license license:asl2.0)))
(define-public ts4900-utils
(package
(name "ts4900-utils")
(version "3.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/embeddedTS/ts4900-utils")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"08x40ii56v4cmnz9hk6rvjrc500k1bij5ns52360vczznc8lx8bx"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
automake
libgpiod
pkg-config))
(home-page "https://github.com/embeddedTS/ts4900-utils")
(synopsis "Utilities for the TS-4900 board family")
(description "This package contains utilities useful for boards of the
;; There are no proper release nor tag; use the latest commit.
(let ((revision "0")
(commit "e10a12f8050d1d1229e711c7cfab8a0d5d93ee58"))
(package
(name "ts4900-utils")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/embeddedTS/ts4900-utils")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1vr8i425qijbwgbc10av3wr35p3x11wy6y442w0ja0yny7si8wp8"))))
(build-system gnu-build-system)
(native-inputs (list autoconf automake))
(home-page "https://github.com/embeddedTS/ts4900-utils")
(synopsis "Utilities for the TS-4900 board family")
(description "This package contains utilities useful for boards of the
TS-4900 family. The included commands are:
@itemize @code
@item adc8390
@@ -2101,7 +2099,7 @@ TS-4900 family. The included commands are:
@item tsmicroupdate
@item tssilomon
@end itemize")
(license license:bsd-2)))
(license license:bsd-2))))
(define-public cc-tool
(package
+2 -2
View File
@@ -186,7 +186,7 @@ testing InfiniBand networks.")
(define-public ucx
(package
(name "ucx")
(version "1.20.0")
(version "1.19.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -196,7 +196,7 @@ testing InfiniBand networks.")
(patches (search-patches "ucx-tcp-iface-ioctl.patch"))
(sha256
(base32
"12w1mxacml1w8zvl1hpn786cs77y056b9hxv7q1kq482bgc2si0v"))
"12j9200iyg6d0yr84r25hcpq8qqzfaa08klbhvgrqpflpfcljz4z"))
(snippet
;; As seen in commit b0a275a5492125a13020cd095fe9934e0b5e7c6a.
#~(begin (use-modules (guix build utils))
+32 -39
View File
@@ -34,7 +34,6 @@
#:use-module (gnu packages anthy)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages curl)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages dictionaries)
@@ -96,7 +95,7 @@ client.")
(define-public fcitx5
(package
(name "fcitx5")
(version "5.1.19")
(version "5.1.16")
(source
(origin
(method url-fetch)
@@ -104,14 +103,9 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.zst"))
(sha256
(base32 "1ngsadqdrwy99w63dmk493gg56j7r991v6pq1nwkx6apib9ykpc0"))
(snippet
#~(begin
(use-modules (guix build utils))
(delete-file-recursively "third_party")))))
(base32 "0lwp90wjrkiws121rqn9kzdz6p1ncsk18dkmbv0zi37yqx2mv180"))))
(arguments
(list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF"
"-DUSE_SYSTEM_YOGA=ON")))
(list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF")))
(build-system cmake-build-system)
(inputs
(list cairo
@@ -124,12 +118,12 @@ client.")
gettext-minimal
glib
iso-codes/pinned
json-c
libevent
libuv
libxcb
libxkbcommon
libxkbfile
nlohmann-json
pango
`(,util-linux "lib") ;For libuuid.
wayland
@@ -138,8 +132,7 @@ client.")
xcb-util
xcb-util-keysyms
xcb-util-wm
xkeyboard-config
yoga))
xkeyboard-config))
(native-inputs
(list extra-cmake-modules
zstd
@@ -161,7 +154,7 @@ client.")
(define-public fcitx5-lua
(package
(name "fcitx5-lua")
(version "5.0.16")
(version "5.0.15")
(source
(origin
(method url-fetch)
@@ -169,7 +162,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
version ".tar.zst"))
(sha256
(base32 "1zjiyadhqq8hijjv09khyj2shaw3ri4jgmb1ql67w9366wd0ykj2"))))
(base32 "1yp5z97m8n7fwvxps1gn8pflg69j3yawgabz36bpd4wl43zkgchg"))))
(build-system cmake-build-system)
(arguments
(list
@@ -178,7 +171,7 @@ client.")
(inputs
(list fcitx5 lua gettext-minimal))
(native-inputs
(list extra-cmake-modules pkg-config))
(list extra-cmake-modules))
(home-page "https://github.com/fcitx/fcitx5-lua")
(synopsis "Lua support for Fcitx 5")
(description "Fcitx5-lua allows writing Fcitx5 extension in Lua.")
@@ -187,14 +180,14 @@ client.")
(define-public libime
(package
(name "libime")
(version "1.1.14")
(version "1.1.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.zst"))
(sha256
(base32 "17r54fd6whvcxn389k4ah9mj1fc61zgama5nhiv1ilx40n1hnnpv"))))
(base32 "02n6xbbxfckzx5sqrclnh4cvqlnj9c5rpys07kd8r8m51paqzigq"))))
(build-system cmake-build-system)
(inputs
(list fcitx5 boost (list zstd "lib")))
@@ -209,7 +202,7 @@ editors.")
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
(version "5.1.6")
(version "5.1.4")
(source
(origin
(method url-fetch)
@@ -217,7 +210,7 @@ editors.")
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.zst"))
(sha256
(base32 "0qj5gjdnrxcyz6a455b4379iwnzazw5a6c6dyk6wz0d2bgainc75"))))
(base32 "0lwl17mbfm3pxpd3y7h4sxf77npr16hyzygrc7a6v26bx6ycbkqx"))))
(build-system cmake-build-system)
(arguments
(list
@@ -331,7 +324,7 @@ IM module for GTK+3 applications.
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
(version "5.1.13")
(version "5.1.11")
(source
(origin
(method url-fetch)
@@ -339,7 +332,7 @@ IM module for GTK+3 applications.
"/fcitx5-qt/fcitx5-qt-"
version ".tar.zst"))
(sha256
(base32 "1yawhwnycrqp1flik3hc2vskvsyjfm6rkcdhsqnawix22r2n1wl0"))))
(base32 "0mc396zfafs34jraj9fdk0wyzvdzg4xi605rhrd492xcpf25b59v"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags
@@ -370,7 +363,7 @@ for Qt based application.")
(define-public fcitx5-anthy
(package
(name "fcitx5-anthy")
(version "5.1.10")
(version "5.1.8")
(source
(origin
(method url-fetch)
@@ -378,7 +371,7 @@ for Qt based application.")
"/fcitx5-anthy/fcitx5-anthy-"
version ".tar.zst"))
(sha256
(base32 "11h7b687xj2k1hp7dqj6wh5y6i55cm8m5pqbi5vbflgg0cy5v1mp"))))
(base32 "1kv930nxz6q8ijb319fnnkzdyigbi36f2cwijnv4sy3rd0nykxrv"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;; no tests
@@ -394,7 +387,7 @@ the Anthy input method.")
(define-public fcitx5-skk
(package
(name "fcitx5-skk")
(version "5.1.10")
(version "5.1.8")
(source
(origin
(method git-fetch)
@@ -403,14 +396,14 @@ the Anthy input method.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1fjiyx6dyiqxlypr1k4024lnc077xsnx4qwrwx9hj3yjdni5f2p0"))))
(base32 "11h6y7rv6yppp7iy8csy7r2pi2mlnjgl8h4h8ghfwab1gm7v32fn"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f ; no tests
#:configure-flags
#~(list (string-append "-DSKK_PATH="
#~(list (string-append "-DSKK_DEFAULT_PATH="
#$(this-package-input "skk-jisyo")
"/share/skk"))))
"/share/skk/SKK-JISYO.L"))))
(native-inputs
(list extra-cmake-modules gobject-introspection
pkg-config gettext-minimal))
@@ -430,14 +423,14 @@ backend.")
(define-public fcitx5-unikey
(package
(name "fcitx5-unikey")
(version "5.1.10")
(version "5.1.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fcitx/fcitx5-unikey")
(commit version)))
(sha256
(base32 "1ddg5648r8jbdr8khawfhl26020snvrlgjwppw5rlh4iw3a4m143"))
(base32 "1nai5v6r367iwj8yxg4flv41my57l88l9vy0id9wr3hvrvls9v31"))
(file-name (git-file-name name version))))
(build-system qt-build-system)
(arguments
@@ -457,14 +450,14 @@ backend.")
(define-public fcitx5-chewing
(package
(name "fcitx5-chewing")
(version "5.1.11")
(version "5.1.9")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fcitx/fcitx5-chewing")
(commit version)))
(sha256
(base32 "1x4a4vcb7vg9dx0f2bjrb2v6dcr8cwxnm8gdd47fkxqn890rgrnc"))
(base32 "1mgpxvmxfbqy8gymdsdmspgknh0pc751dm5rsrvdvfbd5lsa6pn6"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
@@ -486,7 +479,7 @@ backend.")
(define-public fcitx5-chinese-addons
(package
(name "fcitx5-chinese-addons")
(version "5.1.12")
(version "5.1.10")
(source
(origin
(method url-fetch)
@@ -494,7 +487,7 @@ backend.")
"/fcitx5-chinese-addons/fcitx5-chinese-addons-"
version "_dict.tar.zst"))
(sha256
(base32 "09kk8r6pcxjhivwv4z5cdv2pqy0ry8ngnfbrcmwagzyq2jq9p2cr"))))
(base32 "11gnywigqys3gndb175nxk10k1ld3xvwd6kggqnxs95imc2004dd"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags
@@ -547,7 +540,7 @@ including input methods previous bundled inside Fcitx 4:
(define-public fcitx5-configtool
(package
(name "fcitx5-configtool")
(version "5.1.13")
(version "5.1.11")
(source
(origin
(method url-fetch)
@@ -555,7 +548,7 @@ including input methods previous bundled inside Fcitx 4:
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.zst"))
(sha256
(base32 "1sr8ri68qbkgvnj9pr5yw680zq506h26ymfmyz7ihw5ri14a6klr"))))
(base32 "1c5pw6p33z7lyk16jr1w72snazdc4q83ywn0gsk68qgmmfql5qr1"))))
(build-system qt-build-system)
(arguments
(list #:qtbase qtbase
@@ -668,7 +661,7 @@ for Fcitx 5 with following color variants:
(define-public fcitx5-rime
(package
(name "fcitx5-rime")
(version "5.1.13")
(version "5.1.12")
(source (origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5"
@@ -676,7 +669,7 @@ for Fcitx 5 with following color variants:
".tar.zst"))
(sha256
(base32
"03wcdgdhkvw5341vjv3idyksykm65y0873vkcrsi16dsp8w0h7i8"))))
"1blqfk8zpzd5v2r7gwjy12jbnsh26pcvad8q4mmhlg5j10yppg03"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ;no tests
@@ -707,7 +700,7 @@ output.")
(define-public fcitx5-hangul
(package
(name "fcitx5-hangul")
(version "5.1.9")
(version "5.1.7")
(source
(origin
(method git-fetch)
@@ -716,7 +709,7 @@ output.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0ja5faara4xz8waccpa5gbi3prh02hh3gpf915czhbkihffby6ng"))))
(base32 "02lkbwg25jr4hazjyxcy69midfsmxc0ksbdrfwbmqcfa3kz5d9gb"))))
(build-system cmake-build-system)
(native-inputs (list extra-cmake-modules pkg-config gettext-minimal))
(inputs (list fcitx5 libhangul))
-1
View File
@@ -52,7 +52,6 @@
(uri (git-reference
(url "https://github.com/fltk/fltk")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0pnifyhhvcqfjd6iaa4m14kvfyqhjjdw0aqbcizcdhhqrl6q4pjg"))))
(build-system gnu-build-system)
+6 -8
View File
@@ -28,8 +28,7 @@
#:use-module (gnu packages libffi)
#:use-module (gnu packages maths)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build))
#:use-module (gnu packages python))
;;; Please: Try to add new module packages in alphabetic order.
;;;
@@ -145,7 +144,7 @@ a.s.o.
(define-public fortran-mctc-lib
(package
(name "fortran-mctc-lib")
(version "0.5.1")
(version "0.3.2")
(source
(origin
(method git-fetch)
@@ -155,7 +154,7 @@ a.s.o.
(file-name (git-file-name name version))
(sha256
(base32
"1wp8apv0psl2hkhlrd5pgnhbxk8zpxa0ijkhcnb09klbxcsi8p5f"))))
"1gabdxllx2pcw1mbv4gw9zpn6817ikz9ql8xs9w86wswd6f0m5kl"))))
(build-system meson-build-system)
(arguments
(list
@@ -244,7 +243,7 @@ calculate partial charges used in the DFT-D4 model.")
(define-public fortran-simple-dftd3
(package
(name "fortran-simple-dftd3")
(version "1.3.0")
(version "1.2.1")
(source
(origin
(method git-fetch)
@@ -253,7 +252,7 @@ calculate partial charges used in the DFT-D4 model.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1602pwmxa8qjllgj7k9hq2bm4s838f6qzr7mpc0rbh28gm00c1fw"))))
(base32 "0aygmnax3vwz2x3ad7syksfjca4zc85nyslsibs0wg8wqfsmr33k"))))
(build-system meson-build-system)
(arguments
(list
@@ -266,8 +265,7 @@ calculate partial charges used in the DFT-D4 model.")
(list gfortran
pkg-config
python-minimal
python-cffi
python-setuptools))
python-cffi))
(inputs
(list fortran-mctc-lib
fortran-mstore
+1 -17
View File
@@ -92,7 +92,6 @@
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system qt)
#:use-module (ice-9 match)
#:use-module (guix build-system meson)
#:use-module (srfi srfi-1))
@@ -935,22 +934,7 @@ software.")))
(inherit pinentry-tty)
(name "pinentry-qt")
(arguments
(list #:configure-flags
#~(list "--enable-fallback-curses")
#:imported-modules
(append %default-gnu-imported-modules
%qt-build-system-modules)
#:modules
'((guix build utils)
(guix build gnu-build-system)
((guix build qt-build-system) #:prefix qt:))
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'qt-wrap
(lambda args
(apply (assoc-ref qt:%standard-phases 'qt-wrap)
#:qtbase #$(this-package-input "qtbase")
args))))))
`(#:configure-flags '("--enable-fallback-curses")))
(inputs
(modify-inputs inputs
(prepend qtbase qtwayland)))
+46 -44
View File
@@ -117,7 +117,7 @@ GCC runtime.
(define-public windowmaker
(package
(name "windowmaker")
(version "0.96.0")
(version "0.95.9")
(synopsis "NeXTSTEP-like window manager")
(source (origin
(method url-fetch)
@@ -126,58 +126,60 @@ GCC runtime.
"wmaker-" version "/WindowMaker-" version ".tar.gz"))
(sha256
(base32
"0vbgjbqnv2gcpimnrh2fc383gxcdfhgz1j3f2lfa4jng4fx31qag"))))
"055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"))))
(build-system gnu-build-system)
(arguments
(list
#:modules '((guix build gnu-build-system)
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 match))
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _
;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
;; and the 'wmsetbg', so make sure it uses the right ones.
;; We can't use a wrapper here because that would pollute
;; $PATH in the whole session.
(let* ((bin (string-append #$output "/bin")))
(substitute* "src/main.c"
(("\"wmaker\\.inst")
(string-append "\"" bin "/wmaker.inst")))
(substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
(("\"wmsetbg")
(string-append "\"" bin "/wmsetbg")))
;; Add enough cells to the command character array to
;; allow passing our large path to the wmsetbg binary.
;; The path to wmsetbg in Guix requires 67 extra characters.
(substitute* "src/defaults.c"
(("len = strlen\\(text\\) \\+ 40;")
(string-append "len = strlen(text) + 107;"))))))
(add-after 'install 'install-xsession
(lambda _
(let* ((xsessions (string-append #$output "/share/xsessions")))
(mkdir-p xsessions)
(call-with-output-file
(string-append xsessions "/windowmaker.desktop")
(lambda (port)
(format port "~
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys)
;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
;; and the 'wmsetbg', so make sure it uses the right ones.
;; We can't use a wrapper here because that would pollute
;; $PATH in the whole session.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(substitute* "src/main.c"
(("\"wmaker\\.inst")
(string-append "\"" bin "/wmaker.inst")))
(substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
(("\"wmsetbg")
(string-append "\"" bin "/wmsetbg")))
;; Add enough cells to the command character array to
;; allow passing our large path to the wmsetbg binary.
;; The path to wmsetbg in Guix requires 67 extra characters.
(substitute* "src/defaults.c"
(("len = strlen\\(text\\) \\+ 40;")
(string-append "len = strlen(text) + 107;"))))))
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(xsessions (string-append out "/share/xsessions")))
(mkdir-p xsessions)
(call-with-output-file
(string-append xsessions "/windowmaker.desktop")
(lambda (port)
(format port "~
[Desktop Entry]~@
Name=Window Maker~@
Comment=~a~@
Exec=~a/bin/wmaker~@
Type=Application~%"
(string-map (match-lambda
(#\newline #\space)
(chr chr))
#$synopsis) #$output))))))
(add-after 'install-xsession 'wrap
(lambda _
(let* ((bin (string-append #$output "/bin")))
;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
;; etc., so make sure everything is in $PATH.
(wrap-program (string-append bin "/wmaker.inst")
`("PATH" ":" prefix (,bin)))))))))
(string-map (match-lambda
(#\newline #\space)
(chr chr))
,synopsis) out))))))
(add-after 'install-xsession 'wrap
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
;; etc., so make sure everything is in $PATH.
(wrap-program (string-append bin "/wmaker.inst")
`("PATH" ":" prefix (,bin)))))))))
(inputs
(list bash-minimal ;for wrap-program
fontconfig
+3 -3
View File
@@ -181,7 +181,7 @@ collections like from @code{container/tree}.
"This package provides a library for calling C functions from Go without
Cgo.
Features:
Featues:
@itemize
@item build for other platforms easily without a C compiler
@item efficiently cache entirely Go builds
@@ -1042,7 +1042,7 @@ compile does not support generics.")
(list
#:skip-build? #t
#:import-path "golang.org/x/mod"
;; Test tries to access:
;; Test tries to acces:
;; "http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth": dial tcp:
;; lookup ct.googleapis.com
#:test-flags #~(list "-skip" "TestCertificateTransparency")))
@@ -1712,7 +1712,7 @@ values.")
(license license:bsd-3)))
(define-public go-google-golang-org-genproto-googleapis-rpc
;; No release or version tags, use the latest commit.
;; No release or verion tags, use the latest commit.
(let ((commit "49b9836ed3ff1e1dd329d17e442987447e931c7d")
(revision "1"))
(package
+5 -76
View File
@@ -127,7 +127,7 @@ value and call @code{t.Fatal()} if the assertion fails.")
(description
"Correct is a collection of assertion libraries for Golang, intended to be
used together. It tries not to strictly enforce that, though - most of
correct should be customizable either by changing some options or by using
correct should be customizeable either by changing some options or by using
only some sub-packages of correct.")
(license license:mpl2.0)))
@@ -1195,7 +1195,7 @@ when comparing complex types like structures and maps.")
(home-page "https://github.com/go-testfixtures/testfixtures")
(synopsis "Ruby on Rails like test fixtures for Go")
(description
"This package mimics the
"Ths package mimics the
@url{http://guides.rubyonrails.org/testing.html#the-test-database, Ruby on
Rails' way} of writing tests for database applications, where sample data is
kept in fixtures files. Before the execution of every test, the test database
@@ -1462,7 +1462,7 @@ Node @code{nock} library, it has features like:
@item Supports map and filters to handle mocks easily
@item Wide compatible HTTP interceptor using @code{http.RoundTripper} interface
@item Works with any @code{net/http} compatible client, such as @code{gentleman}
@item Network timeout/cancellation delay simulation
@item Network timeout/cancelation delay simulation
@item Extensible and hackable API
@end itemize")
(license license:expat)))
@@ -1871,7 +1871,7 @@ differently.")
(with-directory-excursion (string-append "src/" import-path)
(delete-file-recursively "example"))))
(add-after 'unpack 'preserve-PATH-from-environment
;; Unlike FHS systems, Guix needs to look for its commands in PATH.
;; Unlike FHS systems, Guix needs to look its commands fom PATH.
;; Expose it by default in the test environments.
(lambda* (#:key tests? import-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" import-path)
@@ -2254,45 +2254,6 @@ can be used in test code as a mock of the interface.")
Perl's @url{https://metacpan.org/pod/Test::Deep, Test::Deep perl}.")
(license license:bsd-2)))
(define-public go-github-com-maxbrunsfeld-counterfeiter-v6
(package
(name "go-github-com-maxbrunsfeld-counterfeiter")
(version "6.12.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/maxbrunsfeld/counterfeiter")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0c4a8gcm3l992vydldcfsvb2jk4spnmxsk2i4klqh4fpagbpa069"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/maxbrunsfeld/counterfeiter/v6"
#:test-flags
#~(list "-skip" "TestIntegration")
#:test-subdirs
#~(list "." "arguments" "command" "generator" "integration")
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'go-generate
(lambda* (#:key import-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" import-path)
(invoke "go" "generate" "-v" "-n" "./...")))))))
(native-inputs
(list go-github-com-onsi-gomega
go-github-com-sclevine-spec
go-golang-org-x-text
go-golang-org-x-tools))
(home-page "https://github.com/maxbrunsfeld/counterfeiter")
(synopsis "Generate self-contained, type-safe test doubles in Go")
(description
"This package provides fake implementations of the object's
collaborators.")
(license license:expat)))
(define-public go-github-com-mfridman-tparse
(package
(name "go-github-com-mfridman-tparse")
@@ -2372,7 +2333,7 @@ output.")
(home-page "https://github.com/modocache/gover")
(synopsis "Integration with coveralls.io for *.coverprofile files")
(description
"This package implements a functionality to collect all
"This package inplements a functionality to collect all
@code{.coverprofile} files rooted in the project and concatenante them into a
single file ready for https://coveralls.io/.")
(license license:asl2.0)))
@@ -2742,31 +2703,6 @@ GIT_TRACE mechanism.")
"This package provides tools for detecting deadlocks at run-time in Go.")
(license license:asl2.0)))
(define-public go-github-com-sclevine-spec
(package
(name "go-github-com-sclevine-spec")
(version "1.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sclevine/spec")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0y3rqb7dd51qnw5ns7w5sy93879ybnlg6gwslbv5mkfnrk0gl7na"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/sclevine/spec"))
(home-page "https://github.com/sclevine/spec")
(synopsis "BDD-style test organizer for Go")
(description
"Spec is a simple BDD test organizer for Go. It minimally extends the
standard library @code{testing} package by facilitating easy organization of
Go 1.7+ @url{https://blog.golang.org/subtests, subtests}.")
(license license:asl2.0)))
(define-public go-github-com-shabbyrobe-gocovmerge
(package
(name "go-github-com-shabbyrobe-gocovmerge")
@@ -3643,13 +3579,6 @@ the source code, it only prints out style mistakes.")
(propagated-inputs
(list go-go-yaml-in-yaml-v4))))
(define-public go-gopkg-in-h2non-gock-v1
(package/inherit go-github-com-h2non-gock
(name "go-gopkg-in-h2non-gock-v1")
(arguments
(substitute-keyword-arguments arguments
((#:import-path _) "gopkg.in/h2non/gock.v1")))))
(define-public go-gopkg-in-go-playground-assert-v1
(package
(inherit go-github-com-go-playground-assert-v2)
+1 -197
View File
@@ -1444,43 +1444,6 @@ providing bidirectional mapping values to their names, plus enum convenience
for values.")
(license license:bsd-3)))
(define-public go-github-com-getsops-gopgagent
(package
(name "go-github-com-getsops-gopgagent")
(version "0.0.0-20241224165529-7044f28e491e")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/getsops/gopgagent")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "1n1r7jkb48y06jw2dhkaqs33j6qgwf9fvbisd1zsr6v2k7wgfvf3"))
(modules '((guix build utils)))
(snippet
#~(begin
(for-each
(lambda (f)
;; XXX: Without this snippet the build fails with
;; code in directory github.com/getsops/gopgagent
;; expects import "go.mozilla.org/gopgagent"
(substitute* f
(("import \"go\\.mozilla\\.org/gopgagent\"") "")))
'("gpgagent.go" "gpgagent_test.go"))
#t))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/getsops/gopgagent"
#:test-flags #~(list "-vet=off")))
(home-page "https://github.com/getsops/gopgagent")
(synopsis "GPG Agent helpers for Go")
(description
"This package provides an API to interact with the local GPG Agent from
Golang.")
(license license:asl2.0)))
(define-public go-github-com-gliderlabs-ssh
(package
(name "go-github-com-gliderlabs-ssh")
@@ -1748,35 +1711,6 @@ See http://keccak.noekeon.org.")
MurmurHash} revision (aka MurmurHash3).")
(license license:bsd-3)))
(define-public go-github-com-hiddeco-sshsig
(package
(name "go-github-com-hiddeco-sshsig")
(version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hiddeco/sshsig")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1raq5j1hr693lcj7nrj3wnsyfp30w96apjxyjmlvxb7ihnkhikv1"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/hiddeco/sshsig"))
(native-inputs
(list go-github-com-stretchr-testify))
(propagated-inputs
(list go-golang-org-x-crypto))
(home-page "https://github.com/hiddeco/sshsig")
(synopsis "Messages signing and verification using SSH in Golang")
(description
"Package sshsig provides an API to sign and verify messages using SSH
keys. It is an implementation of the SSH Signature format as described in
@url{https://github.com/openssh/openssh-portable/blob/V_9_3_P1/PROTOCOL.sshsig}.")
(license license:asl2.0)))
(define-public go-github-com-jcmturner-aescts-v2
(package
(name "go-github-com-jcmturner-aescts-v2")
@@ -2017,7 +1951,7 @@ hash.")
(description
"Package ssh wraps the @code{crypto/ssh} package with a higher-level API
for building SSH servers. The goal of the API was to make it as simple as
using net/http, so the API is very similar. It's alternative fork of
using net/http, so the API is very similar. It's alternaive fork of
@url{https://github.com/gliderlabs/ssh}.")
(license license:bsd-3)))
@@ -3816,123 +3750,6 @@ is an extremely fast non-cryptographic hash algorithm.")
@url{https://en.wikipedia.org/wiki/RC2, RC2} Cipher in Golang.")
(license license:asl2.0)))
(define-public go-github-com-zmap-zcertificate
(package
(name "go-github-com-zmap-zcertificate")
(version "0.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zmap/zcertificate")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1lxayyxb0gvls1l05jglqdf8b7zxz3gw94kwbgxvshs7lc0s6hnw"))))
(build-system go-build-system)
(arguments
(list
;; XXX: Source only, to break cycle with
;; go-github-com-zmap-zcrypto. Addintional inputs requaired only to
;; build CLI:
;;
;; - github.com/sirupsen/logrus
;; - github.com/zmap/zcrypto
;; - github.com/zmap/zlint/v3
#:skip-build? #t
#:tests? #f
#:import-path "github.com/zmap/zcertificate"))
(home-page "https://github.com/zmap/zcertificate")
(synopsis "ZCertificate")
(description "ZCertificate parses X.509 certificates and runs
@@url{https://github.com/zmap/zlint,ZLint}.")
(license license:asl2.0)))
(define-public go-github-com-zmap-zcrypto
(package
(name "go-github-com-zmap-zcrypto")
(version "0.0.0-20260309174858-0e3c42de5a13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zmap/zcrypto")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "0vbgpr2jms9la1nrzxwcfn6ngi3c2pzglh3a3yfkm0ahxvh4wpca"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/zmap/zcrypto"
#:test-flags
;; Network access is required.
#~(list "-skip" (string-join
(list "TestFetchRemote"
"TestVerifyHostname"
"TestTLSVersions"
"TestCipherSuitesBadSSL")
"|"))))
(native-inputs
(list go-github-com-stretchr-testify
go-gopkg-in-check-v1))
(propagated-inputs
(list go-github-com-mreiferson-go-httpclient
go-github-com-op-go-logging
go-github-com-sirupsen-logrus
go-github-com-weppos-publicsuffix-go
go-github-com-zmap-zcertificate
go-golang-org-x-crypto
go-golang-org-x-net))
(home-page "https://github.com/zmap/zcrypto")
(synopsis "Liberal Go TLS + X.509 Library for Research")
(description
"ZCrypto is a research and data collection cryptography library, designed
to be used for measuring and analyzing cryptographic deployments on the
Internet. It is largely centered around the @code{WebPKI}.")
;; See LICENSE file for more details.
(license (list license:asl2.0 license:expat license:isc))))
(define-public go-github-com-zmap-zlint-v3
(package
(name "go-github-com-zmap-zlint-v3")
(version "3.6.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zmap/zlint")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "054ddx6xdzhdjd214kp3kby0q5w4z1d4n61fav5vz73afm4z4bij"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/zmap/zlint/v3"
#:unpack-path "github.com/zmap/zlint"
#:build-flags
#~(list (string-append "-ldflags=-X main.version=" #$version))
#:test-flags
;; gen_test.go:236: exec: "git": executable file not found in $PATH
#~(list "-skip" "TestGetTestData|TestSaveCert")))
(propagated-inputs
(list go-github-com-pelletier-go-toml
go-github-com-sirupsen-logrus
go-github-com-zmap-zcrypto
go-golang-org-x-crypto
go-golang-org-x-net
go-golang-org-x-text))
(home-page "https://github.com/zmap/zlint")
(synopsis "X.509 Certificate Linter")
(description
"ZLint is a X.509 certificate linter that checks for consistency with
standards (e.g. @url{https://www.ietf.org/rfc/rfc5280.txt, RFC 5280}) and
other relevant PKI requirements (e.g.
@url{https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.4.8.pdf,
CA/Browser Forum Baseline Requirements}).")
(license license:asl2.0)))
(define-public go-gitlab-com-nyarla-go-crypt
(package
(name "go-gitlab-com-nyarla-go-crypt")
@@ -4412,19 +4229,6 @@ traffic.")))
+utility to convert SSH RSA keys to GPG keys.")
(license license:expat)))
(define-public zlint
(package/inherit go-github-com-zmap-zlint-v3
(name "zlint")
(arguments
(substitute-keyword-arguments arguments
((#:tests? _ #t) #f)
((#:skip-build? _ #t) #f)
((#:install-source? _ #t) #f)
((#:import-path _) "github.com/zmap/zlint/v3/cmd/zlint")))
(native-inputs (package-propagated-inputs go-github-com-zmap-zlint-v3))
(propagated-inputs '())
(inputs '())))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
-109
View File
@@ -295,115 +295,6 @@ using the Git pkt-line format used in various Git operations.")
(replace "go-github-com-go-git-gcfg"
go-github-com-go-git-gcfg-v2))))))
(define-public go-github-com-cli-go-gh-v2
(package
(name "go-github-com-cli-go-gh-v2")
(version "2.13.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cli/go-gh")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1a918ll60h65abs14mpnclk1w3468mi7khasixif04ihxd0rcsns"))))
(build-system go-build-system)
(arguments
(list
#:skip-build? #t
#:import-path "github.com/cli/go-gh/v2"
#:embed-files #~(list ".*\\.xml")
;; Network access or git configuration are required.
#:test-flags #~(list "-skip" "TestRemotes|TestNewHTTPClient")))
(native-inputs
(list go-github-com-alecthomas-chroma-v2
go-github-com-leaanthony-go-ansi-parser
go-github-com-stretchr-testify
go-gopkg-in-h2non-gock-v1))
(propagated-inputs
(list go-github-com-alecaivazis-survey-v2
go-github-com-charmbracelet-glamour
go-github-com-charmbracelet-lipgloss
go-github-com-cli-browser
go-github-com-cli-safeexec
go-github-com-cli-shurcool-graphql
go-github-com-google-shlex
go-github-com-henvic-httpretty
go-github-com-itchyny-gojq
go-github-com-makenowjust-heredoc
go-github-com-masterminds-sprig-v3
go-github-com-mgutz-ansi
go-github-com-muesli-reflow
go-github-com-muesli-termenv
go-github-com-thlib-go-timezone-local
go-golang-org-x-term
go-golang-org-x-text
go-gopkg-in-yaml-v3))
(home-page "https://github.com/cli/go-gh")
(synopsis "Go library for the GitHub CLI")
(description
"Package gh is a library for CLI Go applications to help interface with
the gh CLI tool, and the @code{GitHub} API.")
(license license:expat)))
(define-public go-github-com-cli-go-internal
(package
(name "go-github-com-cli-go-internal")
(version "0.0.0-20241025142207-6c48bcd5ce24")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cli/go-internal")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "1s2rnmsdj22hg8hz9xv2fj1vs1k9xfz8rvz9bm1cg3ddq33hl4a5"))))
(build-system go-build-system)
(arguments
(list
#:skip-build? #t
#:import-path "github.com/cli/go-internal"
#:test-flags
;; TestSimple/cover requires network access to proxy.golang.org.
#~(list "-skip" "TestSimple/cover")))
(propagated-inputs
(list go-golang-org-x-mod
go-golang-org-x-sys
go-golang-org-x-tools))
(home-page "https://github.com/cli/go-internal")
(synopsis "Internal utilities for GitHub CLI")
(description
"This package provides internal utilities for the GitHub CLI. It is a
hard fork of @code{testscript} to allow the @code{gh} maintainers to explore
its use while providing flexibility for modifications and extensions.")
(license license:bsd-3)))
(define-public go-github-com-cli-shurcool-graphql
(package
(name "go-github-com-cli-shurcool-graphql")
(version "0.0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cli/shurcooL-graphql")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0w5ixfr4ia35n8adadr2rsca3f04bq36fxkgh27fw7rd0mxf199l"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/cli/shurcooL-graphql"))
(home-page "https://github.com/cli/shurcooL-graphql")
(synopsis "GraphQL client implementation for GitHub CLI")
(description
"This package provides a GraphQL client implementation forked from
@code{shurcooL/graphql}, customized for use in the GitHub CLI.")
(license license:expat)))
(define-public go-github-com-jiangxin-goconfig
(package
(name "go-github-com-jiangxin-goconfig")
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+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.
+46 -12
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")
@@ -2183,9 +2190,11 @@ and routines to assist in editing internationalized text.")
(license license:lgpl2.1+)))
(define-public girara
;; TODO: Move propagated inputs to inputs after core-updates is merged (as
;; of 2024-03)
(package
(name "girara")
(version "2026.02.04")
(version "0.4.5")
(source
(origin
(method git-fetch)
@@ -2194,10 +2203,35 @@ and routines to assist in editing internationalized text.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "04adir5a8g2hqgv4vzpg52i2524abpcrqf3fcffrbwp8syan0df1"))))
(base32 "04igidbihgq5k7fh0jd5n26w00qlb47riky6q7qlp5k314d6cd2y"))))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'start-xserver
;; Tests require a running X server.
(lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server"))
(display ":1"))
(setenv "DISPLAY" display)
;; On busy machines, tests may take longer than
;; the default of four seconds.
(setenv "CK_DEFAULT_TIMEOUT" "20")
;; Don't fail due to missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
(zero? (system (string-append xorg-server "/bin/Xvfb "
display " &")))))))))
(native-inputs
(list pkg-config
check
gettext-minimal
`(,glib "bin")
xorg-server-for-tests))
;; Listed in 'Requires.private' of 'girara.pc'.
(propagated-inputs (list gtk+ json-glib))
(build-system meson-build-system)
(native-inputs (list pkg-config))
(inputs (list glib))
(home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces")
(description "Girara is a library that implements a user interface that
+2 -2
View File
@@ -7590,7 +7590,7 @@ with a FSM is being built (for example, from a Makefile.)")
(define-public guile-ini
(package
(name "guile-ini")
(version "1.0.0")
(version "0.5.6")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7599,7 +7599,7 @@ with a FSM is being built (for example, from a Makefile.)")
(file-name (string-append name "-" version))
(sha256
(base32
"12mfch7dznx67r5zw88pp4ma3pw6akif7kdr0kak1gvawgfy277y"))))
"0mz7mpcf6q1z9j9ydz1ngr4hglci3ghmharv1isx9wgby3l2dcf5"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
+3 -3
View File
@@ -856,17 +856,17 @@ Guile's foreign function interface.")
(define-public guile-bytestructures
(package
(name "guile-bytestructures")
(version "2.0.2")
(version "1.0.10")
(home-page "https://github.com/TaylanUB/scheme-bytestructures")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1dyhf39s16q3fvps0mfb65xrlcb8rk8m5kc82ngkwhzmf1svalpc"))))
"14k50jln32kkxv41hvsdgjkkfj6xlv06vc1caz01qkgk1fzh72nk"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
-2
View File
@@ -518,8 +518,6 @@ Japanese language input in most graphical applications.")
(arguments
(list
#:tests? #f ;no tests
#:configure-flags
#~(list "CFLAGS=-Wno-error=incompatible-pointer-types")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-skk-jisyo
+72 -34
View File
@@ -75,26 +75,33 @@
(define-public babeltrace
(package
(name "babeltrace")
(version "2.1.2")
(version "2.0.5")
(source (origin
(method url-fetch)
(uri (string-append "https://www.efficios.com/files/babeltrace/babeltrace2-"
version ".tar.bz2"))
(sha256
(base32 "171cn0y6qbixqggbw7minf4ggfa1j5yc0a1bsj5rnrxd6k93z0qj"))))
(base32 "1d7jxljbfb4y8jmxm7744ndhh9k9rw8qhmnljb19wz7flzr9x3vv"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; FIXME - When Python's bindings are enabled, tests do not
; pass.
#:make-flags
,#~(list
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
"DISTSETUPOPTS=--single-version-externally-managed") ;no .egg files
#:configure-flags
'("--enable-debug-info"
"--enable-man-pages"
"--enable-python-bindings"
"--enable-python-plugins")
))
#:phases
(modify-phases %standard-phases
;; These are recommended in the project's README for a development
;; build configuration.
(add-after 'unpack 'reconfigure
(lambda _
(delete-file "configure"))))))
(inputs
(list glib))
;; NOTE - elfutils is used for the LTTng debug information filter
@@ -103,15 +110,30 @@
;; `#:configure-flags`.
(propagated-inputs
(list elfutils))
;; NOTE - python-3 is set here for generating the bindings. Users need to
;; install python-3 in their profile in order to use these bindings.
;;
;; NOTE - Babeltrace 2.0.4 is distributed with a aclocal.m4 that does not
;; support Python3.10. We can either disable Python's bindings or we can
;; reconfigure the project with our autoconf. This is because the
;; distribution tarballs are generated on Ubuntu LTS 18.04.
;;
;; `paredit-raise-sexp' on the first list of native inputs and remove the
;; 'autoreconf invocation whenever we bump to the next version that is
;; goind to be generated on Ubuntu LTS 22.04.
(native-inputs
(list asciidoc
bison
flex
pkg-config
python-3
python-sphinx
swig-4.0
xmltoman))
(append
(list asciidoc
bison
flex
pkg-config
python-3
python-sphinx
swig-4.0
xmltoman)
(list autoconf
automake
libtool)))
(home-page "https://babeltrace.org/")
(synopsis "Trace manipulation toolkit")
(description "Babeltrace 2 is a framework for viewing, converting,
@@ -366,14 +388,14 @@ many probes which instrument numerous interesting parts of Linux.")
(define-public lttng-ust
(package
(name "lttng-ust")
(version "2.15.0")
(version "2.13.8")
(source (origin
(method url-fetch)
(uri (string-append "https://lttng.org/files/lttng-ust/"
"lttng-ust-" version ".tar.bz2"))
(sha256
(base32
"0a1yk6cci5yqkdy3fvjdky0lc1sbpcxhpm43vb3h1pahg8y75jbb"))))
"0dyr4j8f8y6fmfpxb3ajkc1ndwpl1baxzbyc4ksx8ym3p7d9ivyl"))))
(build-system gnu-build-system)
(inputs
(list numactl))
@@ -392,19 +414,23 @@ to ring buffers shared with a consumer daemon.")
(define-public lttng-tools
(package
(name "lttng-tools")
(version "2.15.0")
(version "2.13.14")
(source (origin
(method url-fetch)
(uri (string-append "https://lttng.org/files/lttng-tools/"
"lttng-tools-" version ".tar.bz2"))
(sha256
(base32
"12pjxdfqg9ri4wng143x9dvwcrx9q2kg1isv4xc1v9vdalb92wsd"))))
"1jxdwm0a3z70jrx6yg57x5cswi7ycgyazng41rkgxnq7mp2gggak"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-python-bindings")
;; FIXME - Tests are disabled for now.
;; FIXME - Tests are disabled for now because one test hangs
;; indefinetely. Also, parallel testing is not possible because of how
;; the lttng-daemon handles sessions. Thus, keep parallel testing
;; disabled even after tests are enabled!
#:tests? #f
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-environment-variables
@@ -414,8 +440,11 @@ to ring buffers shared with a consumer daemon.")
;; We don't put (which "man") here because LTTng uses execlp.
(add-after 'unpack 'patch-default-man-path
(lambda _
(substitute* "src/common/defaults.hpp"
(("/usr/bin/man") "man")))))))
(substitute* "src/common/defaults.h"
(("/usr/bin/man") "man"))))
(add-before 'configure 'autoreconf
(lambda _
(invoke "autoreconf" "-vfi"))))))
;; NOTE - Users have to install python-3 in their profile to use the
;; bindings. We don't put it in the inputs, because the rest of the tools
;; can work without it.
@@ -423,22 +452,31 @@ to ring buffers shared with a consumer daemon.")
(list liburcu popt numactl))
(propagated-inputs
(list kmod module-init-tools))
;; NOTE - LTTng 2.13.9 is distributed with a aclocal.m4 that does not
;; support Python3.10. We can either disable Python's bindings or we can
;; reconfigure the project with our autoconf. This is because the
;; distribution tarballs are generated on Ubuntu LTS 18.04.
;;
;; `paredit-raise-sexp' on the first list of native inputs and remove the
;; 'autoreconf build step whenever we bump to the next version that is
;; goind to be generated on Ubuntu LTS 22.04.
(native-inputs
(list
asciidoc
babeltrace
bison
flex
libpfm4
libxml2
lttng-ust
perl
procps
python-3
swig-4.0
which
pkg-config
))
(append
(list pkg-config
perl
libpfm4
python-3
swig-4.0
procps
which
flex
bison
asciidoc
libxml2
lttng-ust)
(list autoconf
automake
libtool)))
(home-page "https://lttng.org/")
(synopsis "LTTng userspace tracer libraries")
(description "The lttng-tools project provides a session
+6 -4
View File
@@ -298,8 +298,8 @@ Verification specification
(home-page "https://github.com/ipfs/go-bitfield")
(synopsis "Allocated up-front Bitfield for Golang")
(description
"This package implements bitfields to the standard library's @code{big.Int}
with some optimizations for use in IPFS.")
"This package implements a functionality similar to standard
@code{big.Int} with some optimizations to use in IPFS.")
(license (list license:expat license:asl2.0))))
(define-public go-github-com-ipfs-go-block-format
@@ -1191,9 +1191,11 @@ IPLD graph as detailed below. Objects are demonstrated here using both
go-github-com-libp2p-go-libp2p))
(home-page "https://github.com/ipfs/go-peertaskqueue")
(synopsis "Prioritized queue of abstract tasks distributed among peers")
;; Project has nothing in README, see
;; <https://github.com/ipfs/go-peertaskqueue/issues/1>.
(description
"This package implements a prioritized list of tasks to be executed on
peers.")
"This package implements a functionality to prioritize queue of abstract
tasks distributed among peers.")
(license (list license:asl2.0 license:expat))))
(define-public go-github-com-ipfs-go-test
-1
View File
@@ -1039,7 +1039,6 @@ but can also be used independently as a logging bot.")
(uri (git-reference
(url "https://git.causal.agency/scooper")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0sqb8hg402il38pjhwa3lfyrskf1yr6yjd5fswqvk3d15v1jq4m8"))))
(build-system gnu-build-system)
+1 -1
View File
@@ -1499,7 +1499,7 @@ new Date();"))))
(for-each reset-file-timestamp
(find-files dir #:directories? #t)))
(with-directory-excursion dir
(let ((files (find-files ".")))
(let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files)))))))
(for-each repack-archive
(find-files #$output:doc "\\.zip$"))
-99
View File
@@ -1,99 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2026 Arthur Rodrigues <arthurhdrodrigues@proton.me>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages kubernetes)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system go)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages prometheus))
;;;
;;; Libraries:
;;;
(define-public go-k8s-io-component-base
(package
(name "go-k8s-io-component-base")
(version "0.34.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kubernetes/component-base")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "090ghb66zh4mln9fvp89vfq0g4pysm5y4lrp5n6801491mngyndm"))))
(build-system go-build-system)
(arguments
(list
#:test-flags
#~(list "-skip" "Tracing")
#:import-path "k8s.io/component-base"))
(native-inputs
(list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-blang-semver-v4
go-github-com-go-logr-logr
go-github-com-go-logr-zapr
go-github-com-google-go-cmp
go-github-com-moby-term
go-github-com-prometheus-client-golang
go-github-com-prometheus-client-model
go-github-com-prometheus-common
go-github-com-prometheus-procfs
go-github-com-spf13-cobra
go-github-com-spf13-pflag
go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
go-go-opentelemetry-io-otel
go-go-opentelemetry-io-otel-exporters-otlp-otlptrace
go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc
go-go-opentelemetry-io-otel-sdk
go-go-opentelemetry-io-otel-trace
go-go-uber-org-zap
go-go-yaml-in-yaml-v2
go-golang-org-x-sys
go-golang-org-x-text
go-k8s-io-apimachinery
go-k8s-io-client-go
go-k8s-io-klog-v2
go-k8s-io-utils
go-sigs-k8s-io-json))
(home-page "https://github.com/kubernetes/component-base")
(synopsis "Kubernetes core components Golang source code")
(description
"This package contains shared code for Kubernetes core components.")
(license license:asl2.0)))
;;;
;;; Executables:
;;;
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above in alphabetic order:
;;; guix import --insert=gnu/packages/python-xyz.scm pypi <package-name>.
;;;
+8 -4
View File
@@ -929,7 +929,7 @@ and manipulation.")
(define-public libskk
(package
(name "libskk")
(version "1.1.1")
(version "1.0.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -938,10 +938,15 @@ and manipulation.")
(file-name (git-file-name name version))
(sha256
(base32
"0x2fswxybc5ii821ydmm7bjn8cyr35zi3mdld2zmaqc7863hzhqq"))))
"0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"))
(patches
(search-patches
"libskk-fix-invalid-escape.patch"))))
(build-system gnu-build-system)
(arguments
(list #:parallel-tests? #f ;Concurrency issues in tests.
;; relax gcc 14 strictness
#:configure-flags #~(list "CFLAGS=-g2 -O2 -Wno-error=int-conversion")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'symlink-skk-jisyo
@@ -956,8 +961,7 @@ and manipulation.")
libtool
pkg-config
vala))
(inputs (list json-glib libxkbcommon skk-jisyo))
(propagated-inputs (list glib libgee)) ;required by libskk.pc
(inputs (list libgee json-glib libxkbcommon skk-jisyo))
(home-page "https://github.com/ueno/libskk")
(synopsis "Dealing with Japanese kana-to-kanji conversion")
(description
+2 -5
View File
@@ -26,7 +26,6 @@
#:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
@@ -99,7 +98,6 @@ text editors.")
;; dependencies which might never ever be used.
(lambda* (#:key inputs #:allow-other-keys)
(let ((file (search-input-file inputs "/bin/file"))
(locale (search-input-file inputs "/bin/locale"))
(tput (search-input-file inputs "/bin/tput")))
(substitute* "sxw2txt"
(("^use warnings;" line)
@@ -109,14 +107,13 @@ text editors.")
(substitute* "lesscomplete"
(("file -") (string-append file " -")))
(substitute* "lesspipe.sh"
(("\\<tput\\>") tput)
(("\\<locale\\>") locale)
(("tput colors")
(string-append tput " colors"))
(("file -")
(string-append file " -")))))))))
(inputs
(list file
ncurses ; for tput
glibc ; for locale
perl-archive-zip))
(native-inputs (list perl))
(home-page "https://github.com/wofr06/lesspipe")
+29 -42
View File
@@ -81,7 +81,7 @@
;;; Copyright © 2024 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
;;; Copyright © 2025 Mathieu Laparie <mlaparie@disr.it>
;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
@@ -7713,15 +7713,7 @@ and copy/paste text in the console and in xterm.")
"/etc/security/limits.d")
;; Guix does not use systemd.
"-Dwith-systemd-user-unit=false"
"-Dwith-systemd-group=false")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-references
(lambda _
(substitute* '("lib/gamemode_client.h"
"data/gamemoderun")
(("libgamemode(auto)?\\.so\\.0" lib)
(string-append #$output "/lib/" lib))))))))
"-Dwith-systemd-group=false")))
(native-inputs
(list pkg-config))
(inputs
@@ -8438,7 +8430,7 @@ from the ntfs-3g package. It is meant to be used in initrds.")
(define-public rdma-core
(package
(name "rdma-core")
(version "62.0")
(version "60.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core"
@@ -8446,7 +8438,7 @@ from the ntfs-3g package. It is meant to be used in initrds.")
version ".tar.gz"))
(sha256
(base32
"1802afy4q80zl7qkxlyq71ll5fsksva43f8xfd6vlqj1c47dc2n0"))))
"1pi8jf1pibfhh3ps2kvj2y8y6yahpw7jjyp0mpxmvama9qp8j6wv"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no tests
@@ -10372,7 +10364,7 @@ comparing system environments.")
(define-public cassini-headers
(package
(name "cassini-headers")
(version "14.0.0")
(version "12.0.1")
(home-page "https://github.com/HewlettPackard/shs-cassini-headers")
(source (origin
(method git-fetch)
@@ -10382,7 +10374,7 @@ comparing system environments.")
(file-name (git-file-name name version))
(sha256
(base32
"074r1snc682f1b6vgswyz55n8zjf5rhqnsl31xsswih7q9q38jda"))))
"0fvhk42pssw67zba4zq1b73d1m9ysc4g8sfibjmmhc0fwr92iamp"))))
(build-system copy-build-system)
(arguments
(list #:install-plan
@@ -10401,7 +10393,7 @@ software uses @file{cxi_prov_hw.h} from this package.")
(define-public cxi-driver
(package
(name "cxi-driver")
(version "14.0.0")
(version "13.0.0")
(home-page "https://github.com/HewlettPackard/shs-cxi-driver")
(source
(origin
@@ -10412,7 +10404,7 @@ software uses @file{cxi_prov_hw.h} from this package.")
(file-name (git-file-name name version))
(sha256
(base32
"07dhdm1az9hvy48iq8bn0wypwyml59yr5aqqyf1yhwrf1basry9g"))))
"1md6ammah7ywk5k9gsxix945w5498hpdfwzr603aiirlz2x4m4wh"))))
;; TODO: Actually build the Linux driver.
(build-system copy-build-system)
(arguments
@@ -10450,7 +10442,7 @@ Currently the Linux driver itself is missing from this package.")
(define-public libcxi
(package
(name "libcxi")
(version "14.0.0")
(version "13.0.0")
(home-page "https://github.com/HewlettPackard/shs-libcxi")
(source
(origin
@@ -10459,7 +10451,7 @@ Currently the Linux driver itself is missing from this package.")
(commit (string-append "release/shs-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "03czzz6h9jbmfikd85mx93bn84icnia08h69afw40flmpqidp5kh"))))
(base32 "1m8mds1h8plhfn2ja9br31xaiy82ky69685cp1rznanl18inaiff"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -10503,20 +10495,16 @@ known as Slingshot.")
(define-public libfabric
(package
(name "libfabric")
(version "2.5.0")
(version "2.3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ofiwg/libfabric")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "14yhvywbz98yajffq5pmpphhpdr0g8m8a5579dfy56fpxar441an"))))
(method url-fetch)
(uri
(string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32 "0npkfkkhyir31r2p1zsfi7yrvcam60fp8ps4s2csjc2drqbrz4rf"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
automake
libtool))
(inputs
(let ((if-supported ;XXX: modified from openmpi
(lambda (package . extra)
@@ -10573,16 +10561,15 @@ libraries, which are often integrated directly into libfabric.")
(define-public libfabric-1 ;needed by Open MPI 4.x
(package
(inherit libfabric)
(name "libfabric")
(version "1.22.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ofiwg/libfabric")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "1scwkfdnlg20hld03pdq83jq1q3nmvj1gravpn02pacqq18bv9xk"))))
(method url-fetch)
(uri
(string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))
(inputs
(modify-inputs inputs
(append cxi-driver-for-libfabric-1)))))
@@ -11593,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)
@@ -11603,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"
@@ -11636,7 +11623,7 @@ tools for managing PipeWire.")
(define-public ell
(package
(name "ell")
(version "0.83")
(version "0.79")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -11645,7 +11632,7 @@ tools for managing PipeWire.")
(file-name (git-file-name name version))
(sha256
(base32
"1ywq84jgvf7f86srqwpq31w2kzdp875fx039x5g4lx486plgf526"))
"0l8pbgnza58ivknzl3nd6y46mfminhnb3iwq82msi6g282wv7np4"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -12282,7 +12269,7 @@ that avoids the usage of older system-wide @file{/sys} interface.")
(define-public libtraceevent
(package
(name "libtraceevent")
(version "1.9.0")
(version "1.7.3")
(source
(origin
(method git-fetch)
@@ -12291,7 +12278,7 @@ that avoids the usage of older system-wide @file{/sys} interface.")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "10fklw4znjhm8mlg6hwlipdyk7v3053lnrc5bpqifnsc8gwqbaz0"))
(base32 "06mw2f0xnk6dy9w2z0n4dz7lnm02qfsmnmj2h24453qxlw57x0d6"))
(modules '((guix build utils)))
(snippet
#~(begin
-196
View File
@@ -82,7 +82,6 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages rsync)
#:use-module (gnu packages ssh)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages vim)
@@ -1309,85 +1308,6 @@ for syntax highlighting or a linting tool.")
(native-inputs (list pandoc))
(inputs (list luajit))))
(define (make-lua-scintillua name lua lua-lpeg lua-filesystem)
(package
(name name)
(version "6.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/orbitalquark/scintillua")
(commit (string-append "scintillua_" version))))
(file-name (git-file-name name version))
(sha256
(base32 "121ilpy91wyprqp3la4xzbb60i2yp1xpnvjlahzgzg0vck48njm7"))))
(build-system gnu-build-system)
(arguments
(list
#:phases
#~(let* ((lua-api-version #$(version-major+minor (package-version lua)))
(lua-cpath (string-append "/lib/lua/" lua-api-version))
(lua-path (string-append "/share/lua/" lua-api-version))
(scintillua (string-append #$output lua-path "/scintillua"))
(lexers (string-append scintillua "/lexers")))
(modify-phases %standard-phases
(delete 'configure)
(delete 'build)
(delete 'check) ;move after install
(replace 'install
(lambda _
(mkdir-p scintillua)
(copy-recursively "lexers" lexers)
(substitute* (string-append lexers "/lexer.lua")
(("package\\.path")
(string-append "('" lexers "/?.lua;' .. package.path)")))
(with-output-to-file (string-append scintillua "/init.lua")
(lambda ()
(display
"return require'scintillua.lexers.lexer'\n")))))
(add-after 'install 'set-lua-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((input-dirs (map cdr (alist-delete "source" inputs))))
(setenv "GUIX_LUA_CPATH"
(string-join
(map (lambda (prefix)
(string-append prefix lua-cpath))
input-dirs)
";"))
(setenv "GUIX_LUA_PATH"
(string-join
(map (lambda (prefix)
(string-append prefix lua-path))
(cons #$output input-dirs))
";")))))
(add-after 'set-lua-path 'check
(lambda _
(substitute* "tests.lua"
(("^package\\.path = .*") "")
(("require\\('lexer'\\)") "require'scintillua'")
(("'lexers'") (string-append "'" lexers "'"))
(("test_lua51" all)
(string-append "skip_" all)))
(invoke "lua" "tests.lua")))))))
(native-inputs (list lua))
(propagated-inputs (list lua-lpeg lua-filesystem))
(home-page "https://orbitalquark.github.io/scintillua/")
(synopsis "Collection of LPeg lexer for source code")
(description
"This Lua library provides LPeg lexers for source code syntax
highlighting. It can either be used by itself or as a drop-in replacement
for Scintilla lexers.")
(license license:expat)))
(define-public lua-scintillua
(make-lua-scintillua "lua-scintillua" lua
lua-lpeg lua-filesystem))
(define-public lua5.4-scintillua
(make-lua-scintillua "lua5.4-scintillua" lua-5.4
lua5.4-lpeg lua5.4-filesystem))
(define-public lutok
(package
(name "lutok")
@@ -1978,119 +1898,3 @@ way, following established lisp conventions.")
language.")
(home-page "https://git.sr.ht/~xerool/fennel-ls")
(license license:expat)))
(define (make-lua-lunitx name lua)
(package
(name name)
(version "0.8.2")
(source (origin
(method git-fetch)
(uri (git-reference
;; Upstream repository name is "lunit", but it provides
;; both lunit and lunitx modules.
(url "https://github.com/dcurrie/lunit")
(commit version)))
(file-name (git-file-name "lua-lunitx" version))
(sha256
(base32
"0y9szbd2g8xk63s8781bjmw8sv3s5m6rnv47kh1sk21ml3mxi69y"))))
(build-system trivial-build-system)
(arguments
(list
#:modules '((guix build utils))
#:builder
#~(begin
(use-modules (guix build utils))
(let* ((lua (string-append #$lua "/bin/lua"))
(lua-version #$(version-major+minor (package-version lua)))
(lua-dir (string-append #$output "/share/lua/" lua-version)))
(when #$(not (%current-target-system))
(with-directory-excursion (string-append #$source "/lua")
(invoke lua "../test/selftest.lua")))
(mkdir-p lua-dir)
(copy-recursively (string-append #$source "/lua") lua-dir)))))
(native-inputs (list lua))
(home-page "https://github.com/dcurrie/lunit")
(synopsis "Unit testing framework for Lua")
(description "Lunit is a unit testing framework for Lua. It includes
lunitx extensions adding Lua 5.2 compatibility via @code{lunit.module} and
the @code{lunitx} module for running tests automatically at program exit.")
(license license:expat)))
(define-public lua-lunitx
(make-lua-lunitx "lua-lunitx" lua))
(define-public lua5.1-lunitx
(make-lua-lunitx "lua5.1-lunitx" lua-5.1))
(define-public lua5.2-lunitx
(make-lua-lunitx "lua5.2-lunitx" lua-5.2))
(define-public lua5.4-lunitx
(make-lua-lunitx "lua5.4-lunitx" lua-5.4))
(define (make-lua-lsqlite3 name lua lua-lunitx)
(package
(name name)
(version "0.9.6")
(source (origin
(method url-fetch)
(uri "https://lua.sqlite.org/home/zip/lsqlite3_v096.zip")
(file-name (string-append "lsqlite3-v" version ".zip"))
(sha256
(base32
"10md6bfvbzflrhz4n75jr1ppmz86mwsip85llny23w2ld9iygipc"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? (not (%current-target-system))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(invoke #$(cc-for-target) "-fPIC" "-shared" "-O2"
"-o" "lsqlite3.so"
"lsqlite3.c"
"-llua" "-lsqlite3")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lua-version
#$(version-major+minor (package-version lua)))
(cmod-dir (string-append out "/lib/lua/" lua-version)))
(install-file "lsqlite3.so" cmod-dir))))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? outputs #:allow-other-keys)
(when tests?
;; Built only for the upstream test suite (test-dyld.lua).
(invoke #$(cc-for-target) "-fPIC" "-shared" "-O2"
"-o" "extras/libsqlitefunctions.so"
"extras/extension-functions.c"
"-lsqlite3")
;; Only test the dynamic lsqlite3 module; lsqlite3complete
;; (SQLite amalgamation) is not built by this package.
(invoke "lua" "test/tests-sqlite3.lua" "lsqlite3")
(invoke "lua" "test/test.lua")
(invoke "lua" "test/test-dyld.lua")))))))
(native-inputs (list unzip lua-lunitx))
(inputs (list lua sqlite))
(home-page "https://lua.sqlite.org/")
(synopsis "SQLite3 binding for Lua")
(description "LuaSQLite3 is a thin wrapper around the public domain
SQLite3 database engine. It provides a complete binding to the SQLite3 C API
from within Lua programs.")
(license license:expat)))
(define-public lua-lsqlite3
(make-lua-lsqlite3 "lua-lsqlite3" lua lua-lunitx))
(define-public lua5.1-lsqlite3
(make-lua-lsqlite3 "lua5.1-lsqlite3" lua-5.1 lua5.1-lunitx))
(define-public lua5.2-lsqlite3
(make-lua-lsqlite3 "lua5.2-lsqlite3" lua-5.2 lua5.2-lunitx))
(define-public lua5.4-lsqlite3
(make-lua-lsqlite3 "lua5.4-lsqlite3" lua-5.4 lua5.4-lunitx))
+2 -2
View File
@@ -5259,6 +5259,6 @@ features:
(home-page "https://github.com/emersion/hydroxide")
(synopsis "ProtonMail CardDAV, IMAP and SMTP bridge")
(description
"A third-party, open-source ProtonMail bridge. It is designed to run on a
server. It supports CardDAV, IMAP and SMTP.")
"This package implements a functionality to translate standard
protocols (SMTP, IMAP, CardDAV) into ProtonMail API requests.")
(license license:expat)))
-12
View File
@@ -458,7 +458,6 @@ programming languages.")
(url "https://github.com/cvc5/cvc5/")
(commit (string-append "cvc5-" version))))
(file-name (git-file-name name version))
(patches (search-patches "cvc5-reproducible-build.patch"))
(sha256
(base32 "0ynz7di4dyyiiydgmf0z9dc2jl7nm44xi0amch29rcgznwr4wy5m"))))
(build-system cmake-build-system)
@@ -9978,17 +9977,6 @@ also included.")
#:imported-modules %copy-build-system-modules
#:phases
#~(modify-phases %standard-phases
;; By default, cadical defines the DATE macro to have a $(date)
;; value. This makes the build not reproducible. If the macro
;; is not defined it uses __DATE__ and __TIME__, which we patch
;; to return a fixed date. Thus, achieving a reproducible build.
;;
;; An upstream patch for respecting SOURCE_DATE_EPOCH is pending.
;; See also <https://github.com/arminbiere/cadical/pull/164>.
(add-after 'unpack 'no-build-date
(lambda _
(substitute* "scripts/make-build-header.sh"
(("\\[ x\"\\$DATE\" = x\" \" \\]") "true"))))
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
(apply invoke "./configure" configure-flags)))
+5 -12
View File
@@ -200,7 +200,7 @@ bind processes, and much more.")
(propagated-inputs
;; hwloc.pc lists libze_loader and libxml2 in
;; 'Requires.private' in 'hwloc.pc'.
(list libpciaccess libxml2))
(list level-zero libpciaccess libxml2))
(arguments
(list
#:configure-flags
@@ -421,7 +421,7 @@ software vendors, application developers and computer science researchers.")
(define-public openmpi-5
(package
(inherit openmpi)
(version "5.0.10")
(version "5.0.9")
(source
(origin
(method url-fetch)
@@ -447,7 +447,7 @@ software vendors, application developers and computer science researchers.")
;; documentation.
(delete-file-recursively "docs/html")))
(sha256
(base32 "1ijc6zbxb49a7dvfs59h74lis3vb5hc1v95qpjyxxr8qq97wrkha"))))
(base32 "02yqfwv2fn9n0glprkk7dzrkrcnpfwfz5874ydx88w0iadi2gdyz"))))
(inputs (modify-inputs inputs
;; As of Open MPI 5.0.X, PMIx is used to communicate
@@ -470,7 +470,7 @@ software vendors, application developers and computer science researchers.")
"--with-sge"
"--disable-static"
#$@(if (this-package-input "valgrind")
#$@(if (package? (this-package-input "valgrind"))
#~("--enable-memchecker"
"--with-valgrind")
#~("--without-valgrind"))
@@ -488,16 +488,9 @@ software vendors, application developers and computer science researchers.")
(string-append "--with-pmix=" #$(this-package-input "openpmix"))
(string-append "--with-prrte=" #$(this-package-input "prrte"))
;; Explicitly activate PSM2 when present. This is required
;; for autotools to add the -L flag to .la files, that
;; fixes link-time errors when missing.
#$@(if (this-package-input "psm2")
#~((string-append "--with-psm2=" #$(this-package-input "psm2")))
#~())
;; Since 5.x, Infiniband support is provided by ucx.
;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes
#$@(if (this-package-input "ucx")
#$@(if (package? (this-package-input "ucx"))
#~((string-append "--with-ucx=" #$(this-package-input "ucx")))
#~()))
+6 -51
View File
@@ -69,7 +69,7 @@
;;; Copyright © 2025 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
;;;
@@ -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)
@@ -3401,54 +3404,6 @@ notations in use for IPv4 and IPv6 addresses and networks.")
speedtest.net.")
(license license:asl2.0)))
(define-public librespeed-cli
(package
(name "librespeed-cli")
(version "1.0.12")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/librespeed/speedtest-cli")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08x09b3j2qvhnwy8lrbfxqh1lbs64wyqlr4jj6m31b5r2zy90dly"))))
(build-system go-build-system)
(arguments
(list
#:install-source? #f
#:import-path "github.com/librespeed/speedtest-cli"
#:build-flags
#~(list (format #f "-ldflags=-X ~s -X ~s"
(string-append "github.com/librespeed/speedtest-cli"
"/defs.ProgName=librespeed-cli")
(string-append "github.com/librespeed/speedtest-cli"
"/defs.ProgVersion="
#$version)))
#:phases
#~(modify-phases %standard-phases
;; Avoid naming conflict with speedtest-cli package
(add-after 'install 'rename-executable
(lambda _
(with-directory-excursion (string-append #$output "/bin")
(rename-file "speedtest-cli" "librespeed-cli")))))))
(native-inputs
(list go-github-com-briandowns-spinner
go-github-com-go-ping-ping
go-github-com-gocarina-gocsv
go-github-com-sirupsen-logrus
go-github-com-urfave-cli-v2
go-golang-org-x-sys))
(home-page "https://github.com/librespeed/speedtest-cli")
(synopsis "Command-line internet speed test tool")
(description
"Command-line interface for LibreSpeed internet bandwidth testing.
It functions as a command-line alternative to @url{https://librespeed.org/}.
It features ping, jitter, download, and upload testing, as well as the ability
to test using multiple servers in a single run.")
(license license:lgpl3)))
(define-public atftp
(package
(name "atftp")
@@ -4522,7 +4477,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.")
(define-public iwd
(package
(name "iwd")
(version "3.12")
(version "3.10")
(source
(origin
(method git-fetch)
@@ -4532,7 +4487,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.")
(file-name (git-file-name name version))
(sha256
(base32
"1c05ayakg8kf9bxqf5857lkflk4mrzllmhz01cpyfpcx5pz71ipg"))))
"1dxzz99fwyf1ssjgx57z4nik1xk4nr2ryywq8mpzbvxsdhs82fmb"))))
(build-system gnu-build-system)
(inputs
(list dbus
+2 -2
View File
@@ -2620,14 +2620,14 @@ the boot loader configuration.")
(define-public flatpak
(package
(name "flatpak")
(version "1.16.5")
(version "1.16.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
version "/flatpak-" version ".tar.xz"))
(sha256
(base32 "0mn1rf1q0r8bhqkm84f1vj3lvl63ccalnc4p98k6qxj92rcfj853"))
(base32 "0nyg2byczlpw25jm7508g06n7z4247ja6v18hz0803llz3sx6srx"))
(patches
(search-patches "flatpak-fix-fonts-icons.patch"
"flatpak-fix-icon-validation.patch"
+38 -78
View File
@@ -687,17 +687,19 @@ single-instruction multiple-data (SIMD) intrinsics.")
(define-public openpmix
(package
(name "openpmix")
(version "6.1.0")
(version "6.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openpmix/openpmix")
(commit (string-append "v" version))
(recursive? #t))) ;for the M4 macros in 'config/oac'
(file-name (git-file-name name version))
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/openpmix/releases/download/v"
version "/pmix-" version ".tar.bz2"))
(sha256
(base32
"1sj4hqnbis0a8466qv47fp9ii6akvbl6n9scha0hg9cpljk6kif0"))))
"062k2agr311j06pavmrim1savmcv4f3c5jir4w1jxs0cdnb6ksdz"))
(modules '((guix build utils)))
(snippet
;; Remove ~5 MiB of pre-built HTML doc.
#~(delete-file-recursively "docs/_build/html"))))
(build-system gnu-build-system)
(arguments
(list
@@ -709,11 +711,6 @@ single-instruction multiple-data (SIMD) intrinsics.")
(list (canonical-package gcc)))
#:phases
#~(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
(for-each patch-shebang
(cons "autogen.pl" (find-files "config")))
(invoke "./autogen.pl")))
(add-after 'unpack 'set-LDFLAGS
(lambda _
;; The Cython-compiled shared library would fail the
@@ -735,14 +732,7 @@ single-instruction multiple-data (SIMD) intrinsics.")
(("#define PMIX_CONFIGURE_CLI .*")
"#define PMIX_CONFIGURE_CLI \"[scrubbed]\"\n")))))))
(inputs (list libevent `(,hwloc "lib") zlib))
(native-inputs
(list autoconf
automake
libtool
perl
flex
python
python-cython-0))
(native-inputs (list perl python python-cython-0))
(synopsis "PMIx library")
(description
"PMIx is an application programming interface standard that provides
@@ -757,24 +747,19 @@ commonly needed services in distributed and parallel computing systems.")
(define-public openpmix-4
(package
(inherit openpmix)
(name "openpmix")
(version "4.2.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openpmix/openpmix")
(commit (string-append "v" version))
(recursive? #t))) ;for the M4 macros in 'config/oac'
(file-name (git-file-name name version))
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/openpmix/releases/download/v"
version "/pmix-" version ".tar.bz2"))
(sha256
(base32
"08ni1km2gy2nwk2dymvj3pr74nffnmqicdw53nnrc3ls5s82iw1c"))
(modules '((guix build utils)))
"1j9xlhqrrmgjdkwakamn78y5gj756adi53hn25zksgr3is3l5d09"))
(snippet
;; Prevent 'autogen.pl' from running 'git submodule'.
#~(substitute* "autogen.pl"
(("-f \".gitmodules\"")
"0")))))
'(begin (use-modules (guix build utils))
;; Remove ~5 MiB of pre-built HTML doc.
(delete-file-recursively "docs/_build/html")))))
(arguments
(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
@@ -785,23 +770,15 @@ commonly needed services in distributed and parallel computing systems.")
(define-public prrte
(package
(name "prrte")
(version "4.1.0")
(version "4.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openpmix/prrte")
(commit (string-append "v" version))
(recursive? #t))) ;for the M4 macros in 'config/oac'
(file-name (git-file-name name version))
(sha256
(base32
"0f40hpppvfcc2ckryb1v6wckjqw6j0480dmixrf0ip69mcb9vv8l"))
(modules '((guix build utils)))
(snippet
;; Prevent 'autogen.pl' from running 'git submodule'.
#~(substitute* "autogen.pl"
(("-f \".gitmodules\"")
"0")))))
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/prrte/releases/download/v"
version "/prrte-" version ".tar.bz2"))
(sha256
(base32
"1r2dxnv3spmfd3l5is8cly2mmmc98xgm9wvvih99j35sw1hwjbiw"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -813,26 +790,11 @@ commonly needed services in distributed and parallel computing systems.")
(lambda _
;; Remove references to GCC, the shell, etc. (shown by
;; 'prte_info') to reduce the closure size.
(substitute* "config/prte_setup_cc.m4"
(("AC_SUBST\\(PRTE_CC_ABSOLUTE\\)")
(string-append
"PRTE_CC_ABSOLUTE=\"$(basename $PRTE_CC_ABSOLUTE)\"\n"
"AC_SUBST([PRTE_CC_ABSOLUTE])\n")))
(substitute* "configure.ac"
(("PRTE_CAPTURE_CONFIGURE_CLI\\(\\[PRTE_CONFIGURE_CLI\\]\\)"
all)
(string-append
"dnl " all "\n"
"PRTE_CONFIGURE_CLI=\"[elided to reduce closure]\"\n"
"AC_SUBST([PRTE_CONFIGURE_CLI])\n"
"AC_DEFINE_UNQUOTED([PRTE_CONFIGURE_CLI],"
" [\"$PRTE_CONFIGURE_CLI\"],"
" [Capture the configure cmd line])\n")))))
(replace 'bootstrap
(lambda _
(for-each patch-shebang
(cons "autogen.pl" (find-files "config")))
(invoke "./autogen.pl")))
(substitute* "src/tools/prte_info/param.c"
(("_ABSOLUTE")
"")
(("PRTE_CONFIGURE_CLI")
"\"[elided to reduce closure]\""))))
(add-after 'unpack 'patch-prted-reference
(lambda _
;; Record the absolute file name of 'prted' instead of
@@ -856,14 +818,12 @@ commonly needed services in distributed and parallel computing systems.")
`(,hwloc "lib")
openpmix
libnl))
(native-inputs
(list autoconf
automake
flex
libtool
perl
pkg-config
python)) ;for 'prte-convert-help.py'
(native-inputs (list pkg-config perl))
(outputs '("out"
;; Move ~5 MiB of HTML docs (including CSS, JS, and fonts!) to a
;; separate output.
"doc"))
(synopsis "PMIx Reference RunTime Environment (PRRTE)")
(description
"The PMIx Reference RunTime Environment is a runtime environment
-89
View File
@@ -46,7 +46,6 @@
;;; Copyright © 2025 Isidor Zeuner <guix@quidecco.pl>
;;; Copyright © 2026 John Dawson <dawson.john.andrew@gmail.com>
;;; Copyright © 2026 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -102,7 +101,6 @@
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages golang-web)
@@ -663,93 +661,6 @@ applications, there is xclip integration." )
(home-page "https://dthompson.us/projects/shroud.html")
(license license:gpl3+)))
(define-public sops
(package
(name "sops")
(version "3.12.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/getsops/sops")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "01w67iv0v9hnxgaklixk871dwnhyhllm3zz36iiwqsd19d5rllfm"))))
(build-system go-build-system)
(arguments
(list #:install-source? #f
#:unpack-path "github.com/getsops/sops/v3"
#:import-path "github.com/getsops/sops/v3/cmd/sops"
#:build-flags
#~(list (string-append
"-ldflags="
"-X github.com/getsops/sops/v3/version.Version="
#$(package-version this-package)))
#:modules
'(((guix build gnu-build-system) #:prefix gnu:)
(guix build go-build-system)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'install-license-files
(lambda _
(define license
(string-append #$output "/share/doc/" #$name
"-" #$(package-version this-package)))
(install-file "./src/github.com/getsops/sops/v3/LICENSE"
license))))))
(native-inputs
(list go-cloud-google-com-go-kms
go-cloud-google-com-go-storage
go-filippo-io-age
go-github-com-aws-aws-sdk-go-v2
go-github-com-aws-aws-sdk-go-v2-config
go-github-com-aws-aws-sdk-go-v2-credentials
go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
go-github-com-aws-aws-sdk-go-v2-service-kms
go-github-com-aws-aws-sdk-go-v2-service-s3
go-github-com-aws-aws-sdk-go-v2-service-sts
go-github-com-azure-azure-sdk-for-go-sdk-azcore
go-github-com-azure-azure-sdk-for-go-sdk-azidentity
go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-azkeys
go-github-com-blang-semver
go-github-com-envoyproxy-go-control-plane
go-github-com-fatih-color
go-github-com-getsops-gopgagent
go-github-com-google-go-cmp
go-github-com-google-shlex
go-github-com-goware-prefixer
go-github-com-hashicorp-go-cleanhttp
go-github-com-hashicorp-vault-api
go-github-com-huaweicloud-huaweicloud-sdk-go-v3
go-github-com-lib-pq
go-github-com-mitchellh-go-homedir
go-github-com-mitchellh-go-wordwrap
go-github-com-pkg-errors
go-github-com-protonmail-go-crypto
go-github-com-sirupsen-logrus
go-github-com-stretchr-testify
go-github-com-urfave-cli
go-go-yaml-in-yaml-v3
go-golang-org-x-crypto
go-golang-org-x-net
go-golang-org-x-oauth2
go-golang-org-x-sys
go-golang-org-x-term
go-google-golang-org-api
go-google-golang-org-genproto-googleapis-rpc
go-google-golang-org-grpc
go-google-golang-org-protobuf
go-gopkg-in-ini-v1))
(home-page "https://getsops.io")
(synopsis "Tool for managing secrets")
(description
"sops is an editor of encrypted files that supports YAML, JSON,
ENV, INI and BINARY formats and encrypts with AWS KMS, GCP KMS, Azure Key Vault,
age, and PGP.")
(license license:mpl2.0)))
(define-public ssh-to-age
(package
(name "ssh-to-age")
@@ -1,26 +0,0 @@
This makes the cvc5 build reproducible.
See: https://github.com/cvc5/cvc5/pull/12580
diff --git a/src/options/mkoptions.py b/src/options/mkoptions.py
index 5bd9f0da1..d1fc2e6fa 100644
--- a/src/options/mkoptions.py
+++ b/src/options/mkoptions.py
@@ -281,7 +281,7 @@ def generate_public_includes(modules):
headers.add(format_include("<unordered_map>"))
for _, option in all_options(modules):
headers.update([format_include(x) for x in option.includes])
- return '\n'.join(headers)
+ return '\n'.join(sorted(headers))
def generate_option_enum_and_table(modules):
@@ -307,7 +307,7 @@ def generate_option_enum_and_table(modules):
for module, option in all_options(modules, True):
if not option.long:
continue
- for name in option.names:
+ for name in sorted(option.names):
res.append(' {{ \"{}\", OptionEnum::{} }},'
.format(name, option.enum_name()))
res.append('};')
@@ -1,56 +0,0 @@
Author: Igorj Gorjaĉev <igor@goryachev.org>
Date: Wed Oct 22 10:10:13 2025 +0300
vendoring support for guix
diff --git a/lib/mix/lib/mix/dep/loader.ex b/lib/mix/lib/mix/dep/loader.ex
index e47bfc556..0ddd49fe5 100644
--- a/lib/mix/lib/mix/dep/loader.ex
+++ b/lib/mix/lib/mix/dep/loader.ex
@@ -198,6 +198,10 @@ defp with_scm_and_app(app, req, opts, original, locked?) do
)
end
+ scm = Mix.Guix.scm(scm)
+ req = Mix.Guix.req(req)
+ opts = Mix.Guix.opts(opts, app)
+
%Mix.Dep{
scm: scm,
app: app,
diff --git a/lib/mix/lib/mix/guix.ex b/lib/mix/lib/mix/guix.ex
new file mode 100644
index 000000000..9c821704c
--- /dev/null
+++ b/lib/mix/lib/mix/guix.ex
@@ -0,0 +1,30 @@
+defmodule Mix.Guix do
+ @moduledoc false
+
+ @guix_vendorize "GUIX_MIX_VENDOR_DIR"
+
+ def scm(scm), do: (vendorize?() && Mix.SCM.Path) || scm
+
+ def req(req), do: (vendorize?() && nil) || req
+
+ def opts(opts, app) do
+ if vendorize?() do
+ if Keyword.has_key?(opts, :path) do
+ opts
+ else
+ dep_dir = vendor_dep_dir(app)
+
+ [path: dep_dir, dest: dep_dir] ++
+ Keyword.drop(opts, [:hex, :override, :repo, :lock, :dest])
+ end
+ else
+ opts
+ end
+ end
+
+ defp vendorize?, do: not is_nil(vendor_dir())
+
+ defp vendor_dir, do: System.get_env(@guix_vendorize)
+
+ defp vendor_dep_dir(name), do: "#{vendor_dir()}/#{name}"
+end
@@ -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: [
@@ -0,0 +1,65 @@
Upstream-status: Not presented upstream.
From 0804e655a7abfd22dc3a053f03fab8f811405f84 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 8 Nov 2024 11:07:56 +0100
Subject: [PATCH] ifconfig hurd: Build fix for the 64bit HUrd.
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
* ifconfig/system/hurd.c (check_driving): Use mach_msg_type_number_t
instead of size_t for file_get_fs_options.
---
ifconfig/system/hurd.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
index 70b2ed27..86fe6375 100644
--- a/ifconfig/system/hurd.c
+++ b/ifconfig/system/hurd.c
@@ -47,7 +47,7 @@ check_driving (const char *name)
error_t err;
char *argz = 0, *new_argz = 0;
- size_t argz_len = 0;
+ mach_msg_type_number_t argz_len = 0;
char *entry = 0;
const char *socket = _SERVERS_SOCKET "/2";
@@ -106,7 +106,9 @@ check_driving (const char *name)
new_argz = malloc (argz_len);
memcpy (new_argz, argz, argz_len);
- err = argz_insert (&new_argz, &argz_len, new_argz, name);
+ size_t new_argz_len = 0;
+
+ err = argz_insert (&new_argz, &new_argz_len, new_argz, name);
if (err)
{
error (0, err, "Could not prepend name %s to '%s' for %s", name,
@@ -114,7 +116,7 @@ check_driving (const char *name)
goto out;
}
- err = argz_insert (&new_argz, &argz_len, new_argz, "-i");
+ err = argz_insert (&new_argz, &new_argz_len, new_argz, "-i");
if (err)
{
argz_stringify (new_argz, argz_len, ' ');
@@ -122,10 +124,10 @@ check_driving (const char *name)
goto out;
}
- err = fsys_set_options (fsys, new_argz, argz_len, 1);
+ err = fsys_set_options (fsys, new_argz, new_argz_len, 1);
if (err)
{
- argz_stringify (new_argz, argz_len, ' ');
+ argz_stringify (new_argz, new_argz_len, ' ');
error (0, err, "Could not make pfinet %s drive %s with '%s'", socket,
name, new_argz);
goto out;
--
Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
File diff suppressed because one or more lines are too long
@@ -0,0 +1,16 @@
fix parse error:
https://github.com/ueno/libskk/pull/90
diff --git a/rules/default/rom-kana/default.json b/rules/default/rom-kana/default.json
index 6ddfce6..68dcff9 100644
--- a/rules/default/rom-kana/default.json
+++ b/rules/default/rom-kana/default.json
@@ -108,7 +108,7 @@
"myi": ["", "みぃ" ],
"myo": ["", "みょ" ],
"myu": ["", "みゅ" ],
- "n\'": ["", "ん" ],
+ "n'": ["", "ん" ],
"na": ["", "な" ],
"ne": ["", "ね" ],
"ni": ["", "に" ],
@@ -0,0 +1,43 @@
From: fis <ybbs.daans@hotmail.com>
Date: Sat, 20 Jan 2018 07:42:38 +0800
Subject: [PATCH] rct.cmake: Add missing headers.
---
rct.cmake | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/rct.cmake b/rct.cmake
index 323e7b9..3e0ac6b 100644
--- a/rct.cmake
+++ b/rct.cmake
@@ -339,7 +339,27 @@ if (NOT RCT_NO_INSTALL)
rct/Timer.h
rct/Value.h
rct/WriteLocker.h
+ rct/CpuUsage.h
+ rct/DataFile.h
+ rct/Date.h
+ rct/EmbeddedLinkedList.h
+ rct/FinishMessage.h
+ rct/Flags.h
+ rct/Hash.h
+ rct/LinkedList.h
+ rct/Map.h
+ rct/MemoryMappedFile.h
+ rct/OnDestruction.h
+ rct/QuitMessage.h
+ rct/ResponseMessage.h
+ rct/ScriptEngine.h
+ rct/StackBuffer.h
+ rct/WindowsUnicodeConversion.h
DESTINATION include/rct)
+ install(FILES
+ json/json.hpp
+ DESTINATION include/rct/json)
+
install(EXPORT "rct" DESTINATION lib/cmake)
endif ()
--
2.13.6
@@ -0,0 +1,72 @@
Unbundle RCT and use our own copy.
--- rtags-2.16/src/CMakeLists.txt 2018-01-23 10:36:17.645855140 +0100
+++ rtags-2.16/src/CMakeLists.txt 2018-01-23 10:38:14.605234740 +0100
@@ -105,12 +105,6 @@ if (LUA_ENABLED)
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
endif ()
-set(RCT_RTTI_ENABLED 1)
-set(RCT_NO_INSTALL 1)
-set(RCT_NO_LIBRARY 1)
-# Everyting which as been set either in rct/rct.cmake or rct/compiler.cmake
-# doesn't need to be set in this file again.
-include(rct/rct.cmake)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC")
@@ -128,8 +122,7 @@ add_definitions(
"-DRTAGS_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
"-DCLANG_LIBDIR=${LIBCLANG_LIBDIR}"
"-DCLANG_VERSION=${LIBCLANG_VERSION_STRING}"
- "-DOS_${CMAKE_SYSTEM_NAME}"
- ${RCT_DEFINITIONS})
+ "-DOS_${CMAKE_SYSTEM_NAME}")
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
add_definitions(-D__LONG_LONG_SUPPORTED)
@@ -172,8 +165,7 @@ set(RTAGS_SOURCES
Symbol.cpp
SymbolInfoJob.cpp
Token.cpp
- TokensJob.cpp
- ${RCT_SOURCES})
+ TokensJob.cpp)
if (LUA_ENABLED)
list(APPEND RTAGS_SOURCES AST.cpp)
@@ -195,10 +187,10 @@ endif ()
include_directories(
${CMAKE_CURRENT_LIST_DIR}
- ${RCT_INCLUDE_DIRS}
${CMAKE_CURRENT_LIST_DIR}/selene/include
${CMAKE_CURRENT_BINARY_DIR}/lua-prefix/src/lua-build
- ${CMAKE_CURRENT_LIST_DIR}/lua/src)
+ ${CMAKE_CURRENT_LIST_DIR}/lua/src
+ ${CMAKE_CURRENT_BINARY_DIR}/include)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(START_GROUP "")
@@ -223,17 +215,17 @@ else ()
endif()
# RCT_LIBRARIES and stdc++ library must be at the end
-set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES})
+set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++)
add_executable(rc rc.cpp)
-target_link_libraries(rc ${RTAGS_LIBRARIES})
+target_link_libraries(rc ${RTAGS_LIBRARIES} rct)
add_executable(rdm rdm.cpp)
-target_link_libraries(rdm ${RTAGS_LIBRARIES})
+target_link_libraries(rdm ${RTAGS_LIBRARIES} rct)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
add_executable(rp rp.cpp)
-target_link_libraries(rp ${RTAGS_LIBRARIES})
+target_link_libraries(rp ${RTAGS_LIBRARIES} rct)
if (CYGWIN)
EnsureLibraries(rdm rct)
@@ -0,0 +1,176 @@
From: "Alexander J. Maidak" <amaidak@equinix.com>
https://github.com/ged/ruby-pg/pull/619
---
lib/pg/connection.rb | 16 ++++++++++-
spec/helpers.rb | 13 +++++++++
spec/pg/connection_spec.rb | 57 +++++++++++++++++++++++++-------------
3 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/lib/pg/connection.rb b/lib/pg/connection.rb
index 2c9ecd8..572a2bf 100644
--- a/lib/pg/connection.rb
+++ b/lib/pg/connection.rb
@@ -680,6 +680,7 @@ class PG::Connection
host_count = conninfo_hash[:host].to_s.count(",") + 1
stop_time = timeo * host_count + Process.clock_gettime(Process::CLOCK_MONOTONIC)
end
+ connection_errors = []
poll_status = PG::PGRES_POLLING_WRITING
until poll_status == PG::PGRES_POLLING_OK ||
@@ -720,7 +721,13 @@ class PG::Connection
else
connhost = "at \"#{host}\", port #{port}"
end
- raise PG::ConnectionBad.new("connection to server #{connhost} failed: timeout expired", connection: self)
+ connection_errors << "connection to server #{connhost} failed: timeout expired"
+ if connection_errors.count < host_count.to_i
+ new_conninfo_hash = rotate_hosts(conninfo_hash.compact)
+ send(:reset_start2, self.class.send(:parse_connect_args, new_conninfo_hash))
+ else
+ raise PG::ConnectionBad.new(connection_errors.join("\n"), connection: self)
+ end
end
# Check to see if it's finished or failed yet
@@ -733,6 +740,13 @@ class PG::Connection
raise PG::ConnectionBad.new(msg, connection: self)
end
end
+
+ private def rotate_hosts(conninfo_hash)
+ conninfo_hash[:host] = conninfo_hash[:host].split(",").rotate.join(",") if conninfo_hash[:host]
+ conninfo_hash[:port] = conninfo_hash[:port].split(",").rotate.join(",") if conninfo_hash[:port]
+ conninfo_hash[:hostaddr] = conninfo_hash[:hostaddr].split(",").rotate.join(",") if conninfo_hash[:hostaddr]
+ conninfo_hash
+ end
end
include Pollable
diff --git a/spec/helpers.rb b/spec/helpers.rb
index 7214ec1..bd546f5 100644
--- a/spec/helpers.rb
+++ b/spec/helpers.rb
@@ -475,6 +475,19 @@ EOT
end
end
+ class ListenSocket
+ attr_reader :port
+ def initialize(host = 'localhost', accept: true)
+ TCPServer.open( host, 0 ) do |serv|
+ if accept
+ Thread.new { begin loop do serv.accept end rescue nil end }
+ end
+ @port = serv.local_address.ip_port
+ yield self
+ end
+ end
+ end
+
def check_for_lingering_connections( conn )
conn.exec( "SELECT * FROM pg_stat_activity" ) do |res|
conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) }
diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb
index 63d3585..8a5645a 100644
--- a/spec/pg/connection_spec.rb
+++ b/spec/pg/connection_spec.rb
@@ -369,24 +369,38 @@ describe PG::Connection do
end
end
- it "times out after connect_timeout seconds" do
- TCPServer.open( 'localhost', 54320 ) do |serv|
+ it "times out after 2 * connect_timeout seconds on two connections" do
+ PG::TestingHelpers::ListenSocket.new do |sock|
start_time = Time.now
expect {
described_class.connect(
- host: 'localhost',
- port: 54320,
- connect_timeout: 1,
- dbname: "test")
+ host: 'localhost,localhost',
+ port: sock.port,
+ connect_timeout: 1,
+ dbname: "test")
}.to raise_error do |error|
expect( error ).to be_an( PG::ConnectionBad )
- expect( error.message ).to match( /timeout expired/ )
+ expect( error.message ).to match( /timeout expired.*timeout expired/m )
if PG.library_version >= 120000
- expect( error.message ).to match( /\"localhost\"/ )
- expect( error.message ).to match( /port 54320/ )
+ expect( error.message ).to match( /\"localhost\".*\"localhost\"/m )
+ expect( error.message ).to match( /port #{sock.port}/ )
end
end
+ expect( Time.now - start_time ).to be_between(1.9, 10).inclusive
+ end
+ end
+
+ it "succeeds with second host after connect_timeout" do
+ PG::TestingHelpers::ListenSocket.new do |sock|
+ start_time = Time.now
+ conn = described_class.connect(
+ host: 'localhost,localhost,localhost',
+ port: "#{sock.port},#{@port},#{sock.port}",
+ connect_timeout: 1,
+ dbname: "test")
+
+ expect( conn.port ).to eq( @port )
expect( Time.now - start_time ).to be_between(0.9, 10).inclusive
end
end
@@ -768,7 +782,8 @@ describe PG::Connection do
end
it "raises proper error when sending fails" do
- conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
+ sock = PG::TestingHelpers::ListenSocket.new('127.0.0.1', accept: false){ }
+ conn = described_class.connect_start( '127.0.0.1', sock.port, "", "", "me", "xxxx", "somedb" )
expect{ conn.exec 'SELECT 1' }.to raise_error(PG::UnableToSend, /no connection/){|err| expect(err).to have_attributes(connection: conn) }
end
@@ -1650,11 +1665,12 @@ describe PG::Connection do
it "handles server close while asynchronous connect" do
- serv = TCPServer.new( '127.0.0.1', 54320 )
- conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
- expect( [PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK] ).to include conn.connect_poll
- select( nil, [conn.socket_io], nil, 0.2 )
- serv.close
+ conn = nil
+ PG::TestingHelpers::ListenSocket.new('127.0.0.1', accept: false)do |sock|
+ conn = described_class.connect_start( '127.0.0.1', sock.port, "", "", "me", "xxxx", "somedb" )
+ expect( [PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK] ).to include conn.connect_poll
+ select( nil, [conn.socket_io], nil, 0.2 )
+ end
if conn.connect_poll == PG::PGRES_POLLING_READING
select( [conn.socket_io], nil, nil, 0.2 )
end
@@ -1778,12 +1794,13 @@ describe PG::Connection do
end
it "consume_input should raise ConnectionBad for a closed connection" do
- serv = TCPServer.new( '127.0.0.1', 54320 )
- conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
- while [PG::CONNECTION_STARTED, PG::CONNECTION_MADE].include?(conn.connect_poll)
- sleep 0.1
+ conn = nil
+ PG::TestingHelpers::ListenSocket.new '127.0.0.1', accept: false do |sock|
+ conn = described_class.connect_start( '127.0.0.1', sock.port, "", "", "me", "xxxx", "somedb" )
+ while [PG::CONNECTION_STARTED, PG::CONNECTION_MADE].include?(conn.connect_poll)
+ sleep 0.1
+ end
end
- serv.close
expect{ conn.consume_input }.to raise_error(PG::ConnectionBad, /server closed the connection unexpectedly/){|err| expect(err).to have_attributes(connection: conn) }
expect{ conn.consume_input }.to raise_error(PG::ConnectionBad, /can't get socket descriptor|connection not open/){|err| expect(err).to have_attributes(connection: conn) }
end
--
2.47.1
+32 -23
View File
@@ -599,24 +599,31 @@ reading and editing of existing PDF files.")
(define-public zathura-cb
(package
(name "zathura-cb")
(version "2026.02.03")
(version "0.1.10")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pwmt/zathura-cb")
(commit version)))
(file-name (git-file-name name version))
(method url-fetch)
(uri
(string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-"
version ".tar.xz"))
(sha256
(base32
"17w0iv7a503q95qdqx7qpjkxdqfyzw0qld4d8a98hkhg3ljrp5ck"))))
"1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49"))))
(native-inputs (list pkg-config))
(inputs (list libarchive zathura))
(build-system meson-build-system)
(arguments
(list
#:tests? #f ; package does not contain tests
#:configure-flags
#~(list (string-append "-Dplugindir=" #$output "/lib/zathura"))))
`(#:tests? #f ; package does not contain tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-plugin-directory
;; Something of a regression in 0.1.10: the new Meson build system
;; now hard-codes an incorrect plugin directory. Fix it.
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "meson.build"
(("(install_dir:).*" _ key)
(string-append key
"'" (assoc-ref outputs "out") "/lib/zathura'\n")))
#t)))))
(home-page "https://pwmt.org/projects/zathura-cb/")
(synopsis "Comic book support for zathura (libarchive backend)")
(description "The zathura-cb plugin adds comic book support to zathura
@@ -626,7 +633,7 @@ using libarchive.")
(define-public zathura-ps
(package
(name "zathura-ps")
(version "2026.02.03")
(version "0.2.8")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -635,7 +642,7 @@ using libarchive.")
(file-name (git-file-name name version))
(sha256
(base32
"14p188qmd9kkdfi8im8ispdzzafslqa0h6aafcgxl0fwv2ywnbg6"))))
"04nv4cpxhx2f1m6iagrhj3dx3mranljl604sj2yn11anhnm0igc5"))))
(native-inputs (list pkg-config))
(inputs (list libspectre zathura))
(build-system meson-build-system)
@@ -653,7 +660,7 @@ using libspectre.")
(define-public zathura-djvu
(package
(name "zathura-djvu")
(version "2026.02.03")
(version "0.2.10")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -662,7 +669,7 @@ using libspectre.")
(file-name (git-file-name name version))
(sha256
(base32
"0742bd7f8nansshnfa2qvq344kz8wvnwa3l3cz6jyfdfmn27vng4"))))
"1c069n676c9byy1sp2c6idm3mlfijcdpv6z09ifx8hjkryaajplx"))))
(native-inputs (list pkg-config))
(inputs
(list djvulibre zathura))
@@ -680,7 +687,7 @@ using the DjVuLibre library.")
(define-public zathura-pdf-mupdf
(package
(name "zathura-pdf-mupdf")
(version "2026.02.03")
(version "0.4.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -689,7 +696,7 @@ using the DjVuLibre library.")
(file-name (git-file-name name version))
(sha256
(base32
"1s4dnr5yl4bpqccp79y7i2dgd4qj7x4zrwms4l1id61il70rmmm4"))))
"1g1wiazyqdjd40qvq5vkxqabxzd0qlk6wvfvllm4y8x1jcc11vbs"))))
(native-inputs (list pkg-config))
(inputs
(list mupdf zathura))
@@ -718,7 +725,7 @@ by using the @code{mupdf} rendering library.")
(define-public zathura-pdf-poppler
(package
(name "zathura-pdf-poppler")
(version "2026.02.03")
(version "0.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -727,7 +734,7 @@ by using the @code{mupdf} rendering library.")
(file-name (git-file-name name version))
(sha256
(base32
"11ivqwwpj0rj4ar6b1p413j8zpcril1j0057lr0iz8a1x94vdmbm"))))
"1pzxhld2bfgq5403qn9w3acglvqnhfb2l959m9b149wa936rnfm8"))))
(native-inputs (list pkg-config))
(inputs
(list poppler zathura))
@@ -745,7 +752,7 @@ by using the poppler rendering engine.")
(define-public zathura
(package
(name "zathura")
(version "2026.03.27")
(version "0.5.12")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -754,7 +761,7 @@ by using the poppler rendering engine.")
(file-name (git-file-name name version))
(sha256
(base32
"1l5p0w84in8hlw07406ahkcg9x6ci56vp02i4fc3skp38svz0wia"))))
"1wrr9vr0d83kawkg0wj4i91g293cbjgyhmfspf4bxbs62x77zb9m"))))
(build-system meson-build-system)
(arguments
(list
@@ -787,9 +794,11 @@ by using the poppler rendering engine.")
(librsvg-for-system)
;; For tests.
check
xorg-server-for-tests))
(inputs (list json-glib sqlite))
(propagated-inputs (list girara gtk+))
(inputs (list sqlite))
;; Listed in 'Requires.private' of 'zathura.pc'.
(propagated-inputs (list cairo girara))
(native-search-paths
(list (search-path-specification
(variable "ZATHURA_PLUGINS_PATH")
+2 -2
View File
@@ -236,7 +236,7 @@ it.")
(define-public trealla
(package
(name "trealla")
(version "2.92.21")
(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 "1i6jn214098181izf74mq2mzmbq3lkbynhvpp6pfc2svf5z489pp"))
(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
+5 -52
View File
@@ -1766,31 +1766,6 @@ library of the same name. It eases monkey patching, for example to stub out
side effects when unit testing.")
(license license:expat)))
(define-public python-multipart-form-data-conformance
(package
(name "python-multipart-form-data-conformance")
(version "0.1a0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/simonw/multipart-form-data-conformance")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0lxaz00s5q5qdvqcyc233qd622f4fw6qsw2pny55j3v6ssn8m2v6"))))
(build-system pyproject-build-system)
(arguments
(list #:tests? #f)) ;XXX: tests need some setupt
(native-inputs
(list python-hatchling))
(home-page "https://github.com/simonw/multipart-form-data-conformance")
(synopsis "Conformance suite for HTTP multipart form data")
(description
"This package provides a language-independent test suite for validating
HTTP @code{multipart/form-data} parsers and generators.")
(license license:expat)))
(define-public python-mypy
(package
(name "python-mypy")
@@ -3314,28 +3289,6 @@ import them in their actual tests to use them.")
requests to be replied to with user provided responses.")
(license license:expat)))
(define-public python-pytest-instafail
(package
(name "python-pytest-instafail")
(version "0.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pytest-dev/pytest-instafail")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0dxlvvs08ln9y2d3bzs88c303xxgd0n18q9liy9kkdyhy54f70wa"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-pytest))
(native-inputs (list python-setuptools))
(home-page "https://github.com/pytest-dev/pytest-instafail")
(synopsis "Pytest plugin to show failures instantly")
(description
"This package provides a pytest plugin to show failures instantly.")
(license license:bsd-3)))
(define-public python-pytest-isort
(package
(name "python-pytest-isort")
@@ -5199,13 +5152,13 @@ interactions, which will update them to correspond to the new API.")
(define-public python-vulture
(package
(name "python-vulture")
(version "2.16")
(version "2.14")
(source
(origin
(method url-fetch)
(uri (pypi-uri "vulture" version))
(sha256
(base32 "05zpb79nhskdrbfmy4yk2wlkjgsvfv4l1hn6ldj1c083mzigdngq"))))
(base32 "05c4kfg6s2zf7lzplq53ihjf19knf3pmpv4nnzmdwf0i5a87g0nb"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -5221,10 +5174,10 @@ interactions, which will update them to correspond to the new API.")
" and not "))))
(native-inputs
(list python-pytest
python-pytest-cov
python-setuptools))
python-setuptools
python-wheel))
(propagated-inputs
(list python-tomli))
(list python-toml))
(home-page "https://github.com/jendrikseipp/vulture")
(synopsis "Find dead Python code")
(description
+45 -20
View File
@@ -1081,14 +1081,14 @@ files.")
(define-public python-eventlet
(package
(name "python-eventlet")
(version "0.40.4")
(version "0.40.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "eventlet" version))
(sha256
(base32
"0vzjrb7n3x7gdrxiw4dacdxvz0m8saaw9w7n1n9v865yn49gggk9"))))
"1c6qr1cnam79wxm1sh5y04061iyy3shs02yd0mlh47bngwknqqs2"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1116,8 +1116,9 @@ files.")
(("os\\.environ\\.get\\(\"EVENTLET_NO_GREENDNS\", ''\\)")
"os.environ.get(\"EVENTLET_NO_GREENDNS\", \"yes\")")))))))
(native-inputs
(list python-hatchling
(list python-pypa-build
python-hatch-vcs
python-hatchling
python-pytest))
(propagated-inputs
(list python-dnspython python-greenlet))
@@ -9728,14 +9729,16 @@ event loop. It is implemented in Cython and uses libuv under the hood.")
(define-public gunicorn
(package
(name "gunicorn")
(version "25.3.0")
(version "22.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "gunicorn" version))
(sha256
(base32
"12g85w735s4dszjfidi4vh786rfxsa5rd60il0fcvxknkwpinkpp"))))
"0qzc3ghayc137hlwrqqwkkhaf8f5h9ja21qwy4rznxpz75i462sa"))))
;; CVE-2024-1135 is fixed in version 22.0.0.
(properties `((lint-hidden-cve . ("CVE-2024-1135"))))
(outputs '("out" "doc"))
(build-system pyproject-build-system)
(arguments
@@ -9744,6 +9747,35 @@ event loop. It is implemented in Cython and uses libuv under the hood.")
;; does not work in the build container due to lack of /etc/resolv.conf
'("--ignore=tests/workers/test_geventlet.py")
#:phases (modify-phases %standard-phases
(add-after 'build 'build-doc
(lambda _
(invoke "make"
"-C"
"docs"
"PAPER=a4"
"html"
"info")
(delete-file "docs/build/texinfo/Makefile")
(delete-file "docs/build/texinfo/Gunicorn.texi")))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((doc (string-append (assoc-ref outputs "doc")
"/share/doc/"
,name "-"
,version))
(html (string-append doc "/html"))
(info (string-append doc "/info"))
(examples (string-append doc "/examples")))
(mkdir-p html)
(mkdir-p info)
(mkdir-p examples)
(copy-recursively "docs/build/html" html)
(copy-recursively "docs/build/texinfo" info)
(copy-recursively "examples" examples)
(for-each (lambda (file)
(copy-file file
(string-append doc "/" file)))
'("README.rst" "NOTICE" "LICENSE" "THANKS")))))
;; XXX: The wrap phase includes native inputs on PYTHONPATH, (see
;; <https://bugs.gnu.org/25235>), leading to an inflated closure
;; size. Override it to only add the essential entries.
@@ -9762,21 +9794,14 @@ event loop. It is implemented in Cython and uses libuv under the hood.")
(string-append output sitedir))
(list python out))))))))))
(inputs (list bash-minimal))
(native-inputs
(list binutils ;for ctypes.util.find_library()
python-eventlet
python-gevent
python-h2
python-httpx
python-pytest
python-pytest-asyncio
python-pytest-cov
python-setuptools
python-uvloop))
(propagated-inputs
(list python-packaging
python-setuptools
python-wheel))
(native-inputs (list binutils ;for ctypes.util.find_library()
python-aiohttp
python-gevent
python-pytest
python-pytest-cov
python-sphinx
texinfo))
(propagated-inputs (list python-packaging python-setuptools python-wheel))
(home-page "https://gunicorn.org/")
(synopsis "Python WSGI HTTP Server for UNIX")
(description
+13 -49
View File
@@ -1070,42 +1070,6 @@ Tkinter elements.")
decorators in Python.")
(license license:bsd-3)))
(define-public python-discovery
(package
(name "python-discovery")
(version "1.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tox-dev/python-discovery")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0zshaiar80h5zzbgv05z74kj8y4dgc96hwqfj2gziwdpcyl3rapp"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
;; assert []
#~(list "--deselect=tests/test_discovery.py::test_get_paths_no_path_env")))
(native-inputs
(list python-pytest
python-pytest-mock
python-hatchling
python-hatch-vcs))
(propagated-inputs
(list python-filelock
python-platformdirs))
(home-page "https://github.com/tox-dev/python-discovery")
(synopsis "Python interpreter discovery")
(description
"@code{python-discovery} is a library for discovering Python interpreters
installed on the current machine which may have multiple Python versions from
system packages, @code{pyenv}, @code{mise}, @code{asdf}, @code{uv}, or the
Windows registry (PEP 514). This library finds the right one.")
(license license:expat)))
(define-public python-distance
(let ((commit "ad7f9dc7e9b0e88a08d0cefd1442f4ab1dd1779b")
(revision "0"))
@@ -4562,7 +4526,7 @@ configuration file.")
(define-public python-pytooling
(package
(name "python-pytooling")
(version "8.14.0")
(version "8.12.0")
(source
(origin
(method git-fetch)
@@ -4571,7 +4535,7 @@ configuration file.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "02pm3h7y83rv7s6c9b861zzfqfrzrwyb31x2hjr6vj838h5kpvns"))))
(base32 "03zfm12n0zxnr51sybs7dy83q152p2jylahl1307icarpn8553c2"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -15771,16 +15735,16 @@ multiprecision arithmetic.")
(define-public python-plac
(package
(name "python-plac")
(version "1.4.3")
(version "1.3.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ialbert/plac")
(commit (string-append "v" version))))
(url "https://github.com/ialbert/plac")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0c9nagff8x7wk137yhs9fm1823c2l6yiyvm6w5gb0i4w5nsh6v0i"))))
(base32 "1n0cbil1snbn0diw8zjm7qs77zpbgmf2k76mc2jknhk1hbnksyak"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -16934,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
@@ -20992,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
+13 -5
View File
@@ -370,7 +370,6 @@ window managers, that don't provide Qt integration by themselves.")
(uri (git-reference
(url "https://www.opencode.net/trialuser/qt6ct")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "17hfx90wnc40a1sq0qcdp2hml5mkjhlj5rwm95pc40p03nicpn67"))))
(build-system qt-build-system)
@@ -1091,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.
@@ -1194,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
+47 -21
View File
@@ -7970,46 +7970,50 @@ alternative to Marshal for Object serialization.")
(license license:expat)))
(define-public ruby-pg
(let ((commit "378b7a35c12292625460ef2f33373de7114bf255")
(revision "0"))
(package
(name "ruby-pg")
(version "1.6.2")
(version (git-version "1.5.9" revision commit))
(home-page "https://github.com/ged/ruby-pg")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "14164l86xjla4sbaw8flnd2krc2n61l6gjvmmy31v07w5ys4xyjj"))))
(base32 "1aq6kakyghgbb4yykxxl9ziaaa7jbdbyc7vz6avyxhlby1jkj0m8"))
(patches
(search-patches "ruby-pg-fix-connect-timeout.patch"))))
(build-system ruby-build-system)
(arguments
(list
#:test-target "spec"
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'compile
(lambda _
(invoke "rake" "compile")))
;; Some tests rely on postgresql_lib_path.rb, but it is not
;; available until the gem is installed. Run tests after
;; installing to work around it.
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? #:allow-other-keys)
(let ((new-gem (string-append #$output
"/lib/ruby/vendor_ruby")))
(setenv "GEM_PATH"
(string-append (getenv "GEM_PATH") ":" new-gem))
(when tests?
(invoke "rspec"))))))))
(add-before 'build 'compile
(lambda _
(invoke "rake" "compile")))
;; Some tests rely on postgresql_lib_path.rb, but it is not
;; available until the gem is installed. Run tests after
;; installing to work around it.
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? #:allow-other-keys)
(let ((new-gem (string-append #$output
"/lib/ruby/vendor_ruby")))
(setenv "GEM_PATH"
(string-append (getenv "GEM_PATH") ":" new-gem))
(when tests?
(invoke "rspec"))))))))
(native-inputs (list ruby-rake-compiler ruby-hoe ruby-rspec))
(inputs (list postgresql))
(synopsis "Ruby interface to PostgreSQL")
(description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works
with PostgreSQL 10 and later.")
(license license:ruby)))
with PostgreSQL 9.3 and later.")
(license license:ruby))))
(define-public ruby-byebug
(package
@@ -11994,6 +11998,28 @@ generation.")
(home-page "https://github.com/halostatue/hoe-git2")
(license license:expat)))
(define-public ruby-hoe-git
(package
(name "ruby-hoe-git")
(version "1.6.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "hoe-git" version))
(sha256
(base32
"10jmmbjm0lkglwxbn4rpqghgg1ipjxrswm117n50adhmy8yij650"))))
(build-system ruby-build-system)
(propagated-inputs
(list ruby-hoe-3))
(synopsis "Hoe plugins for tighter Git integration")
(description
"This package provides a set of Hoe plugins for tighter Git integration.
It provides tasks to automate release tagging and pushing and changelog
generation.")
(home-page "https://github.com/jbarnette/hoe-git")
(license license:expat)))
(define-public ruby-hoe-markdown
(package
(name "ruby-hoe-markdown")
+135
View File
@@ -41642,6 +41642,141 @@
rust-wit-bindgen-rt-0.39.0
rust-zerocopy-0.8.26
rust-zerocopy-derive-0.8.26))
(circtools =>
(list rust-adler2-2.0.0
rust-aho-corasick-1.1.3
rust-alga-0.9.3
rust-android-tzdata-0.1.1
rust-android-system-properties-0.1.5
rust-anyhow-1.0.97
rust-approx-0.3.2
rust-array-macro-1.0.5
rust-autocfg-1.4.0
rust-bio-0.33.0
rust-bio-types-1.0.4
rust-bit-set-0.5.3
rust-bit-vec-0.6.3
rust-buffer-redux-1.0.2
rust-bumpalo-3.17.0
rust-bv-0.11.1
rust-bytecount-0.6.8
rust-byteorder-1.5.0
rust-cc-1.2.18
rust-cfg-if-1.0.0
rust-chrono-0.4.40
rust-cmake-0.1.54
rust-console-0.15.11
rust-core-foundation-sys-0.8.7
rust-crc32fast-1.4.2
rust-crossbeam-utils-0.8.21
rust-csv-1.3.1
rust-csv-core-0.1.12
rust-custom-derive-0.1.7
rust-derive-new-0.6.0
rust-docopt-1.1.1
rust-either-1.15.0
rust-encode-unicode-1.0.0
rust-enum-map-0.6.6
rust-enum-map-derive-0.4.6
rust-feature-probe-0.1.1
rust-fixedbitset-0.2.0
rust-flate2-1.1.1
rust-fnv-1.0.7
rust-fxhash-0.2.1
rust-generic-array-0.13.3
rust-getrandom-0.1.16
rust-getset-0.0.9
rust-hashbrown-0.12.3
rust-heck-0.3.3
rust-heck-0.5.0
rust-iana-time-zone-0.1.63
rust-iana-time-zone-haiku-0.1.2
rust-indexmap-1.9.3
rust-indicatif-0.15.0
rust-itertools-0.9.0
rust-itertools-num-0.1.3
rust-itoa-1.0.15
rust-js-sys-0.3.77
rust-lazy-static-1.5.0
rust-libc-0.2.171
rust-libm-0.2.11
rust-log-0.4.27
rust-matrixmultiply-0.2.4
rust-memchr-2.7.4
rust-miniz-oxide-0.8.7
rust-multimap-0.8.3
rust-nalgebra-0.19.0
rust-ndarray-0.14.0
rust-newtype-derive-0.1.6
rust-num-complex-0.2.4
rust-num-complex-0.3.1
rust-num-integer-0.1.46
rust-num-rational-0.2.4
rust-num-traits-0.2.19
rust-number-prefix-0.3.0
rust-once-cell-1.21.3
rust-ordered-float-1.1.1
rust-petgraph-0.5.1
rust-ppv-lite86-0.2.21
rust-proc-macro2-1.0.94
rust-quote-1.0.40
rust-rand-0.7.3
rust-rand-chacha-0.2.2
rust-rand-core-0.5.1
rust-rand-distr-0.2.2
rust-rand-hc-0.2.0
rust-rawpointer-0.2.1
rust-regex-1.11.1
rust-regex-automata-0.4.9
rust-regex-syntax-0.8.5
rust-rustc-version-0.1.7
rust-rustversion-1.0.20
rust-ryu-1.0.20
rust-scoped-threadpool-0.1.9
rust-semver-0.1.20
rust-seq-io-0.3.4
rust-serde-1.0.219
rust-serde-derive-1.0.219
rust-shlex-1.3.0
rust-statrs-0.13.0
rust-strsim-0.10.0
rust-strum-0.20.0
rust-strum-macros-0.20.1
rust-strum-macros-0.26.4
rust-syn-1.0.109
rust-syn-2.0.100
rust-thiserror-1.0.69
rust-thiserror-impl-1.0.69
rust-triple-accel-0.3.4
rust-typenum-1.18.0
rust-unicode-ident-1.0.18
rust-unicode-segmentation-1.12.0
rust-unicode-width-0.2.0
rust-vec-map-0.8.2
rust-wasi-0.9.0+wasi-snapshot-preview1
rust-wasm-bindgen-0.2.100
rust-wasm-bindgen-backend-0.2.100
rust-wasm-bindgen-macro-0.2.100
rust-wasm-bindgen-macro-support-0.2.100
rust-wasm-bindgen-shared-0.2.100
rust-windows-core-0.61.0
rust-windows-implement-0.60.0
rust-windows-interface-0.59.1
rust-windows-link-0.1.1
rust-windows-result-0.3.2
rust-windows-strings-0.4.0
rust-windows-sys-0.59.0
rust-windows-targets-0.52.6
rust-windows-aarch64-gnullvm-0.52.6
rust-windows-aarch64-msvc-0.52.6
rust-windows-i686-gnu-0.52.6
rust-windows-i686-gnullvm-0.52.6
rust-windows-i686-msvc-0.52.6
rust-windows-x86-64-gnu-0.52.6
rust-windows-x86-64-gnullvm-0.52.6
rust-windows-x86-64-msvc-0.52.6
rust-zerocopy-0.8.24
rust-zerocopy-derive-0.8.24))
(clamav =>
(list rust-adler2-2.0.0
rust-adler32-1.2.0
-5
View File
@@ -515,11 +515,6 @@ database.")
(substitute* "src/sage/interfaces/gp.py"
(("command=f\"gp")
(string-append "command=f\"" pari-gp "/bin/gp")))
;; Remove when updating to sage-10.8, python-3.12.
;; See https://github.com/sagemath/sage/pull/41141
(substitute* "src/sage/repl/display/formatter.py"
(("from IPython.utils.py3compat import unicode_to_str") "")
(("unicode_to_str\\(self.newline\\)") "self.newline"))
(substitute* "src/bin/sage"
(("exec python3")
(string-append "exec " python "/bin/python3"))
+3 -3
View File
@@ -443,10 +443,10 @@ and not propagated to upstream.")
"0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg"))))
(define-public tdlib
(let ((commit "e597838871547131ef92332fca601f5effba4e8a"))
(let ((commit "0da5c72f8365fb4857096e716d53175ddbdf5a15"))
(package
(name "tdlib")
(version "1.8.62")
(version "1.8.60")
(source
(origin
(method git-fetch)
@@ -454,7 +454,7 @@ and not propagated to upstream.")
(url "https://github.com/tdlib/td")
(commit commit)))
(sha256
(base32 "0v246dj6s8i15scmbyf661w7xmbm8hkr623q0xsgwmcq6qp61l2r"))
(base32 "12l8hmqp97vl9qcnamv8mpa089mbzc7qqf6cagdlgvm28p7l3dfi"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
+7 -9
View File
@@ -27,7 +27,6 @@
;;; Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
;;; Copyright © 2026 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -268,14 +267,13 @@ https://www.soft-switch.org/index.html")
(sha256 (base32
"0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk"))))
(arguments
(list #:make-flags #~(list "CXXFLAGS=-std=c++11 -fpermissive")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _
(substitute* "src/applog.cpp"
(("^// TODO sc.*")
"#include <sys/types.h>\n#include <sys/stat.h>\n")))))))
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _
(substitute* "src/applog.cpp"
(("^// TODO sc.*") "#include <sys/types.h>\n#include <sys/stat.h>\n"))
#t)))))
(build-system gnu-build-system)
(synopsis "(u)Common C++ framework for threaded applications")
(description "GNU Common C++ is an portable, optimized class framework for
+50 -54
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>
@@ -3039,16 +3039,16 @@ Jellyfin. It has support for various media files without transcoding.")
(define-public gallery-dl
(package
(name "gallery-dl")
(version "1.31.10")
(version "1.30.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://codeberg.org/mikf/gallery-dl")
(url "https://github.com/mikf/gallery-dl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1yv7nvljrpfd8w1jnsxmn1h1jd294kc89ck68va0h7j1n26pv6wy"))))
(base32 "1rgzgmw11b0ay1cf42cshn35gvll9iypw7phi389r5ahf56am6h4"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -3057,7 +3057,7 @@ Jellyfin. It has support for various media files without transcoding.")
(native-inputs
(list python-pytest python-setuptools python-wheel nss-certs-for-test))
(inputs (list python-requests ffmpeg))
(home-page "https://codeberg.org/mikf/gallery-dl")
(home-page "https://github.com/mikf/gallery-dl")
(synopsis "Command-line program to download images from several sites")
(description
"Gallery-dl is a command-line program that downloads image galleries and
@@ -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
+2 -2
View File
@@ -2560,7 +2560,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
(define-public skopeo
(package
(name "skopeo")
(version "1.22.1")
(version "1.22.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2569,7 +2569,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
(file-name (git-file-name name version))
(sha256
(base32
"0h32h02dvh6dx587idqi11938k293kawvd4d3xk5hwdi6cmpabri"))))
"0gj9idhhl76n5zbi38h229w4ycpsx125gfmhpbwfz4gwwjm0w4qi"))))
(build-system gnu-build-system)
(native-inputs
(list go-1.24
+59 -86
View File
@@ -1553,6 +1553,32 @@ It aims to conform to RFC 7159.")
" -Wno-error=calloc-transposed-args"
" -Wno-error=implicit-function-declaration"))))))
(define-public json-c-0.12
(package
(inherit json-c-0.13)
(version "0.12.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://s3.amazonaws.com/json-c_releases/releases/json-c-"
version ".tar.gz"))
(sha256
(base32 "08qibrq29a5v7g23wi5icy6l4fbfw90h9ccps6vq0bcklx8n84ra"))
(patches (search-patches "json-c-0.12-CVE-2020-12762.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; Somehow 'config.h.in' is older than
;; 'aclocal.m4', which would trigger a rule to
;; run 'autoheader'.
(set-file-time "config.h.in"
(stat "aclocal.m4"))
;; Don't try to build with -Werror.
(substitute* (find-files "." "Makefile\\.in")
(("-Werror") ""))
#t))))))
(define-public json-parser
(package
(name "json-parser")
@@ -9903,64 +9929,45 @@ of Geminispace, but it defaults to a specific domain.")
(home-page "https://github.com/ferdinandyb/maildir-rank-addr")
(synopsis "Generate an addressbook from locally available email")
(description
"This package generates a ranked addressbook from your locally available
email. It can be used in MUA's like @url{http://aerc-mail.org, aerc} or
@url{http://www.mutt.org/,mutt} by grepping the list.")
"This package implements a functionality to generate a ranked addressbook
from your locally available email. It can be used in MUA's like
@url{http://aerc-mail.org, aerc} or @url{http://www.mutt.org/,mutt} by
grepping the list.")
(license license:expat)))
(define-public libzim
(let* ((testsuite-version "0.9.0")
(testsuite-file-name (git-file-name "zim-testing-suite"
testsuite-version)))
(package
(name "libzim")
(version "9.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openzim/libzim")
(commit version)))
(sha256
(base32
"1il1vc1hs954s3vnwhr337165dxbykvrldrvbilp5jxbkmwqb60d"))
(file-name (git-file-name name version))))
(build-system meson-build-system)
(arguments
(list
#:configure-flags
#~(list
(string-append "-Dtest_data_dir="
#+(this-package-native-input testsuite-file-name)
"/data"))))
(inputs
(list icu4c
python-wrapper ; for libzim-compile-resources
xapian
xz
(list util-linux "lib")
(list zstd "lib")))
(native-inputs
(list pkg-config
googletest
;; The testsuite is a pre-generated artifact that can be
;; regenerated from the upstream repository, but it
;; explicitely advises against it. Use it pregenerated.
;; Using git-fetch allows us to avoid additional unpacking.
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openzim/zim-testing-suite")
(commit testsuite-version)))
(file-name testsuite-file-name)
(sha256
(base32 "14ac58i0zzvzssl5fyykc494jlw4ia8dhfr10hmi8h3gfn08dm62")))))
(home-page "https://wiki.openzim.org/wiki/Main_Page")
(synopsis "Reference implementation of the ZIM specification")
(description "The openZIM project proposes offline storage solutions for
(package
(name "libzim")
(version "9.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openzim/libzim")
(commit version)))
(sha256
(base32
"1il1vc1hs954s3vnwhr337165dxbykvrldrvbilp5jxbkmwqb60d"))
(file-name (git-file-name name version))))
(build-system meson-build-system)
(arguments
;; TODO: Find out why tests fail.
'(#:tests? #f))
(inputs
(list icu4c
python-wrapper ; for libzim-compile-resources
xapian
xz
(list util-linux "lib")
(list zstd "lib")))
(native-inputs
(list pkg-config googletest))
(home-page "https://wiki.openzim.org/wiki/Main_Page")
(synopsis "Reference implementation of the ZIM specification")
(description "The openZIM project proposes offline storage solutions for
content coming from the Web. The zimlib is the standard implementation of the
ZIM specification. It is a library which implements the read and write method
for ZIM files.")
(license license:gpl2))))
(license license:gpl2)))
(define-public kiwix-lib
(package
@@ -10382,40 +10389,6 @@ libraries.")
console, a file, syslog, journald, or a callback function.")
(license license:lgpl2.1)))
(define-public yoga
(package
(name "yoga")
(version "3.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/facebook/yoga")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"09g2kispng520mcaky87lkpj7k1lscsz2jyv05cjxzfrwwf4pfyb"))))
(build-system cmake-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'use-system-googletest
(lambda _
(substitute* "tests/CMakeLists.txt"
(("FetchContent_MakeAvailable[(]googletest[)]")
"find_package(GTest REQUIRED)"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./tests/yogatests")))))))
(inputs (list googletest))
(home-page "https://github.com/facebook/yoga/")
(synopsis "Flexbox layout engine")
(description
"Yoga is an embeddable and performant flexbox layout engine with bindings
for multiple languages.")
(license license:expat)))
(define-public ulfius
(package
(name "ulfius")
+6 -14
View File
@@ -10,7 +10,6 @@
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;; Copyright © 2021 Aljosha Papsch <ep@stern-data.com>
;;; Copyright © 2025, 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
;;; Copyright © 2025, 2026 Ashvith Shetty <ashvithshetty0010@zohomail.in>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -810,22 +809,16 @@ port=" (number->string port) "
;;; Redis
;;;
(define-maybe string (prefix redis-))
(define-maybe string)
(define (uglify-field-name field-name)
(string-delete #\? (symbol->string field-name)))
(define (redis-serialize-field field-name val)
(format #f "~a=~a\n" (uglify-field-name field-name) val))
(define (serialize-field field-name val)
#~(format #f "~a=~a\n" #$(uglify-field-name field-name) #$val))
(define redis-serialize-package
serialize-package)
(define redis-serialize-string
redis-serialize-field)
(define redis-serialize-number
redis-serialize-field)
(define serialize-string serialize-field)
(define serialize-number serialize-field)
(define-configuration redis-configuration
(redis (package redis)
@@ -838,8 +831,7 @@ a value of 0 will disable listening on a TCP socket.")
(working-directory (string "/var/lib/redis")
"Directory in which to store the
database and related files.")
(config-file maybe-string "Default location for config file.")
(prefix redis-))
(config-file maybe-string "Default location for config file."))
(define (default-redis.conf bind port working-directory)
(mixed-text-file "redis.conf"
+6 -10
View File
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015-2023, 2025-2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015-2023, 2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net>
@@ -987,15 +987,11 @@ of index files."
(modules `((ice-9 match)
,@%default-modules))
(start (nginx-action "-p" run-directory))
(stop #~(lambda (value)
;; When the PID is known, use 'terminate-process', which
;; waits for the main process to actually terminate.
;; When FILE is true, there's potentially no PID file
;; and thus the PID is not known; in that case, invoke
;; "nginx -s stop".
(if (process? value)
(terminate-process (process-id value) SIGTERM)
(#$(nginx-action "stop")))))
;; Instead of invoking "nginx -s stop", use
;; 'make-kill-destructor', which waits for the main process to
;; actually terminate.
(stop #~(make-kill-destructor))
(actions
(list
+48 -157
View File
@@ -209,162 +209,58 @@ requests is allowed for the underlying device. EXTRA-OPTIONS is a list of
additional options to be passed to the 'cryptsetup open' command."
(with-imported-modules (source-module-closure
'((gnu build file-systems)
(guix base16)
(guix build utils))) ;; For mkdir-p
(match targets
((target)
#~(begin
(use-modules (guix base16))
#~(let ((source #$(if (uuid? source)
(uuid-bytevector source)
source))
(keyfile #$key-file))
(let ((source #$(if (uuid? source)
(uuid-bytevector source)
source))
(keyfile #$key-file))
;; Create '/run/cryptsetup/' if it does not exist, as device locking
;; is mandatory for LUKS2.
(mkdir-p "/run/cryptsetup/")
(define (luks-script-lookup-key partition)
"Parse /etc/luks_script and return the master key as a
bytevector for PARTITION. Throw to 'luks-script-error with a message
string if the file is missing, the partition UUID cannot be read, or
no matching entry is found."
(let ((script-file "/etc/luks_script"))
(unless (file-exists? script-file)
(throw 'luks-script-error
(format #f "~a not found, skipping"
script-file)))
(let ((part-uuid-hex
(or (and=> (read-luks-partition-uuid partition)
bytevector->base16-string)
(throw 'luks-script-error
(format #f
"could not read UUID from ~a"
partition)))))
(call-with-input-file script-file
(lambda (port)
(let loop ((line (read-line port)))
(when (eof-object? line)
(throw 'luks-script-error
(format #f
"no matching UUID ~a in ~a"
part-uuid-hex script-file)))
(match (string-tokenize line)
(((or "luks_mount" "luks2_mount")
script-uuid _ ... hex-key)
(if (string-ci=? (string-delete #\- script-uuid)
part-uuid-hex)
(base16-string->bytevector hex-key)
(loop (read-line port))))
(_ (loop (read-line port))))))))))
(define (open-luks-with-volume-key cryptsetup-program key-bv
partition target
extra-open-flags)
"Open LUKS device PARTITION as TARGET using volume key KEY-BV.
Return the exit status of cryptsetup. KEY-BV is securely wiped and
the temporary key file removed regardless of outcome."
(let ((key-file "/run/.luks-master-key"))
(dynamic-wind
(const #t)
(lambda ()
(call-with-port (open-file key-file "wb")
(lambda (p) (put-bytevector p key-bv)))
(chmod key-file #o400)
(apply system*/tty cryptsetup-program
"open" "--type" "luks"
"--volume-key-file" key-file
(append extra-open-flags
(list partition target))))
(lambda ()
(bytevector-fill! key-bv 0)
(when (file-exists? key-file)
(delete-file key-file))))))
(define (try-luks-script-master-key cryptsetup-program
partition target
extra-open-flags)
"Try to open LUKS device PARTITION as TARGET using a master key
from /etc/luks_script (injected by GRUB). EXTRA-OPEN-FLAGS is a list of
additional flags to pass to 'cryptsetup open' (e.g., \"--allow-discards\").
Return #t on success, #f if /etc/luks_script does not exist or the UUID
does not match. Any other error (parse failure, cryptsetup failure) is
NOT caught--it will be visible so bugs cannot hide."
(catch 'luks-script-error
(lambda ()
(let* ((key-bv (luks-script-lookup-key partition))
(status (open-luks-with-volume-key
cryptsetup-program key-bv
partition target extra-open-flags)))
(if (zero? status)
(begin
(format (current-error-port)
"luks-master-key: unlocked ~a as ~a~%"
partition target)
#t)
(begin
(format (current-error-port)
"luks-master-key: cryptsetup failed (status ~a) for ~a~%"
status partition)
#f))))
(lambda (key msg . rest)
(format (current-error-port)
"luks-master-key: ~a~%" msg)
#f)))
;; Create '/run/cryptsetup/' if it does not exist, as device locking
;; is mandatory for LUKS2.
(mkdir-p "/run/cryptsetup/")
;; Use 'cryptsetup-static', not 'cryptsetup', to avoid pulling the
;; whole world inside the initrd (for when we're in an initrd).
;; 'cryptsetup open' requires standard input to be a tty to allow
;; for interaction but shepherd sets standard input to /dev/null;
;; thus, explicitly request a tty.
(let ((partition
;; Note: We cannot use the "UUID=source" syntax here
;; because 'cryptsetup' implements it by searching the
;; udev-populated /dev/disk/by-id directory but udev may
;; be unavailable at the time we run this.
(if (bytevector? source)
(or (let loop ((tries-left 10))
(and (positive? tries-left)
(or (find-partition-by-luks-uuid source)
;; If the underlying partition is
;; not found, try again after
;; waiting a second, up to ten
;; times. FIXME: This should be
;; dealt with in a more robust way.
(begin (sleep 1)
(loop (- tries-left 1))))))
(error "LUKS partition not found" source))
source)))
(let ((cryptsetup #$(file-append cryptsetup-static
"/sbin/cryptsetup"))
(cryptsetup-flags (cons*
"open" "--type" "luks"
(append
(if #$allow-discards?
'("--allow-discards")
'())
'#$extra-options
(list partition #$target)))))
;; Try the GRUB-provided LUKS master key first (from
;; /etc/luks_script, injected into the initrd via GRUB's
;; newc: mechanism). This avoids prompting for the password
;; a second time when GRUB already decrypted the same LUKS
;; volume. Fall back to keyfile or interactive password on
;; any failure.
(or (try-luks-script-master-key cryptsetup partition #$target
(append
(if #$allow-discards?
'("--allow-discards")
'())
'#$extra-options))
;; We want to fallback to the password unlock if the
;; keyfile fails.
(and keyfile
(zero? (apply system*/tty cryptsetup
"--key-file" keyfile cryptsetup-flags)))
(zero? (apply system*/tty cryptsetup
cryptsetup-flags)))))))))))
;; Use 'cryptsetup-static', not 'cryptsetup', to avoid pulling the
;; whole world inside the initrd (for when we're in an initrd).
;; 'cryptsetup open' requires standard input to be a tty to allow
;; for interaction but shepherd sets standard input to /dev/null;
;; thus, explicitly request a tty.
(let ((partition
;; Note: We cannot use the "UUID=source" syntax here
;; because 'cryptsetup' implements it by searching the
;; udev-populated /dev/disk/by-id directory but udev may
;; be unavailable at the time we run this.
(if (bytevector? source)
(or (let loop ((tries-left 10))
(and (positive? tries-left)
(or (find-partition-by-luks-uuid source)
;; If the underlying partition is
;; not found, try again after
;; waiting a second, up to ten
;; times. FIXME: This should be
;; dealt with in a more robust way.
(begin (sleep 1)
(loop (- tries-left 1))))))
(error "LUKS partition not found" source))
source)))
(let ((cryptsetup #$(file-append cryptsetup-static
"/sbin/cryptsetup"))
(cryptsetup-flags (cons*
"open" "--type" "luks"
(append
(if #$allow-discards?
'("--allow-discards")
'())
'#$extra-options
(list partition #$target)))))
;; We want to fallback to the password unlock if the keyfile
;; fails.
(or (and keyfile
(zero? (apply system*/tty cryptsetup
"--key-file" keyfile cryptsetup-flags)))
(zero? (apply system*/tty cryptsetup
cryptsetup-flags))))))))))
(define* (close-luks-device source targets #:rest _)
"Return a gexp that closes TARGET, a LUKS device."
@@ -414,13 +310,8 @@ argument of `open-luks-device'")
(close close-luks-device)
(check check-luks-device)
(modules '((rnrs bytevectors) ;bytevector?
(rnrs io ports) ;put-bytevector
(ice-9 match) ;match
(ice-9 rdelim) ;read-line
((gnu build file-systems)
#:select (find-partition-by-luks-uuid
read-luks-partition-uuid
system*/tty))))))
#:select (find-partition-by-luks-uuid system*/tty))))))
(define-deprecated (luks-device-mapping-with-options #:key
key-file allow-discards?)

Some files were not shown because too many files have changed in this diff Show More