me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into gnome-team.

Browse source
This commit is contained in:
Liliana Marie Prikler 2023-09-15 18:20:38 +02:00
commit e9ff5d51e3
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
110 changed files with 3624 additions and 1895 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
doc/guix.texi
View file

@ -16834,24 +16834,37 @@ instance to support new system services.
The operating system is configured by providing an The operating system is configured by providing an
@code{operating-system} declaration in a file that can then be passed to @code{operating-system} declaration in a file that can then be passed to
the @command{guix system} command (@pxref{Invoking guix system}). A the @command{guix system} command (@pxref{Invoking guix system}). A
simple setup, with the default system services, the default Linux-Libre simple setup, with the default Linux-Libre
kernel, initial RAM disk, and boot loader looks like this: kernel, initial RAM disk, and a couple of system services added to those
provided by default looks like this:
@findex operating-system @findex operating-system
@lisp @lisp
@include os-config-bare-bones.texi @include os-config-bare-bones.texi
@end lisp @end lisp
This example should be self-describing. Some of the fields defined The configuration is declarative and hopefully mostly self-describing.
It is actually code in the Scheme programming language; the whole
@code{(operating-system @dots{})} expression produces a @dfn{record}
with a number of @dfn{fields}.
Some of the fields defined
above, such as @code{host-name} and @code{bootloader}, are mandatory. above, such as @code{host-name} and @code{bootloader}, are mandatory.
Others, such as @code{packages} and @code{services}, can be omitted, in Others, such as @code{packages} and @code{services}, can be omitted, in
which case they get a default value. which case they get a default value. @xref{operating-system Reference},
for details about all the available fields.
Below we discuss the effect of some of the most important fields Below we discuss the effect of some of the most important fields,
(@pxref{operating-system Reference}, for details about all the available and how to @dfn{instantiate} the operating system using
fields), and how to @dfn{instantiate} the operating system using
@command{guix system}. @command{guix system}.
@quotation Do not panic
@cindex Scheme programming language, getting started
Intimidated by the Scheme language or curious about it? The Cookbook
has a short section to get started that explains the fundamentals, which
you will find helpful when hacking your configuration. @xref{A Scheme
Crash Course,,, guix-cookbook, GNU Guix Cookbook}.
@end quotation
@unnumberedsubsec Bootloader @unnumberedsubsec Bootloader
@cindex legacy boot, on Intel machines @cindex legacy boot, on Intel machines
@ -17025,14 +17038,6 @@ Alternatively, the @code{modify-services} macro can be used:
(delete avahi-service-type)) (delete avahi-service-type))
@end lisp @end lisp
@quotation Do not panic
@cindex Scheme programming language, getting started
Intimidated by the Scheme language or curious about it? The Cookbook
has a short section to get started that explains the fundamentals, which
you will find helpful when hacking your configuration. @xref{A Scheme
Crash Course,,, guix-cookbook, GNU Guix Cookbook}.
@end quotation
@unnumberedsubsec Instantiating the System @unnumberedsubsec Instantiating the System
Assuming the @code{operating-system} declaration Assuming the @code{operating-system} declaration
@ -38083,6 +38088,65 @@ File name of the file system key for the target volume.
@node Guix Services @node Guix Services
@subsection Guix Services @subsection Guix Services
@subsubheading Build Farm Front-End (BFFE)
The @uref{https://git.cbaines.net/guix/bffe/,Build Farm Front-End}
assists with building Guix packages in bulk. It's responsible for
submitting builds and displaying the status of the build farm.
@defvar bffe-service-type
Service type for the Build Farm Front-End. Its value must be a
@code{bffe-configuration} object.
@end defvar
@deftp {Data Type} bffe-configuration
Data type representing the configuration of the Build Farm Front-End.
@table @asis
@item @code{package} (default: @code{bffe})
The Build Farm Front-End package to use.
@item @code{user} (default: @code{"bffe"})
The system user to run the service as.
@item @code{group} (default: @code{"bffe"})
The system group to run the service as.
@item @code{arguments}
A list of arguments to the Build Farm Front-End. These are passed to
the @code{run-bffe-service} procedure when starting the service.
For example, the following value directs the Build Farm Front-End to
submit builds for derivations available from @code{data.guix.gnu.org} to
the Build Coordinator instance assumed to be running on the same
machine.
@example
(list
#:build
(list
(build-from-guix-data-service
(data-service-url "https://data.guix.gnu.org")
(build-coordinator-url "http://127.0.0.1:8746")
(branches '("master"))
(systems '("x86_64-linux" "i686-linux"))
(systems-and-targets
(map (lambda (target)
(cons "x86_64-linux" target))
'("aarch64-linux-gnu"
"i586-pc-gnu")))
(build-priority (const 0))))
#:web-server-args
'(#:event-source "https://example.com"
#:controller-args
(#:title "example.com build farm")))
@end example
@item @code{extra-environment-variables} (default: @var{'()})
Extra environment variables to set via the shepherd service.
@end table
@end deftp
@subsubheading Guix Build Coordinator @subsubheading Guix Build Coordinator
The @uref{https://git.cbaines.net/guix/build-coordinator/,Guix Build The @uref{https://git.cbaines.net/guix/build-coordinator/,Guix Build
Coordinator} aids in distributing derivation builds among machines Coordinator} aids in distributing derivation builds among machines

21
etc/time-travel-manifest.scm
View file

@ -66,12 +66,21 @@
(define %release-commits (define %release-commits
;; Release commits: the list of version/commit pairs. ;; Release commits: the list of version/commit pairs.
'(("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff") '(("1.4.0" . "8e2f32cee982d42a79e53fc1e9aa7b8ff0514714")
("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") ("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff")
("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2")
("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") ;; FIXME: To merely compute the derivation of these revisions, we need to
("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") ;; be able to build their dependencies. However, pre-built binaries are
("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c"))) ;; currently missing and some of these no longer build from source due to
;; time bombs like <https://issues.guix.gnu.org/58650>. Thus, comment
;; them output until we have substitutes for these old things.
;; ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063")
;; ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2")
;; ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac")
;; ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c")
;; ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c")
))
(manifest (manifest
(map (match-lambda (map (match-lambda

2
gnu/home/services/desktop.scm
View file

@ -172,7 +172,7 @@ format."))
;; FIXME: This fails to start if Home is first activated from a ;; FIXME: This fails to start if Home is first activated from a
;; non-X11 session. ;; non-X11 session.
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$(file-append redshift "/bin/redshift") (list #$(file-append (home-redshift-configuration-redshift config) "/bin/redshift")
"-c" #$config-file))) "-c" #$config-file)))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
(actions (list (shepherd-configuration-action config-file)))))) (actions (list (shepherd-configuration-action config-file))))))

18
gnu/local.mk
View file

@ -914,6 +914,7 @@ dist_patch_DATA = \
%D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/ark-skip-xar-test.patch \ %D%/packages/patches/ark-skip-xar-test.patch \
%D%/packages/patches/arpack-ng-propagate-rng-state.patch \ %D%/packages/patches/arpack-ng-propagate-rng-state.patch \
%D%/packages/patches/asli-use-system-libs.patch \
%D%/packages/patches/aspell-CVE-2019-25051.patch \ %D%/packages/patches/aspell-CVE-2019-25051.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \
@ -1180,9 +1181,15 @@ dist_patch_DATA = \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \
%D%/packages/patches/ganeti-haskell-pythondir.patch \ %D%/packages/patches/ganeti-haskell-pythondir.patch \
%D%/packages/patches/ganeti-lens-compat.patch \
%D%/packages/patches/ganeti-pyyaml-compat.patch \ %D%/packages/patches/ganeti-pyyaml-compat.patch \
%D%/packages/patches/ganeti-procps-compat.patch \
%D%/packages/patches/ganeti-reorder-arbitrary-definitions.patch \
%D%/packages/patches/ganeti-relax-dependencies.patch \
%D%/packages/patches/ganeti-shepherd-master-failover.patch \ %D%/packages/patches/ganeti-shepherd-master-failover.patch \
%D%/packages/patches/ganeti-shepherd-support.patch \ %D%/packages/patches/ganeti-shepherd-support.patch \
%D%/packages/patches/ganeti-template-haskell-2.17.patch \
%D%/packages/patches/ganeti-template-haskell-2.18.patch \
%D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \
@ -1283,6 +1290,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \ %D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \
%D%/packages/patches/glibc-2.37-versioned-locpath.patch \ %D%/packages/patches/glibc-2.37-versioned-locpath.patch \
%D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \
%D%/packages/patches/glibc-hurd-getauxval.patch \
%D%/packages/patches/glibc-hurd-gettyent.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \
%D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-mach-print.patch \
%D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \
@ -1369,10 +1377,8 @@ dist_patch_DATA = \
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
%D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \
%D%/packages/patches/gzdoom-find-system-libgme.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \
%D%/packages/patches/hdf4-architectures.patch \
%D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-reproducibility.patch \
%D%/packages/patches/hdf4-shared-fortran.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \
%D%/packages/patches/hdf4-tirpc.patch \
%D%/packages/patches/hdf5-config-date.patch \ %D%/packages/patches/hdf5-config-date.patch \
%D%/packages/patches/hdf-eos2-build-shared.patch \ %D%/packages/patches/hdf-eos2-build-shared.patch \
%D%/packages/patches/hdf-eos2-remove-gctp.patch \ %D%/packages/patches/hdf-eos2-remove-gctp.patch \
@ -1414,7 +1420,6 @@ dist_patch_DATA = \
%D%/packages/patches/inkscape-poppler-compat.patch \ %D%/packages/patches/inkscape-poppler-compat.patch \
%D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
@ -1449,6 +1454,7 @@ dist_patch_DATA = \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/julia-Use-MPFR-4.2.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \
%D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \
%D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \
%D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \
@ -1479,6 +1485,7 @@ dist_patch_DATA = \
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \ %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
%D%/packages/patches/kodi-mesa-eglchromium.patch \ %D%/packages/patches/kodi-mesa-eglchromium.patch \
%D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/laby-make-install.patch \
%D%/packages/patches/laby-use-tmpdir-from-runtime.patch \ %D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
@ -1636,6 +1643,7 @@ dist_patch_DATA = \
%D%/packages/patches/mutter-fix-inverted-test.patch \ %D%/packages/patches/mutter-fix-inverted-test.patch \
%D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \ %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
%D%/packages/patches/nanosvg-prusa-slicer.patch \
%D%/packages/patches/nautilus-extension-search-path.patch \ %D%/packages/patches/nautilus-extension-search-path.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/ncftp-reproducible.patch \
@ -1839,7 +1847,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch \ %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch \
%D%/packages/patches/python-pillow-CVE-2022-45199.patch \ %D%/packages/patches/python-pillow-CVE-2022-45199.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-pyflakes-test-location.patch \
%D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-libxml2-utf8.patch \
%D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \
@ -1901,7 +1908,7 @@ dist_patch_DATA = \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \
%D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \
%D%/packages/patches/racket-rktboot-riscv64-support.patch \ %D%/packages/patches/racket-backport-8.10-rktboot.patch \
%D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \
%D%/packages/patches/racket-zuo-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \
%D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/remake-impure-dirs.patch \
@ -2020,6 +2027,7 @@ dist_patch_DATA = \
%D%/packages/patches/tofi-32bit-compat.patch \ %D%/packages/patches/tofi-32bit-compat.patch \
%D%/packages/patches/tootle-glib-object-naming.patch \ %D%/packages/patches/tootle-glib-object-naming.patch \
%D%/packages/patches/tootle-reason-phrase.patch \ %D%/packages/patches/tootle-reason-phrase.patch \
%D%/packages/patches/tor-remove-defensive-assert.patch \
%D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/transfig-gcc10-fno-common.patch \
%D%/packages/patches/trytond-add-egg-modules-to-path.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \

75
gnu/packages/admin.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
@ -36,7 +36,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 qblade <qblade@protonmail.com> ;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Hyunseok Kim <lasnesne@lagunposprasihopre.org> ;;; Copyright © 2021 Hyunseok Kim <lasnesne@lagunposprasihopre.org>
@ -153,6 +153,7 @@
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages package-management)
#:use-module (gnu packages patchutils) #:use-module (gnu packages patchutils)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
@ -385,9 +386,18 @@ interface and is based on GNU Guile.")
(base32 (base32
"0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj")))) "0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj"))))
(native-inputs (modify-inputs (package-native-inputs shepherd-0.9) (native-inputs (modify-inputs (package-native-inputs shepherd-0.9)
(replace "guile-fibers" guile-fibers-1.3))) (replace "guile-fibers"
;; Work around
;; <https://github.com/wingo/fibers/issues/89>. This
;; affects any system without a functional real-time
;; clock (RTC), but in practice these are typically Arm
;; single-board computers.
(if (target-arm?)
guile-fibers-1.1
guile-fibers-1.3))))
(inputs (modify-inputs (package-inputs shepherd-0.9) (inputs (modify-inputs (package-inputs shepherd-0.9)
(replace "guile-fibers" guile-fibers-1.3))))) (replace "guile-fibers"
(this-package-native-input "guile-fibers"))))))
(define-public shepherd shepherd-0.9) (define-public shepherd shepherd-0.9)
@ -398,6 +408,43 @@ interface and is based on GNU Guile.")
(native-inputs (list pkg-config guile-2.2)) (native-inputs (list pkg-config guile-2.2))
(inputs (list guile-2.2 guile2.2-fibers)))) (inputs (list guile-2.2 guile2.2-fibers))))
(define-public swineherd
(package
(name "swineherd")
(version "0.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/BIMSBbioinfo/swineherd")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"18nk0sy5s0dm2rhxnrrn8g0m098b110mxnnxa2vnl1dnvfdzszw8"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")
#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs
(list autoconf automake guile-3.0 pkg-config texinfo))
(inputs
(list btrfs-progs
guile-config
guile-fibers-1.3
guile-netlink
guile-3.0
guix
shepherd-0.10))
(home-page "https://github.com/BIMSBbioinfo/swineherd")
(synopsis "System container manager")
(description
"This project aims to provide an extension to the Shepherd, retraining it
as a swineherd, a manager of crude system containers. It does this by
providing a Shepherd service @code{swineherd} that talks to the Shepherd
process to create Guix System containers as Shepherd services. It also comes
with an optional HTTP API server.")
(license license:gpl3+)))
(define-public cfm (define-public cfm
(package (package
(name "cfm") (name "cfm")
@ -1931,7 +1978,11 @@ at once based on a Perl regular expression.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "rc/rc" (substitute* "rc/rc"
(("/usr/sbin/sendmail") (("/usr/sbin/sendmail")
(search-input-file inputs "/bin/mail"))))) (search-input-file inputs "/bin/mail")))
(with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* "src/rottlog"
(("awk")
(search-input-file inputs "/bin/awk"))))))
(add-after 'build 'set-packdir (add-after 'build 'set-packdir
(lambda _ (lambda _
;; Set a default location for archived logs. ;; Set a default location for archived logs.
@ -1950,7 +2001,7 @@ at once based on a Perl regular expression.")
(lambda _ (lambda _
(invoke "make" "install-info")))))) (invoke "make" "install-info"))))))
(native-inputs (list autoconf automake texinfo util-linux)) ; for 'cal' (native-inputs (list autoconf automake texinfo util-linux)) ; for 'cal'
(inputs (list coreutils mailutils)) (inputs (list coreutils gawk mailutils))
(home-page "https://www.gnu.org/software/rottlog/") (home-page "https://www.gnu.org/software/rottlog/")
(synopsis "Log rotation and management") (synopsis "Log rotation and management")
(description (description
@ -3961,12 +4012,12 @@ Intel DRM Driver.")
"0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv")))) "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests (list #:tests? #f ; there are no tests
#:make-flags #:make-flags
(list (string-append "PREFIX=" %output)) #~(list (string-append "PREFIX=" #$output))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
(home-page "https://github.com/dylanaraps/neofetch") (home-page "https://github.com/dylanaraps/neofetch")
(synopsis "System information script") (synopsis "System information script")
(description "Neofetch is a command-line system information tool written in (description "Neofetch is a command-line system information tool written in

32
gnu/packages/algebra.scm
View file

@ -1154,38 +1154,6 @@ features, and more.")
(substitute* "test/CMakeLists.txt" (substitute* "test/CMakeLists.txt"
(("ei_add_test\\(stddeque") "#"))))))))))) (("ei_add_test\\(stddeque") "#")))))))))))
(define-public eigen-for-tensorflow-lite
;; This commit was taken from
;; tensorflow/lite/tools/cmake/modules/eigen.cmake
(let ((commit "d10b27fe37736d2944630ecd7557cefa95cf87c9")
(revision "1"))
(package (inherit eigen)
(name "eigen-for-tensorflow-lite")
(version (git-version "3.3.7" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/libeigen/eigen")
(commit commit)))
(sha256
(base32
"0v8a20cwvwmp3hw4275b37frw33v92z0mr8f4dn6y8k0rz92hrrf"))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
;; Ther are test failures in the "unsupported" directory, but
;; maintainers say it's unsupported anyway, so just skip
;; them.
'(begin
(substitute* "unsupported/CMakeLists.txt"
(("add_subdirectory\\(test.*")
"# Do not build the tests for unsupported features.\n"))))))
(arguments
(substitute-keyword-arguments (package-arguments eigen)
((#:phases phases)
`(modify-phases ,phases
(delete 'disable-some-tests))))))))
(define-public xtensor (define-public xtensor
(package (package
(name "xtensor") (name "xtensor")

3
gnu/packages/base.scm
View file

@ -1463,7 +1463,8 @@ command.")
"glibc-2.37-hurd-clock_t_centiseconds.patch" "glibc-2.37-hurd-clock_t_centiseconds.patch"
"glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch" "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
"glibc-hurd-mach-print.patch" "glibc-hurd-mach-print.patch"
"glibc-hurd-gettyent.patch")))) "glibc-hurd-gettyent.patch"
"glibc-hurd-getauxval.patch"))))
(supported-systems %hurd-systems))) (supported-systems %hurd-systems)))
(define-public glibc/hurd-headers (define-public glibc/hurd-headers

135
gnu/packages/bioconductor.scm
View file

@ -51,6 +51,7 @@
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages javascript)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages netpbm) #:use-module (gnu packages netpbm)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -7194,13 +7195,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.")
(define-public r-genomeinfodb (define-public r-genomeinfodb
(package (package
(name "r-genomeinfodb") (name "r-genomeinfodb")
(version "1.36.2") (version "1.36.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomeInfoDb" version)) (uri (bioconductor-uri "GenomeInfoDb" version))
(sha256 (sha256
(base32 (base32
"0bd46s7ch4j70n0snjf2nyx8gzkxn7d563jh5i3i0wzb647f5hbg")))) "04bh4481jcj91xdh11ic4519jczck6zmysbpnpbbhykanp31z4pf"))))
(properties (properties
`((upstream-name . "GenomeInfoDb"))) `((upstream-name . "GenomeInfoDb")))
(build-system r-build-system) (build-system r-build-system)
@ -7253,13 +7254,13 @@ alignments.")
(define-public r-genomicdatacommons (define-public r-genomicdatacommons
(package (package
(name "r-genomicdatacommons") (name "r-genomicdatacommons")
(version "1.24.2") (version "1.24.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicDataCommons" version)) (uri (bioconductor-uri "GenomicDataCommons" version))
(sha256 (sha256
(base32 (base32
"0dgvhi6nbc1qvrdwww2r39gxd2xmbadvy03lxh5nny9pyhhdlz3l")))) "1grvria7lx7p0py3w8yi0j41bpfx951lds5db7jdiq0j8l75fh38"))))
(properties `((upstream-name . "GenomicDataCommons"))) (properties `((upstream-name . "GenomicDataCommons")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-dplyr (propagated-inputs (list r-dplyr
@ -7272,6 +7273,7 @@ alignments.")
r-readr r-readr
r-rlang r-rlang
r-tibble r-tibble
r-tidyr
r-xml2)) r-xml2))
(native-inputs (list r-knitr)) (native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/GenomicDataCommons") (home-page "https://bioconductor.org/packages/GenomicDataCommons")
@ -7734,6 +7736,90 @@ of other R packages who wish to make use of HTSlib.")
microarray data, using nearest neighbor averaging.") microarray data, using nearest neighbor averaging.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-interactivedisplay
(package
(name "r-interactivedisplay")
(version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "interactiveDisplay" version))
(sha256
(base32
"1y9fdnpz1bagrwhyj8jikp2q5fd9y74j48l5z7f0s88v88sa7szl"))
(snippet
'(for-each delete-file
'("inst/www/js/jquery.js"
"inst/www/js/jquery.min.js"
"inst/www/js/jquery.dataTables.min.js")))))
(properties `((upstream-name . "interactiveDisplay")))
(build-system r-build-system)
(arguments
(list
#:modules '((guix build utils)
(guix build r-build-system)
(srfi srfi-1))
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'process-javascript
(lambda* (#:key inputs #:allow-other-keys)
(call-with-values
(lambda ()
(unzip2
`((,(assoc-ref inputs "js-jquery-1.8.2")
"inst/www/js/jquery.js")
(,(assoc-ref inputs "js-jquery-1.9.1")
"inst/www/js/jquery.min.js")
(,(search-input-file inputs
"/share/javascript/jquery.dataTables.min.js")
"inst/www/js/jquery.dataTables.min.js"))))
(lambda (sources targets)
(for-each (lambda (source target)
(format #true "Processing ~a --> ~a~%"
source target)
(invoke "esbuild" source "--minify"
(string-append "--outfile=" target)))
sources targets))))))))
(propagated-inputs
(list r-annotationdbi
r-biocgenerics
r-biocmanager
r-category
r-dt
r-ggplot2
r-gridsvg
r-interactivedisplaybase
r-plyr
r-rcolorbrewer
r-reshape2
r-shiny
r-zlibbioc
r-xml))
(native-inputs
`(("esbuild" ,esbuild)
("r-knitr" ,r-knitr)
("js-datatables" ,js-datatables)
("js-jquery-1.8.2"
,(origin
(method url-fetch)
(uri "https://code.jquery.com/jquery-1.8.2.js")
(sha256
(base32
"0nikk2clbnyi02k0brvhbd8m43lfh4l1zrya35jya9sy6wb9b9ng"))))
("js-jquery-1.9.1"
,(origin
(method url-fetch)
(uri "https://code.jquery.com/jquery-1.9.1.js")
(sha256
(base32
"0h4dk67yc9d0kadqxb6b33585f3x3559p6qmp70l00qwq030vn3v"))))))
(home-page "https://bioconductor.org/packages/interactiveDisplay")
(synopsis "Package for Shiny web displays of Bioconductor objects")
(description
"This package offers interactive Shiny displays for Bioconductor
objects. In addition, this package empowers users to develop engaging
visualizations and interfaces for working with Bioconductor data.")
(license license:artistic2.0)))
(define-public r-interactivedisplaybase (define-public r-interactivedisplaybase
(package (package
(name "r-interactivedisplaybase") (name "r-interactivedisplaybase")
@ -9727,13 +9813,13 @@ and advanced quality control routines.")
(define-public r-shinymethyl (define-public r-shinymethyl
(package (package
(name "r-shinymethyl") (name "r-shinymethyl")
(version "1.36.0") (version "1.36.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "shinyMethyl" version)) (uri (bioconductor-uri "shinyMethyl" version))
(sha256 (sha256
(base32 (base32
"1rqwwglj0475gr14bxazfmcvsy7rq6nlw2zcswa684751wy15w0r")))) "0hq1q66vjd9pwdwm9zx8q45ws65bn6cm87zmjmyc3md8dwvb8cck"))))
(properties `((upstream-name . "shinyMethyl"))) (properties `((upstream-name . "shinyMethyl")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -9877,16 +9963,17 @@ level.")
(define-public r-tcgautils (define-public r-tcgautils
(package (package
(name "r-tcgautils") (name "r-tcgautils")
(version "1.20.2") (version "1.20.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "TCGAutils" version)) (uri (bioconductor-uri "TCGAutils" version))
(sha256 (sha256
(base32 (base32
"0nnfrd5x3mii9adizvz79jinlxn2lhg4civ9v0wwygmdhk7rrm1n")))) "02mkijvh2h58wg7hsi76ycw6gapl0ai190agckaw4l54sqpsx91q"))))
(properties `((upstream-name . "TCGAutils"))) (properties `((upstream-name . "TCGAutils")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-annotationdbi (propagated-inputs (list r-annotationdbi
r-biocbaseutils
r-biocgenerics r-biocgenerics
r-genomeinfodb r-genomeinfodb
r-genomicdatacommons r-genomicdatacommons
@ -11023,13 +11110,13 @@ posterior for individual coefficients.")
(define-public r-greylistchip (define-public r-greylistchip
(package (package
(name "r-greylistchip") (name "r-greylistchip")
(version "1.32.0") (version "1.32.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GreyListChIP" version)) (uri (bioconductor-uri "GreyListChIP" version))
(sha256 (sha256
(base32 (base32
"1sfpf9msnzyrc8b0xzc2406bq2gkcwrrhv7fa9ynqv2ip6xwsc8s")))) "0z89yikglx077x18qhq6f8f2fa9xni12jz8my9p5sa6zmvnj4dnm"))))
(properties `((upstream-name . "GreyListChIP"))) (properties `((upstream-name . "GreyListChIP")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -12564,14 +12651,14 @@ abnormal copy number.")
(define-public r-htscluster (define-public r-htscluster
(package (package
(name "r-htscluster") (name "r-htscluster")
(version "2.0.10") (version "2.0.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "HTSCluster" version)) (uri (cran-uri "HTSCluster" version))
(sha256 (sha256
(base32 (base32
"0scn4fsfmlkzxibfhsh6krm2cl9c8hsmyjgn48k9dyjf0ylyxg9n")))) "0x9shhyla9bldkkh367gfdmf0k72l1ppixb8gzsa6nf8jx8qdpbp"))))
(properties `((upstream-name . "HTSCluster"))) (properties `((upstream-name . "HTSCluster")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -14335,14 +14422,14 @@ attempts to assess their statistical significance.")
(define-public r-clusterprofiler (define-public r-clusterprofiler
(package (package
(name "r-clusterprofiler") (name "r-clusterprofiler")
(version "4.8.2") (version "4.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "clusterProfiler" version)) (uri (bioconductor-uri "clusterProfiler" version))
(sha256 (sha256
(base32 (base32
"0iijby2j9i6sbdc3iwhqqb8xlz25k3dpiyq91p7yybggpr2p1nw4")))) "1kihrpa8cb2bqk5dck0w6yzgfpl72qxlrxwpidg1ar27q3ivz8w3"))))
(properties (properties
`((upstream-name . "clusterProfiler"))) `((upstream-name . "clusterProfiler")))
(build-system r-build-system) (build-system r-build-system)
@ -19576,13 +19663,13 @@ routines.")
(define-public r-s4arrays (define-public r-s4arrays
(package (package
(name "r-s4arrays") (name "r-s4arrays")
(version "1.0.5") (version "1.0.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "S4Arrays" version)) (uri (bioconductor-uri "S4Arrays" version))
(sha256 (sha256
(base32 (base32
"01xlccybhdgas9pnx88ll9q56qb2xd687xvfrc7bd5r9sf72b81c")))) "011n4lyznlrya5l8d7m30x81k7h81wbp07b12s6a4s5sy9fzd5jb"))))
(properties `((upstream-name . "S4Arrays"))) (properties `((upstream-name . "S4Arrays")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -19840,14 +19927,14 @@ block processing.")
(define-public r-rhdf5lib (define-public r-rhdf5lib
(package (package
(name "r-rhdf5lib") (name "r-rhdf5lib")
(version "1.22.0") (version "1.22.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rhdf5lib" version)) (uri (bioconductor-uri "Rhdf5lib" version))
(sha256 (sha256
(base32 (base32
"1j8i4rmq85n7jys86a9zyj1n4qn7bhc1sqgcq8dyh7zqfdvb9bcw")) "1007i2rzz86k04kswa4h53p8zzh52k31m9d8im6iw0n91inqbcj9"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -20463,14 +20550,14 @@ Visium platform.")
(define-public r-delayedmatrixstats (define-public r-delayedmatrixstats
(package (package
(name "r-delayedmatrixstats") (name "r-delayedmatrixstats")
(version "1.22.5") (version "1.22.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DelayedMatrixStats" version)) (uri (bioconductor-uri "DelayedMatrixStats" version))
(sha256 (sha256
(base32 (base32
"1bzbsfds5zki6iazj53y6kps8bvn7zdysbmpf9359sv6zshk18fv")))) "0jaaqa2fm61dmsphm5y4rlwf2dm1l5rs0vpq0f5r35iyw2m12lh8"))))
(properties (properties
`((upstream-name . "DelayedMatrixStats"))) `((upstream-name . "DelayedMatrixStats")))
(build-system r-build-system) (build-system r-build-system)
@ -21108,14 +21195,14 @@ on the plot.")
(define-public r-abn (define-public r-abn
(package (package
(name "r-abn") (name "r-abn")
(version "2.7-5") (version "3.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "abn" version)) (uri (cran-uri "abn" version))
(sha256 (sha256
(base32 (base32
"0ibznjhy7vmh2myarvmxy06rvddbpbarbp201px62mig2pb9aq4y")))) "100nafmyddz0c1h01fbqw5q6pji7zhg2196rkyak88za6s5ms0s4"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
(list gsl)) (list gsl))
@ -21124,11 +21211,13 @@ on the plot.")
r-foreach r-foreach
r-graph r-graph
r-lme4 r-lme4
r-mclogit
r-nnet r-nnet
r-rcpp r-rcpp
r-rcpparmadillo r-rcpparmadillo
r-rgraphviz r-rgraphviz
r-rjags)) r-rjags
r-stringi))
(native-inputs (native-inputs
(list r-r-rsp)) (list r-r-rsp))
(home-page "https://r-bayesian-networks.org/") (home-page "https://r-bayesian-networks.org/")

202
gnu/packages/bioinformatics.scm
View file

@ -1945,6 +1945,42 @@ matplotlib Axes objects, making them easy to style and incorporate into
multi-panel figures.") multi-panel figures.")
(license license:expat))) (license license:expat)))
(define-public python-peaks2utr
(package
(name "python-peaks2utr")
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "peaks2utr" version))
(sha256
(base32
"1idp9cgwqxvryf4qqrc1xjsamfqn3jmr56kmjp2h1ysmckwmhw4v"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
;; These two tests fail because file names are not URLs.
'(list "-k" "not test_annotation.py")))
(propagated-inputs
(list python-asgiref
python-gffutils
python-importlib-resources
macs
python-numpy
python-psutil
python-pybedtools
python-pysam
python-requests
python-tqdm
python-typing-extensions
python-zipp))
(home-page "https://github.com/haessar/peaks2utr")
(synopsis "Python CLI for annotating three prime UTR")
(description
"This package provides a robust, parallelized Python CLI for annotating
three prime UTR.")
(license license:gpl3+)))
(define-public python-pegasusio (define-public python-pegasusio
(package (package
(name "python-pegasusio") (name "python-pegasusio")
@ -7023,7 +7059,7 @@ experiments.")
(define-public macs (define-public macs
(package (package
(name "macs") (name "macs")
(version "2.2.7.1") (version "2.2.9.1")
(source (origin (source (origin
;; The PyPi tarball does not contain tests. ;; The PyPi tarball does not contain tests.
(method git-fetch) (method git-fetch)
@ -7033,7 +7069,7 @@ experiments.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"08zsgh65xbpv1md2s3wqmrk9g2mz6izmn59ryw5lbac54120p291")) "10vwc09fq4nvbd39hax1949mvq2wvkgz0k3p2zqmqwq8hv9r5l0j"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove files generated by Cython ;; Remove files generated by Cython
(snippet (snippet
@ -7048,21 +7084,17 @@ experiments.")
;; Python 3.10 is in fact more recent than 3.6. ;; Python 3.10 is in fact more recent than 3.6.
(substitute* "setup.py" (substitute* "setup.py"
(("float\\(sys.version\\[:3\\]\\)<3.6") "False")))))) (("float\\(sys.version\\[:3\\]\\)<3.6") "False"))))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'set-HOME (add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp"))) (lambda _ (setenv "HOME" "/tmp"))))))
(replace 'check ;; Propagate these for use of macs as a library.
(lambda* (#:key tests? inputs outputs #:allow-other-keys) (propagated-inputs
(when tests? (list python-cython python-numpy))
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-v")))))))
(inputs
(list python-numpy))
(native-inputs (native-inputs
(list python-cython python-pytest)) (list python-pytest))
(home-page "https://github.com/macs3-project/MACS") (home-page "https://github.com/macs3-project/MACS")
(synopsis "Model based analysis for ChIP-Seq data") (synopsis "Model based analysis for ChIP-Seq data")
(description (description
@ -16197,10 +16229,10 @@ includes operations like compartment, insulation or peak calling.")
(list (list
#:phases #:phases
'(modify-phases %standard-phases '(modify-phases %standard-phases
(replace 'check (add-after 'unpack 'remove-invalid-syntax
(lambda* (#:key tests? #:allow-other-keys) (lambda _
(when tests? (substitute* "setup.py"
(invoke "python" "-m" "pytest" "-v"))))))) ((".\\*\"") "\"")))))))
(propagated-inputs (propagated-inputs
(list python-cooler (list python-cooler
python-intervaltree python-intervaltree
@ -19134,7 +19166,7 @@ coordinates between different assemblies.")
(define-public python-cgatcore (define-public python-cgatcore
(package (package
(name "python-cgatcore") (name "python-cgatcore")
(version "0.6.14") (version "0.6.15")
;; The version of pypi does not include test data. ;; The version of pypi does not include test data.
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -19144,7 +19176,7 @@ coordinates between different assemblies.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0fjjaski39j8b7v21wldmbwwsfhicngajah7n4skafi56kdck33p")))) "103hpdnkqr3a34blbicshk56j36g652s0g1zi9isppc5dngn0s18"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -19214,77 +19246,77 @@ large-scale data-analysis.")
"1dvh23fx52m59y6304xi2j2pl2hiqadlqg8jyv2pm14j1hy71ych")))) "1dvh23fx52m59y6304xi2j2pl2hiqadlqg8jyv2pm14j1hy71ych"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:modules ((guix build perl-build-system) (list
#:modules '((guix build perl-build-system)
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'hardcode-references (add-after 'unpack 'hardcode-references
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((bedtools (assoc-ref inputs "bedtools")) (let ((bedtools #$(this-package-input "bedtools"))
(r (assoc-ref inputs "r-minimal"))) (r #$(this-package-input "r-minimal")))
(substitute* '("scripts/python/getEigenVectors.py" (substitute* '("scripts/python/getEigenVectors.py"
"scripts/python/matrix2EigenVectors.py") "scripts/python/matrix2EigenVectors.py")
(("bedtools intersect") (("bedtools intersect")
(string-append bedtools "/bin/bedtools intersect"))) (string-append bedtools "/bin/bedtools intersect")))
(substitute* "lib/cworld/dekker.pm" (substitute* "lib/cworld/dekker.pm"
(("bedtools --version") (("bedtools --version")
(string-append bedtools "/bin/bedtools --version"))) (string-append bedtools "/bin/bedtools --version")))
(substitute* '("scripts/perl/correlateMatrices.pl" (substitute* '("scripts/perl/correlateMatrices.pl"
"scripts/perl/matrix2scaling.pl" "scripts/perl/matrix2scaling.pl"
"scripts/perl/matrix2distance.pl" "scripts/perl/matrix2distance.pl"
"scripts/perl/coverageCorrect.pl" "scripts/perl/coverageCorrect.pl"
"scripts/perl/matrix2anchorPlot.pl" "scripts/perl/matrix2anchorPlot.pl"
"scripts/python/matrix2EigenVectors.py" "scripts/python/matrix2EigenVectors.py"
"scripts/python/matrix2insulation-lite.py" "scripts/python/matrix2insulation-lite.py"
"scripts/perl/matrix2compartment.pl" "scripts/perl/matrix2compartment.pl"
"scripts/perl/anchorPurge.pl" "scripts/perl/anchorPurge.pl"
"scripts/perl/applyCorrection.pl" "scripts/perl/applyCorrection.pl"
"scripts/perl/compareInsulation.pl" "scripts/perl/compareInsulation.pl"
"scripts/perl/fillMissingData.pl" "scripts/perl/fillMissingData.pl"
"scripts/perl/matrix2loess.pl" "scripts/perl/matrix2loess.pl"
"scripts/python/getEigenVectors.py" "scripts/python/getEigenVectors.py"
"scripts/perl/aggregateBED.pl" "scripts/perl/aggregateBED.pl"
"scripts/perl/collapseMatrix.pl" "scripts/perl/collapseMatrix.pl"
"scripts/perl/matrix2direction.pl" "scripts/perl/matrix2direction.pl"
"scripts/perl/singletonRemoval.pl" "scripts/perl/singletonRemoval.pl"
"lib/cworld/dekker.pm" "lib/cworld/dekker.pm"
"scripts/perl/matrix2insulation.pl") "scripts/perl/matrix2insulation.pl")
(("(`|\")Rscript" _ pre) (("(`|\")Rscript" _ pre)
(string-append pre r "/bin/Rscript")))))) (string-append pre r "/bin/Rscript"))))))
(add-after 'install 'install-scripts (add-after 'install 'install-scripts
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let ((share (string-append #$output "/share/cworld-dekker")))
(share (string-append out "/share/cworld-dekker"))) (mkdir-p share)
(mkdir-p share) (copy-recursively "scripts" share)
(copy-recursively "scripts" share)
;; Make all scripts executable and wrap them. ;; Make all scripts executable and wrap them.
(let ((r (find-files share "\\.R$")) (let ((r (find-files share "\\.R$"))
(py (find-files share "\\.py$")) (py (find-files share "\\.py$"))
(pl (find-files share "\\.pl$")) (pl (find-files share "\\.pl$"))
(wrap (lambda* (script var #:optional (extra "")) (wrap (lambda* (script var #:optional (extra ""))
(let ((path (string-append (getenv var) (let ((path (string-append (getenv var)
extra))) extra)))
(wrap-program script (wrap-program script
`(,var ":" prefix (,path))))))) `(,var ":" prefix (,path)))))))
(for-each (cut chmod <> #o555) (append r py pl)) (for-each (cut chmod <> #o555) (append r py pl))
(for-each (cut wrap <> "PERL5LIB" (for-each (cut wrap <> "PERL5LIB"
(string-append ":" out (string-append ":" #$output
"/lib/perl5/site_perl")) "/lib/perl5/site_perl"))
pl) pl)
(for-each (cut wrap <> "GUIX_PYTHONPATH") py)))))))) (for-each (cut wrap <> "GUIX_PYTHONPATH") py))))))))
(inputs (inputs
`(("libgd" ,gd) (list gd
("perl-gd" ,perl-gd) perl-gd
("bedtools" ,bedtools) bedtools
("python" ,python-wrapper) python-wrapper
("python-scipy" ,python-scipy) python-scipy
("python-numpy" ,python-numpy) python-numpy
("python-matplotlib" ,python-matplotlib) python-matplotlib
("python-h5py" ,python-h5py) python-h5py
("python-scikit-learn" ,python-scikit-learn) python-scikit-learn
("r-minimal" ,r-minimal))) r-minimal))
(native-inputs (native-inputs
(list perl-module-build)) (list perl-module-build))
(home-page "https://github.com/dekkerlab/cworld-dekker") (home-page "https://github.com/dekkerlab/cworld-dekker")

4
gnu/packages/boost.scm
View file

@ -45,14 +45,12 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages hurd)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi))
#:use-module (srfi srfi-1))
(define (version-with-underscores version) (define (version-with-underscores version)
(string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)) (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))

29
gnu/packages/c.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe> ;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; ;;;
@ -1495,6 +1496,34 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
"This package provides a header-only unit testing library for C/C++.") "This package provides a header-only unit testing library for C/C++.")
(license license:unlicense)))) (license license:unlicense))))
(define-public nsync
(package
(name "nsync")
(version "1.26.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/nsync")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0qg58kkcbm4zqkql8j5yvrb7fpx09qsf7j93dwqb9s1y69l70kx4"))))
(build-system cmake-build-system)
(home-page "https://github.com/google/nsync")
(synopsis "C library for synchronization primitives")
(description
"nsync is a C library that exports various synchronization primitives:
@enumerate
@item locks,
@item condition variables,
@item run-once initialization,
@item waitable counter (useful for barriers),
@item waitable bit (useful for cancellation, or other conditions).
@end enumerate
")
(license license:asl2.0)))
(define-public ispc (define-public ispc
(package (package
(name "ispc") (name "ispc")

10
gnu/packages/chez.scm
View file

@ -466,7 +466,7 @@ and 32-bit PowerPC architectures.")
(package (package
(inherit chez-scheme) (inherit chez-scheme)
(name "chez-scheme-for-racket") (name "chez-scheme-for-racket")
(version "9.9.9-pre-release.16") (version "9.9.9-pre-release.17")
;; The version should match `scheme-version`. ;; The version should match `scheme-version`.
;; See racket/src/ChezScheme/s/cmacros.ss c. line 360. ;; See racket/src/ChezScheme/s/cmacros.ss c. line 360.
;; It will always be different than the upstream version! ;; It will always be different than the upstream version!
@ -691,13 +691,7 @@ source.")))
#~(invoke #~(invoke
(search-input-file (or native-inputs inputs) (search-input-file (or native-inputs inputs)
"/opt/racket-vm/bin/racket") "/opt/racket-vm/bin/racket")
"../rktboot/main.rkt" "../rktboot/main.rkt"))))))))))
;; Temporary handling of builds on non-x86 architectures,
;; see https://github.com/racket/racket/issues/3948
;; Autodetect in rktboot only addresses x86 archs, so far.
#$@(let ((m (or (racket-cs-native-supported-system?)
(nix-system->pbarch-machine-type))))
#~("--machine" #$m))))))))))))
(supported-systems (supported-systems
(package-supported-systems chez-scheme-for-racket)) (package-supported-systems chez-scheme-for-racket))
(home-page "https://github.com/racket/ChezScheme") (home-page "https://github.com/racket/ChezScheme")

6
gnu/packages/ci.scm
View file

@ -58,8 +58,8 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass (define-public cuirass
(let ((commit "7416bb916315730cd1ea74e7914f7532a1aba193") (let ((commit "613188072c468fe2ffa4e8f83b48aefeb2488a2c")
(revision "17")) (revision "18"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "1.1.0" revision commit)) (version (git-version "1.1.0" revision commit))
@ -72,7 +72,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1wc39c7aqva5sp3gpdxq2kqa17ywy21yn5w8r66qgxjinvj21a68")))) "13ai3xmf62kx9ijc5imapcjwyvkhj2kxnh36chh3vbh3sxbbanzz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)

4
gnu/packages/cluster.scm
View file

@ -46,14 +46,14 @@
(define-public drbd-utils (define-public drbd-utils
(package (package
(name "drbd-utils") (name "drbd-utils")
(version "9.22.0") (version "9.25.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://pkg.linbit.com/downloads/drbd" (uri (list (string-append "https://pkg.linbit.com/downloads/drbd"
"/utils/drbd-utils-" version ".tar.gz"))) "/utils/drbd-utils-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"02zdfd9xg5xdxps2bg9ch3vkrs800whsycazkvgi29p80nihq1vm")) "01vbghs4vyl3jvxkid59bqv73dya98k6jx5zhni2yx2xf8msynvf"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

45
gnu/packages/code.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2021 lu hui <luhuins@163.com> ;;; Copyright © 2021 lu hui <luhuins@163.com>
;;; Copyright © 2021, 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021, 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -200,6 +201,10 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(string-append "--with-universal-ctags=" (string-append "--with-universal-ctags="
#$(this-package-input "universal-ctags") #$(this-package-input "universal-ctags")
"/bin/ctags") "/bin/ctags")
;; Otherwise this gets overridden in the 'configure phase.
(string-append "--with-python-interpreter="
#$(this-package-input "python-wrapper")
"/bin/python")
(string-append "--sysconfdir=" (string-append "--sysconfdir="
#$output "/share/gtags") #$output "/share/gtags")
"--localstatedir=/var" ; This needs to be a writable location. "--localstatedir=/var" ; This needs to be a writable location.
@ -769,11 +774,13 @@ produce colored output.")
(base32 "1gjfk3d8qg3cla7qd2y7r9s03whlfwy83q8k76xfcnqrjjfavdgk")))) (base32 "1gjfk3d8qg3cla7qd2y7r9s03whlfwy83q8k76xfcnqrjjfavdgk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:test-target "test" (list
#:make-flags (list "CC=gcc" (string-append "prefix=" %output)) #:test-target "test"
#:phases #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
(modify-phases %standard-phases (string-append "prefix=" #$output))
(delete 'configure)))) #:phases
#~(modify-phases %standard-phases
(delete 'configure))))
(native-inputs (native-inputs
(list graphviz)) (list graphviz))
(home-page "https://github.com/lindenb/makefile2graph") (home-page "https://github.com/lindenb/makefile2graph")
@ -787,7 +794,7 @@ independent targets.")
(define-public uncrustify (define-public uncrustify
(package (package
(name "uncrustify") (name "uncrustify")
(version "0.75.1") (version "0.77.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -796,22 +803,20 @@ independent targets.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mzzzd4alajjdshbjd2a5mddqcpag8yyss72n09mfpialzyf7g60")))) "17x9p5pqgzjchi9xhskp4kq7ag4chmsgbkvwym5m2b9zwm6qykpm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs (list python-wrapper))
`(("python" ,python-wrapper)))
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'unpack-etc (add-after 'unpack 'unpack-etc
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Configuration samples are not installed by default. ;; Configuration samples are not installed by default.
(let* ((output (assoc-ref outputs "out")) (let* ((output (assoc-ref outputs "out"))
(etcdir (string-append output "/etc"))) (etcdir (string-append output "/etc")))
(for-each (lambda (l) (for-each (lambda (l)
(install-file l etcdir)) (install-file l etcdir))
(find-files "etc" "\\.cfg$"))) (find-files "etc" "\\.cfg$"))))))))
#t)))))
(home-page "https://uncrustify.sourceforge.net/") (home-page "https://uncrustify.sourceforge.net/")
(synopsis "Code formatter for C and other related languages") (synopsis "Code formatter for C and other related languages")
(description (description

424
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

132
gnu/packages/crates-io.scm
View file

@ -21557,6 +21557,24 @@ signing, and verification in pure Rust.")
@code{Right} is a general purpose sum type with two cases.") @code{Right} is a general purpose sum type with two cases.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-either-1.6.0
(package
(inherit rust-either-1)
(name "rust-either")
(version "1.6.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "either" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0mwl9vngqf5jvrhmhn9x60kr5hivxyjxbmby2pybncxfqhf4z3g7"))))
(arguments
`(#:cargo-inputs (("rust-serde" ,rust-serde-1))
#:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1.0.73))))))
(define-public rust-elf-0.0.10 (define-public rust-elf-0.0.10
(package (package
(name "rust-elf") (name "rust-elf")
@ -41724,6 +41742,19 @@ with all line endings.")
notification library.") notification library.")
(license (list license:cc0 license:artistic2.0)))) (license (list license:cc0 license:artistic2.0))))
(define-public rust-notify-5-pre.13
(package
(inherit rust-notify-5)
(name "rust-notify")
(version "5.0.0-pre.13")
(source (origin
(method url-fetch)
(uri (crate-uri "notify" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0za8mpacxkr62fii5h7ny4h396y0m8myd3hf08njqdg2h21kap94"))))))
(define-public rust-notify-4 (define-public rust-notify-4
(package (package
(inherit rust-notify-5) (inherit rust-notify-5)
@ -49388,6 +49419,27 @@ in your code.")
in terms of the upstream unstable API.") in terms of the upstream unstable API.")
(license (list license:asl2.0 license:expat)))) (license (list license:asl2.0 license:expat))))
(define-public rust-proc-macro2-1.0.34
(package
(inherit rust-proc-macro2-1)
(name "rust-proc-macro2")
(version "1.0.34")
(source
(origin
(method url-fetch)
(uri (crate-uri "proc-macro2" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1c93jhwl8lv3hiqqvdhd2d2xhjryh5bqb9w5icr5i7bw1wnfk11g"))))
(arguments
`(#:cargo-test-flags '("--lib")
#:cargo-inputs
(("rust-unicode-ident" ,rust-unicode-ident-1))
#:cargo-development-inputs
(("rust-quote" ,rust-quote-1.0.10)
("rust-rustversion" ,rust-rustversion-1))))))
(define-public rust-proc-macro2-0.4 (define-public rust-proc-macro2-0.4
(package (package
(inherit rust-proc-macro2-1) (inherit rust-proc-macro2-1)
@ -51588,6 +51640,25 @@ transport protocol in Rust.")
(description "Quasi-quoting macro quote!(...)") (description "Quasi-quoting macro quote!(...)")
(license (list license:asl2.0 license:expat)))) (license (list license:asl2.0 license:expat))))
(define-public rust-quote-1.0.10
(package
(inherit rust-quote-1)
(name "rust-quote")
(version "1.0.10")
(source (origin
(method url-fetch)
(uri (crate-uri "quote" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"01ff7a76f871ggnby57iagw6499vci4bihcr11g6bqzjlp38rg1q"))))
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1.0.34))
#:cargo-development-inputs
(("rust-rustversion" ,rust-rustversion-1)
("rust-trybuild" ,rust-trybuild-1.0.19))))))
(define-public rust-quote-0.6 (define-public rust-quote-0.6
(package (package
(inherit rust-quote-1) (inherit rust-quote-1)
@ -57489,7 +57560,7 @@ in pure Rust.")
#:cargo-inputs #:cargo-inputs
(("rust-crossbeam-utils" (("rust-crossbeam-utils"
,rust-crossbeam-utils-0.8) ,rust-crossbeam-utils-0.8)
("rust-indexmap" ,rust-indexmap-1) ("rust-indexmap" ,rust-indexmap-1.7)
("rust-lock-api" ,rust-lock-api-0.4) ("rust-lock-api" ,rust-lock-api-0.4)
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-oorandom" ,rust-oorandom-11.1) ("rust-oorandom" ,rust-oorandom-11.1)
@ -59795,6 +59866,32 @@ data. This crate provides a wrapper that works with any existing Serde
"This package provides a JSON serialization file format.") "This package provides a JSON serialization file format.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-serde-json-1.0.73
(package
(inherit rust-serde-json-1)
(name "rust-serde-json")
(version "1.0.73")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-json" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1xbwmzc5j6r1nz62a20w6l9bkwbhzd11vwbdqmzbqcv5pi207gdw"))))
(arguments
`(#:cargo-inputs
(("rust-indexmap" ,rust-indexmap-1.7)
("rust-itoa" ,rust-itoa-1)
("rust-ryu" ,rust-ryu-1)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-automod" ,rust-automod-1)
("rust-rustversion" ,rust-rustversion-1)
("rust-serde-bytes" ,rust-serde-bytes-0.11)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-stacker" ,rust-serde-stacker-0.1)
("rust-trybuild" ,rust-trybuild-1))))))
(define-public rust-serde-json-0.9 (define-public rust-serde-json-0.9
(package (package
(inherit rust-serde-json-1) (inherit rust-serde-json-1)
@ -59863,7 +59960,7 @@ programs in rust.")
(("rust-serde" ,rust-serde-1)) (("rust-serde" ,rust-serde-1))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-serde-derive" ,rust-serde-derive-1) (("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1)))) ("rust-serde-json" ,rust-serde-json-1.0.73))))
(home-page (home-page
"https://github.com/dtolnay/path-to-error") "https://github.com/dtolnay/path-to-error")
(synopsis (synopsis
@ -59921,14 +60018,14 @@ commonly used by Ruby on Rails via Rack.")
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1) (("rust-proc-macro2" ,rust-proc-macro2-1.0.34)
("rust-quote" ,rust-quote-1) ("rust-quote" ,rust-quote-1.0.10)
("rust-syn" ,rust-syn-1)) ("rust-syn" ,rust-syn-1))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-rustversion" ,rust-rustversion-1) (("rust-rustversion" ,rust-rustversion-1)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1.0.73)
("rust-trybuild" ,rust-trybuild-1)))) ("rust-trybuild" ,rust-trybuild-1.0.19))))
(home-page "https://github.com/dtolnay/serde-repr") (home-page "https://github.com/dtolnay/serde-repr")
(synopsis "Serialize and deserialize C-like enum as underlying repr") (synopsis "Serialize and deserialize C-like enum as underlying repr")
(description (description
@ -73148,6 +73245,29 @@ the Trust-DNS client to use rustls for TLS.")
"Test harness for ui tests of compiler diagnostics.") "Test harness for ui tests of compiler diagnostics.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-trybuild-1.0.19
(package
(inherit rust-trybuild-1)
(name "rust-trybuild")
(version "1.0.19")
(source
(origin
(method url-fetch)
(uri (crate-uri "trybuild" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0ab7ahdx563n6kbm14pm3qnxq4fp06pz42nh5ii4acvlzycnwdh4"))))
(arguments
`(#:cargo-inputs
(("rust-toml" ,rust-toml-0.5)
("rust-dissimilar" ,rust-dissimilar-1)
("rust-glob" ,rust-glob-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1.0.73)
("rust-termcolor" ,rust-termcolor-1))
#:cargo-development-inputs (("rust-automod" ,rust-automod-1))))))
(define-public rust-trybuild2-1 (define-public rust-trybuild2-1
(package (package
(name "rust-trybuild2") (name "rust-trybuild2")

19
gnu/packages/databases.scm
View file

@ -59,7 +59,8 @@
;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org> ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org>
;;; Copyright © 2021, 2022 jgart <jgart@dismail.de> ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne
;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3706,7 +3707,7 @@ PickleShare.")
(define-public python-apsw (define-public python-apsw
(package (package
(name "python-apsw") (name "python-apsw")
(version "3.40.0.0") (version "3.42.0.1")
;; The compressed release has fetching functionality disabled. ;; The compressed release has fetching functionality disabled.
(source (source
(origin (origin
@ -3716,11 +3717,11 @@ PickleShare.")
version "/apsw-" version ".zip")) version "/apsw-" version ".zip"))
(sha256 (sha256
(base32 (base32
"02sgja00azvd08wi2wm105apmhp2644s7aw9b1zdg3dkcwjnsiad")))) "0dr7zymn45x2793cilr709rnwn9g1c4n4vzln57y2lhj7420ykic"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(native-inputs (native-inputs
(list python-cython unzip)) (list python-cython unzip))
(inputs (list sqlite-next)) ;SQLite 3.40 required. (inputs (list sqlite-next)) ;SQLite 3.42 required.
(arguments (arguments
(list (list
#:phases #:phases
@ -3963,7 +3964,7 @@ database).")
(define-public yoyo-migrations (define-public yoyo-migrations
(package (package
(name "yoyo-migrations") (name "yoyo-migrations")
(version "7.2.0") (version "8.2.0")
(source (source
(origin (origin
;; We use the upstream repository, as the tests are not included in the ;; We use the upstream repository, as the tests are not included in the
@ -3974,14 +3975,14 @@ database).")
(changeset (string-append "v" version "-release")))) (changeset (string-append "v" version "-release"))))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 "0q2z9bgdj3wyix7yvqsayfs21grp5av8ilh411lgmjhigszkvhcq")))) (base32 "1al030ix0w63hr4s3mqry6s0mlqdj8p242pdqks06br7c25nx3yj"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; XXX: Tests require a connection to some pgsql database and psycopg ;; XXX: Tests require a connection to some pgsql database and psycopg
;; fails to connect to it. ;; fails to connect to it.
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs (propagated-inputs
(list python-sqlparse python-tabulate)) (list python-sqlparse python-tabulate python-importlib-metadata))
(home-page "https://ollycope.com/software/yoyo/latest/") (home-page "https://ollycope.com/software/yoyo/latest/")
(synopsis "Database migrations with SQL") (synopsis "Database migrations with SQL")
(description (description
@ -4304,7 +4305,7 @@ the SQL language using a syntax that reflects the resulting query.")
(define-public apache-arrow (define-public apache-arrow
(package (package
(name "apache-arrow") (name "apache-arrow")
(version "12.0.1") (version "13.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4314,7 +4315,7 @@ the SQL language using a syntax that reflects the resulting query.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"03flvb4xj6a7mfphx68ndrqr6g5jphmzb75m16fx7rnbzira2zpz")))) "03ykynzz01ar2y4blhcxjh6xsi0gqv380h5m669dddfz2isplsf8"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list

4
gnu/packages/datastructures.scm
View file

@ -213,14 +213,14 @@ allows multiple concurrent reader and writer threads.")
(define-public liburcu (define-public liburcu
(package (package
(name "liburcu") (name "liburcu")
(version "0.13.1") (version "0.14.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.lttng.org/files/urcu/" (uri (string-append "https://www.lttng.org/files/urcu/"
"userspace-rcu-" version ".tar.bz2")) "userspace-rcu-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"10rh6v9j13622cjlzx31cfpghjy0kqkvn6pb42whwwcg5cyz64rj")))) "0kwx4fi3gn4p4sdxqkz2zh4z0fv06q449bnz43zjqfad3lkbyhya"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list perl)) ; for tests (list perl)) ; for tests

15
gnu/packages/debian.scm
View file

@ -190,7 +190,7 @@ contains the archive keys used for that.")
(define-public debootstrap (define-public debootstrap
(package (package
(name "debootstrap") (name "debootstrap")
(version "1.0.128") (version "1.0.132")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -199,7 +199,7 @@ contains the archive keys used for that.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hc7xc6qvnmjlpf3j6bm25kf0j1ifvv5j7a0iljfmbag4idxc9jv")))) (base32 "1l6mc3i2wqfhmhj85x9qiiqchqp9br6gg54hv1xs08h8xndmfchf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -226,6 +226,12 @@ contains the archive keys used for that.")
(substitute* "debootstrap" (substitute* "debootstrap"
(("=/usr") (string-append "=" #$output)) (("=/usr") (string-append "=" #$output))
(("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg"))) (("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg")))
;; Include the keyring locations by default.
(substitute* (find-files "scripts")
(("keyring.*(debian-archive-keyring.gpg)"_ keyring)
(string-append "keyring " debian "/share/keyrings/" keyring))
(("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring)
(string-append "keyring " ubuntu "/share/keyrings/" keyring)))
;; Ensure PATH works both in guix and within the debian chroot ;; Ensure PATH works both in guix and within the debian chroot
;; workaround for: https://bugs.debian.org/929889 ;; workaround for: https://bugs.debian.org/929889
(substitute* "functions" (substitute* "functions"
@ -335,7 +341,7 @@ distributions such as Debian and Trisquel.")
(define-public dpkg (define-public dpkg
(package (package
(name "dpkg") (name "dpkg")
(version "1.21.22") (version "1.22.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -344,7 +350,7 @@ distributions such as Debian and Trisquel.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0b5czgif5g6pdjzcw60hzzj0i1llxvajf3nlx115axmpa3y4iynd")))) (base32 "1p7f2mgrn2iy0xfysxfq4pjbbhbhb2rp649bsik0x25jrck4if83"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:modules (list #:modules
@ -382,6 +388,7 @@ distributions such as Debian and Trisquel.")
`("PATH" ":" prefix (,(string-append #$output `("PATH" ":" prefix (,(string-append #$output
"/bin"))))) "/bin")))))
(list "dpkg-architecture" (list "dpkg-architecture"
"dpkg-buildapi"
"dpkg-buildflags" "dpkg-buildflags"
"dpkg-buildpackage" "dpkg-buildpackage"
"dpkg-checkbuilddeps" "dpkg-checkbuilddeps"

6
gnu/packages/debug.scm
View file

@ -892,11 +892,10 @@ to aid in debugging.")
(home-page "https://www.gnu.org/software/ddd/") (home-page "https://www.gnu.org/software/ddd/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public delve (define-public delve
(package (package
(name "delve") (name "delve")
(version "1.9.1") (version "1.21.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -906,14 +905,13 @@ to aid in debugging.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07jch3yd1pgqviyy18amn23gazbzi7l51f210c3vmc707v3vbbqr")))) "1gdynx4gp02lj47znnf638kkbmmsl24a9fis81a2fg3pdrg6jg3c"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:import-path "github.com/go-delve/delve/cmd/dlv" (list #:import-path "github.com/go-delve/delve/cmd/dlv"
#:unpack-path "github.com/go-delve/delve" #:unpack-path "github.com/go-delve/delve"
#:install-source? #f #:install-source? #f
#:phases #~(modify-phases %standard-phases (delete 'check)))) #:phases #~(modify-phases %standard-phases (delete 'check))))
(propagated-inputs (list go))
(home-page "https://github.com/go-delve/delve") (home-page "https://github.com/go-delve/delve")
(synopsis "Debugger for the Go programming language") (synopsis "Debugger for the Go programming language")
(description "Delve is a debugger for the Go programming language.") (description "Delve is a debugger for the Go programming language.")

4
gnu/packages/dezyne.scm
View file

@ -32,14 +32,14 @@
(define-public dezyne (define-public dezyne
(package (package
(name "dezyne") (name "dezyne")
(version "2.17.5") (version "2.17.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dezyne.org/download/dezyne/" (uri (string-append "https://dezyne.org/download/dezyne/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "15jhi17f0aqnlznvpf6lkz2y837xkzf8chi9rhhb55920vqf6cgg")))) (base32 "0z019yyvf1ac1l95j29wlayi2gmwa9sjqg31a4r89za1bijmk19k"))))
(inputs (list bash-minimal (inputs (list bash-minimal
guile-3.0-latest guile-3.0-latest
guile-json-4 guile-json-4

6
gnu/packages/diffoscope.scm
View file

@ -74,7 +74,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "247") (version "250")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -83,7 +83,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0c81pvdq0bz47sk3gcgpm2l3g5hxdi2s1jz05krv1cr2bd0sfq4j")))) (base32 "12cdsgxlva1gcry16w9x44ji9asar1n8p9q6rv2jd1gr9fi6l0sz"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -188,6 +188,7 @@
gnumeric gnumeric
gnupg gnupg
hdf5 hdf5
html2text
imagemagick imagemagick
libarchive libarchive
llvm llvm
@ -206,6 +207,7 @@
sqlite sqlite
squashfs-tools squashfs-tools
tcpdump tcpdump
u-boot-tools
unzip unzip
wabt wabt
xxd xxd

5
gnu/packages/django.scm
View file

@ -34,6 +34,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (guix search-paths)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -126,9 +127,7 @@
;; Set TZDIR when 'tzdata' is available so that timezone functionality ;; Set TZDIR when 'tzdata' is available so that timezone functionality
;; works (mostly) out of the box in containerized environments. ;; works (mostly) out of the box in containerized environments.
;; Note: This search path actually belongs to 'glibc'. ;; Note: This search path actually belongs to 'glibc'.
(list (search-path-specification (list $TZDIR))
(variable "TZDIR")
(files '("share/zoneinfo")))))
(home-page "https://www.djangoproject.com/") (home-page "https://www.djangoproject.com/")
(synopsis "High-level Python Web framework") (synopsis "High-level Python Web framework")
(description (description

245
gnu/packages/emacs-xyz.scm
View file

@ -134,6 +134,7 @@
;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org> ;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr> ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net> ;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
;;; Copyright © 2023 Thanos Apollo <public@thanosapollo.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -181,6 +182,7 @@
#:use-module (gnu packages djvu) #:use-module (gnu packages djvu)
#:use-module (gnu packages ebook) #:use-module (gnu packages ebook)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages enchant)
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages games) #:use-module (gnu packages games)
@ -493,6 +495,25 @@ just one-off queries and multiple independent sessions. It requires an OpenAI
API key.") API key.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-chatgpt-shell
(package
(name "emacs-chatgpt-shell")
(version "0.74.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xenodium/chatgpt-shell")
(commit "1de7bfa6a34f20cca813006282d9a8f2ef291f95")))
(sha256
(base32
"1rabpp70qlmc47lmp2v7ckvfjhy6wkk881fxpbv2dchzhn77qk5r"))))
(build-system emacs-build-system)
(home-page "https://github.com/xenodium/chatgpt-shell")
(synopsis "ChatGPT and DALL-E Emacs shells + Org Babel")
(description
"chatgpt-shell is a comint-based ChatGPT shell for Emacs.")
(license license:gpl3+)))
(define-public emacs-geiser-guile (define-public emacs-geiser-guile
(package (package
(name "emacs-geiser-guile") (name "emacs-geiser-guile")
@ -1443,10 +1464,10 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-magit (define-public emacs-magit
;; Use this unreleased commit to benefit from a recent change needed to ;; Use this unreleased commit to benefit from a recent improvements with
;; add Reviewed-by: tags for any contributor in commit messages. ;; regard to adding git trailers such as "Reviewed-by".
(let ((commit "186414ae418a07a46c413f05c68413a76256a05e") (let ((commit "7a1d50347086678217cf90a32dda277b76ea3081")
(revision "5")) (revision "6"))
(package (package
(name "emacs-magit") (name "emacs-magit")
(version (git-version "3.3.0" revision commit)) (version (git-version "3.3.0" revision commit))
@ -1458,7 +1479,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0rhsbcjfjw0z3vy2ix30y4h55c0cx4lyvz6mbijwbbjryln71kpj")))) (base32 "1yn3v24w0sx6r8jqw8blfvyjdjfz5xa7c3x8p6xw1lj7b81l8i0l"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -10330,6 +10351,66 @@ insertion mode. When enabled all keys are implicitly prefixed with
sgml/html integration, and indentation (working with sgml).") sgml/html integration, and indentation (working with sgml).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-jinx
(package
(name "emacs-jinx")
(version "0.8")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/minad/jinx")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1y097rnf9zg26jf4vh74a0laddfp4x6pp1fjqs3xqgwc0cmdq59w"))))
(build-system emacs-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'expand-load-path 'build-jinx-mod
(lambda* _
(invoke
"emacs" "--batch" "-L" "."
"-l" "jinx.el"
"-f" "jinx--load-module")))
(add-after 'expand-load-path 'build-info
(lambda _
(invoke "emacs" "--batch"
"--eval=(require 'ox-texinfo)"
"--eval=(find-file \"README.org\")"
"--eval=(org-texinfo-export-to-info)")))
(add-after 'build-jinx-mod 'patch-path-to-jinx-mod
(lambda _
(let ((file "jinx.el"))
(make-file-writable file)
(emacs-substitute-sexps file
("\"Compile and load dynamic module.\""
`(module-load
,(string-append #$output
"/lib/emacs/jinx-mod.so")))))))
(add-after 'install 'install-jinx-mod
(lambda _
(install-file "jinx-mod.so"
(string-append #$output "/lib/emacs"))))
(add-after 'install 'install-info
(lambda _
(install-file "jinx.info"
(string-append #$output "/share/info")))))))
(inputs (list enchant))
(propagated-inputs (list emacs-compat))
(native-inputs (list emacs-compat enchant pkg-config texinfo))
(home-page "https://github.com/minad/jinx")
(synopsis "Emacs Enchanted Spell Checker")
(description "Jinx is a just-in-time spell-checker for Emacs
based on the enchant library. It lazily highlights misspelled words in the
text of the visible portion of the buffer by honouring window boundaries as
well as text folding, if any.")
(license license:gpl3+)))
(define-public emacs-jit-spell (define-public emacs-jit-spell
(package (package
(name "emacs-jit-spell") (name "emacs-jit-spell")
@ -12359,30 +12440,27 @@ The following completions are currently available:
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-sway (define-public emacs-sway
;; Commit from Nicola's fork (dash free version with various improvments) (package
(let ((commit "838ef531a30fe616f0141adbdabc132d4edfd374") (name "emacs-sway")
(revision "0")) (version "0.7")
(package (source
(name "emacs-sway") (origin
(version (git-version "0.6.1" revision commit)) (method git-fetch)
(source (uri (git-reference
(origin (url "https://github.com/thblt/sway.el")
(method git-fetch) (commit version)))
(uri (git-reference (file-name (git-file-name name version))
(url "https://github.com/thblt/sway.el") (sha256
(commit commit))) (base32 "1w29dkl7s835zgwnc4jx1cp84s6mmwbvlil8z2c31psy0rlajc6i"))))
(file-name (git-file-name name version)) (build-system emacs-build-system)
(sha256 (home-page "https://github.com/thblt/sway.el")
(base32 "0ddaz8my3z4ca2z81kf1h8773pyx8h0l0ra3ssqd1rq5j0041wdh")))) (synopsis "Communication with the Sway window manager")
(build-system emacs-build-system) (description
(home-page "https://github.com/thblt/sway.el") "This is a basic library to control the Sway window manager from Emacs.
(synopsis "Communication with the Sway window manager")
(description
"This is a basic library to control the Sway window manager from Emacs.
Its main use case is in combination with popup managers like Shackle, to Its main use case is in combination with popup managers like Shackle, to
use frames instead of windows while still giving focus to existing frames use frames instead of windows while still giving focus to existing frames
instead of duplicating them.") instead of duplicating them.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-sweet-theme (define-public emacs-sweet-theme
(let ((commit "78f741806ecebe01224bf54d09ad80e306652508") (let ((commit "78f741806ecebe01224bf54d09ad80e306652508")
@ -18223,11 +18301,12 @@ in Emacs.")
(package (package
(name "emacs-php-mode") (name "emacs-php-mode")
(version "1.25.0") (version "1.25.0")
(home-page "https://github.com/emacs-php/php-mode")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ejmr/php-mode") (url home-page)
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -18250,7 +18329,6 @@ in Emacs.")
(lambda _ (lambda _
(chdir "lisp")))))) (chdir "lisp"))))))
(propagated-inputs (list emacs-projectile)) (propagated-inputs (list emacs-projectile))
(home-page "https://github.com/ejmr/php-mode")
(synopsis "Major mode for editing PHP code") (synopsis "Major mode for editing PHP code")
(description (description
"PHP mode is a major mode for editing PHP source code. It's an extension "PHP mode is a major mode for editing PHP source code. It's an extension
@ -27816,6 +27894,33 @@ as playing them in some video player, or downloading them.")
and comments.") and comments.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-yeetube
(package
(name "emacs-yeetube")
(version "1.4.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~thanosapollo/yeetube.el")
(commit version)))
(sha256
(base32
"0vfap6sri6qnswrjsp6qvmrp98bvrfh58gwdqbjiakq1fzvcrm03"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(inputs
(list mpv yt-dlp))
(home-page "https://sr.ht/~thanosapollo/yeetube.el")
(synopsis "Youtube & Invidious front-end for Emacs")
(description
"This package offers an Emacs interface that allows you to search YouTube
or an Invidious instance for a specific query. The search results are shown as
links in an org-mode buffer. The videos can be opened to a user-defined video
player(by default mpv) or downloaded using yt-dlp. This package also includes
a yt-dlp front-end.")
(license license:gpl3+)))
(define-public emacs-org-web-tools (define-public emacs-org-web-tools
(package (package
(name "emacs-org-web-tools") (name "emacs-org-web-tools")
@ -30194,6 +30299,27 @@ displays as you type thanks to Helm, though @command{notmuch-search} does the
real search.") real search.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-notmuch-indicator
(package
(name "emacs-notmuch-indicator")
(version "1.0.1")
(home-page "https://git.sr.ht/~protesilaos/notmuch-indicator")
(source (origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/notmuch-indicator-" version
".tar"))
(sha256
(base32
"1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x"))))
(build-system emacs-build-system)
(synopsis "Display a mode line indicator with @code{notmuch-count} output")
(description "This package renders an indicator with an email count of the
@code{notmuch} index on the Emacs mode line. The underlying mechanism is that of
@code{notmuch-count}, which is used to find the number of items that match the
given search terms.")
(license license:gpl3+)))
(define-public emacs-notmuch-maildir (define-public emacs-notmuch-maildir
(package (package
(name "emacs-notmuch-maildir") (name "emacs-notmuch-maildir")
@ -32665,37 +32791,40 @@ time.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-mastodon (define-public emacs-mastodon
(package ;; No release in ~1 year, hence this snapshot.
(name "emacs-mastodon") (let ((commit "20dec8871c9bb5f5e418bfc197e7533b5e3065e3")
(version "1.0.0") (revision "1"))
(source (origin (package
(method git-fetch) (name "emacs-mastodon")
(uri (git-reference (version (git-version "1.0.0" revision commit))
(url "https://codeberg.org/martianh/mastodon.el") (source (origin
(commit version))) (method git-fetch)
(file-name (git-file-name name version)) (uri (git-reference
(sha256 (url "https://codeberg.org/martianh/mastodon.el")
(base32 (commit commit)))
"13swcbvwhjl8ksrgzvmfafkgd3iz8znk49bs1n48w3g9qvh097w7")))) (file-name (git-file-name name version))
(build-system emacs-build-system) (sha256
(arguments (base32
(list #:phases "15cfjny99yw5frdp8nlyazlwgscvfvbinsj0fbdfprxf50k2zjs6"))))
#~(modify-phases %standard-phases (build-system emacs-build-system)
;; Move the source files to the top level, which is included in (arguments
;; the EMACSLOADPATH. (list #:phases
(add-after 'unpack 'move-source-files #~(modify-phases %standard-phases
(lambda _ ;; Move the source files to the top level, which is included in
(let ((el-files (find-files "./lisp" ".*\\.el$"))) ;; the EMACSLOADPATH.
(for-each (lambda (f) (add-after 'unpack 'move-source-files
(rename-file f (basename f))) (lambda _
el-files))))))) (let ((el-files (find-files "./lisp" ".*\\.el$")))
(propagated-inputs (for-each (lambda (f)
(list emacs-request)) (rename-file f (basename f)))
(home-page "https://codeberg.org/martianh/mastodon.el") el-files)))))))
(synopsis "Emacs client for Mastodon") (propagated-inputs
(description "@code{mastodon.el} is an Emacs client for Mastodon, the (list emacs-request emacs-ts emacs-persist))
(home-page "https://codeberg.org/martianh/mastodon.el")
(synopsis "Emacs client for Mastodon")
(description "@code{mastodon.el} is an Emacs client for Mastodon, the
federated microblogging social network.") federated microblogging social network.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-ebdb (define-public emacs-ebdb
(package (package

4
gnu/packages/fonts.scm
View file

@ -3192,7 +3192,7 @@ dialects in Hong Kong and Taiwan.")))
(define-public font-chiron-sung-hk (define-public font-chiron-sung-hk
(package (package
(name "font-chiron-sung-hk") (name "font-chiron-sung-hk")
(version "1.008") (version "1.010")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3201,7 +3201,7 @@ dialects in Hong Kong and Taiwan.")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19rabzmy4ywam4r5kgnqbgbmqzvhsagzddbyis5iicc6y8jrmd1j")))) "065p1gc5xjwc4kfw8bqpsbhaf1p4w0k4l0j04vjsjhcl4k9vyvfz"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "https://chiron-fonts.github.io/") (home-page "https://chiron-fonts.github.io/")
(synopsis "Traditional Chinese Song typeface") (synopsis "Traditional Chinese Song typeface")

122
gnu/packages/games.scm
View file

@ -491,27 +491,25 @@ Doom clone shooter game.")
(define-public armagetronad (define-public armagetronad
(package (package
(name "armagetronad") (name "armagetronad")
(version "0.2.9.1.0") (version "0.2.9.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/armagetronad/stable/" (uri (string-append "mirror://sourceforge/armagetronad/stable/"
version "/armagetronad-" version ".tbz")) version "/armagetronad-" version ".tbz"))
(sha256 (sha256
(base32 (base32
"18gn4sg4j5sw38ngb90sl50raliplrsgjcvy8fjwry733k0cgdjr")))) "0cpxvzbssyf45fmanp1d6l992wln8zkjx4z2flgx27fg1rqdw5zn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list pkg-config))
(list pkg-config)) (inputs (list libxml2
(inputs (sdl-union (list sdl sdl-image sdl-mixer))
(list libxml2 freeglut
sdl libpng
sdl-image libjpeg-turbo))
freeglut
libpng
libjpeg-turbo))
(home-page "https://www.armagetronad.org") (home-page "https://www.armagetronad.org")
(synopsis "Tron clone in 3D") (synopsis "Tron clone in 3D")
(description "Armagetron Advanced is a multiplayer game in 3d that (description
"Armagetron Advanced is a multiplayer game in 3d that
attempts to emulate and expand on the lightcycle sequence from the movie Tron. attempts to emulate and expand on the lightcycle sequence from the movie Tron.
It's an old school arcade game slung into the 21st century. Highlights It's an old school arcade game slung into the 21st century. Highlights
include a customizable playing arena, HUD, unique graphics, and AI bots. For include a customizable playing arena, HUD, unique graphics, and AI bots. For
@ -5571,65 +5569,57 @@ fullscreen, use F5 or Alt+Enter.")
(define-public tennix (define-public tennix
(package (package
(name "tennix") (name "tennix")
(version "1.3.1") (version "1.3.4")
(source (source (origin
(origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://repo.or.cz/tennix.git")
(url "https://repo.or.cz/tennix.git") (commit (string-append "tennix-" version))))
(commit (string-append "tennix-" version)))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk")) "1fmg0vw8c2spyxy4k64nwky80jsw9mc3vnlch49q6cagjsg9y8dj"))
;; Remove non-free images. ;; Remove non-free images.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(begin (for-each delete-file
(for-each delete-file '("data/loc_training_camp.png"
'("data/loc_training_camp.png" "data/loc_austrian_open.png"
"data/loc_austrian_open.png" "data/loc_olympic_green_tennis.png")) #t))))
"data/loc_olympic_green_tennis.png"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;no test (list
#:phases #:tests? #f ;no tests
(modify-phases %standard-phases #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-include (add-after 'unpack 'locate-install
(lambda _ ;; Build process cannot expand "$(INSTALL)" in Makefile.
(substitute* '("src/graphics.h" "src/sound.h") (lambda _
(("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header) (substitute* "makefile"
(string-append "#include \"SDL/" header "\""))) (("^CONFIGURE_OUTPUT :=.*" all)
(substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h") (string-append "INSTALL := install -c\n" all))) #t))
(("#include <SDL.h>") "#include <SDL/SDL.h>") (replace 'configure
(("#include <SDL_net.h>") "#include <SDL/SDL_net.h>")) ;; The "configure" script is picky about the arguments it
#t)) ;; gets. Call it ourselves.
(add-after 'unpack 'locate-install (lambda _
;; Build process cannot expand "$(INSTALL)" in Makefile. (invoke "./configure" "--prefix"
(lambda _ (assoc-ref %outputs "out")))))))
(substitute* "makefile" (native-inputs (list which))
(("^CONFIGURE_OUTPUT :=.*" all) (inputs (list python
(string-append "INSTALL := install -c\n" all))) (sdl-union (list sdl2
#t)) sdl2-image
(replace 'configure sdl2-mixer
;; The "configure" script is picky about the arguments it sdl2-ttf
;; gets. Call it ourselves. sdl2-net
(lambda _ sdl2-gfx))))
(invoke "./configure" "--prefix" (assoc-ref %outputs "out")))))))
(native-inputs
(list which))
(inputs
`(("python" ,python-wrapper)
("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net)))))
(home-page "https://icculus.org/tennix/") (home-page "https://icculus.org/tennix/")
(synopsis "Play tennis against the computer or a friend") (synopsis "Play tennis against the computer or a friend")
(description "Tennix is a 2D tennis game. You can play against the (description
"Tennix is a 2D tennis game. You can play against the
computer or against another player using the keyboard. The game runs computer or against another player using the keyboard. The game runs
in-window at 640x480 resolution or fullscreen.") in-window at 640x480 resolution or fullscreen.")
;; Project is licensed under GPL2+ terms. It includes images ;; Project is licensed under GPL2+ terms. It includes images
;; released under Public Domain terms, and SDL_rotozoom, released ;; released under Public Domain terms.
;; under LGPL2.1 terms. (license (list license:gpl2+ license:public-domain))))
(license (list license:gpl2+ license:public-domain license:lgpl2.1))))
(define-public warzone2100 (define-public warzone2100
(package (package
@ -11059,7 +11049,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.")
(define-public vcmi (define-public vcmi
(package (package
(name "vcmi") (name "vcmi")
(version "1.2.1") (version "1.3.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -11068,7 +11058,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0f3fk1fc2wb7f2j4pxz89dzr8zjnrdh435mijia483a3bq59w7pk")) "0jq84i6lxp96xkzq9mq8n2bbmincjzi39vijj9ws8i59c7xvjw5f"))
(patches (search-patches "vcmi-disable-privacy-breach.patch")))) (patches (search-patches "vcmi-disable-privacy-breach.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments

1
gnu/packages/geo.scm
View file

@ -2775,6 +2775,7 @@ growing set of geoscientific methods.")
"ProcessingGrass7AlgorithmsRasterTestPt1" "ProcessingGrass7AlgorithmsRasterTestPt1"
"ProcessingGrass7AlgorithmsRasterTestPt2" "ProcessingGrass7AlgorithmsRasterTestPt2"
"ProcessingGrass7AlgorithmsVectorTest" "ProcessingGrass7AlgorithmsVectorTest"
"test_core_authconfig"
"test_core_authmanager" "test_core_authmanager"
"test_core_compositionconverter" "test_core_compositionconverter"
"test_core_expression" "test_core_expression"

6
gnu/packages/glib.scm
View file

@ -338,7 +338,7 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
(substitute* '("appmonitor.c" (substitute* '("appmonitor.c"
"async-splice-output-stream.c" "async-splice-output-stream.c"
"autoptr.c" "autoptr.c"
"contexts.c" "contexts.c"
"converter-stream.c" "converter-stream.c"
"file.c" "file.c"
"g-file-info.c" "g-file-info.c"
@ -347,13 +347,13 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
"gapplication.c" "gapplication.c"
"gdbus-connection-flush.c" "gdbus-connection-flush.c"
"gdbus-connection.c" "gdbus-connection.c"
"gdbus-names.c" "gdbus-names.c"
"gdbus-server-auth.c" "gdbus-server-auth.c"
"gsocketclient-slow.c" "gsocketclient-slow.c"
"gsubprocess.c" "gsubprocess.c"
"io-stream.c" "io-stream.c"
"live-g-file.c" "live-g-file.c"
"memory-monitor.c" "memory-monitor.c"
"mimeapps.c" "mimeapps.c"
"network-monitor-race.c" "network-monitor-race.c"
"network-monitor.c" "network-monitor.c"

12
gnu/packages/gnome-xyz.scm
View file

@ -484,7 +484,7 @@ takes advantage of modern hardware using OpenGL.")
(define-public portfolio (define-public portfolio
(package (package
(name "portfolio") (name "portfolio")
(version "0.9.14") (version "1.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -493,7 +493,7 @@ takes advantage of modern hardware using OpenGL.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0h09v8lhz3kv6qmwjhx3gr7rp6ccfhrzm54gjnaixl4dcg9zddls")))) "1ai9mx801m5lngkljg42vrpvhbvc3071sp4jypsvbzw55hxnn5ba"))))
(arguments (arguments
(list #:glib-or-gtk? #t (list #:glib-or-gtk? #t
#:imported-modules `(,@%meson-build-system-modules #:imported-modules `(,@%meson-build-system-modules
@ -508,6 +508,10 @@ takes advantage of modern hardware using OpenGL.")
(with-directory-excursion (string-append #$output (with-directory-excursion (string-append #$output
"/bin") "/bin")
(symlink "dev.tchx84.Portfolio" "portfolio")))) (symlink "dev.tchx84.Portfolio" "portfolio"))))
(add-after 'unpack 'skip-gtk-update-icon-cache
(lambda _
(substitute* "build-aux/meson/postinstall.py"
(("gtk-update-icon-cache") "true"))))
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs (wrap-program (search-input-file outputs
@ -519,12 +523,12 @@ takes advantage of modern hardware using OpenGL.")
`("GI_TYPELIB_PATH" = `("GI_TYPELIB_PATH" =
(,(getenv "GI_TYPELIB_PATH"))))))))) (,(getenv "GI_TYPELIB_PATH")))))))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs (list bash-minimal python-pygobject gtk+ libhandy)) (inputs (list bash-minimal python-pygobject gtk libadwaita))
(native-inputs (native-inputs
(list desktop-file-utils (list desktop-file-utils
gettext-minimal gettext-minimal
`(,glib "bin") `(,glib "bin")
`(,gtk+ "bin") pkg-config
python)) python))
(home-page "https://github.com/tchx84/Portfolio") (home-page "https://github.com/tchx84/Portfolio")
(synopsis "Minimalist file manager for Linux mobile devices") (synopsis "Minimalist file manager for Linux mobile devices")

25
gnu/packages/gnome.scm
View file

@ -142,6 +142,7 @@
#:use-module (gnu packages geo) #:use-module (gnu packages geo)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
@ -7290,6 +7291,28 @@ jQuery.Syntax JavaScript libraries.")
(base32 (base32
"0h9vf4fx056imjf8ibmn03wg1c3hniipy1nsm2jqi62lp1m19c95")))) "0h9vf4fx056imjf8ibmn03wg1c3hniipy1nsm2jqi62lp1m19c95"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-man-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Invoke 'man' directly instead of searching $PATH.
(substitute* '("libyelp/yelp-man-parser.c"
"libyelp/yelp-uri.c")
(("\"man\"")
(string-append "\""
(search-input-file inputs "bin/man")
"\""))
(("G_SPAWN_SEARCH_PATH")
"0"))))
(add-after 'install 'help-man-find-its-dependencies
(lambda* (#:key inputs outputs #:allow-other-keys)
;; XXX: Currently 'man' looks for 'groff' in $PATH in one
;; case. This should be fixed in 'man-db' proper.
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/yelp")
`("PATH" ":" prefix
(,(dirname (search-input-file inputs "bin/groff"))))))))))
(native-inputs (native-inputs
(list `(,glib "bin") ; for glib-genmarshal, etc. (list `(,glib "bin") ; for glib-genmarshal, etc.
intltool intltool
@ -7301,6 +7324,8 @@ jQuery.Syntax JavaScript libraries.")
(list gsettings-desktop-schemas (list gsettings-desktop-schemas
libhandy libhandy
libxslt libxslt
man-db ;for URIs like "man:ls"
groff-minimal ;ditto
sqlite sqlite
webkitgtk webkitgtk
yelp-xsl)) yelp-xsl))

4
gnu/packages/golang.scm
View file

@ -3673,7 +3673,7 @@ per-goroutine.")
(define-public go-github-com-tdewolff-minify-v2 (define-public go-github-com-tdewolff-minify-v2
(package (package
(name "go-github-com-tdewolff-minify-v2") (name "go-github-com-tdewolff-minify-v2")
(version "2.12.6") (version "2.12.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3682,7 +3682,7 @@ per-goroutine.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0h006wpfkl0ls0skqxblwcanrhmphgq5q0ii26l2ayh7s99cgmy3")))) "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:import-path "github.com/tdewolff/minify/v2" (list #:import-path "github.com/tdewolff/minify/v2"

82
gnu/packages/graphics.scm
View file

@ -36,6 +36,7 @@
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2023 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2023 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2643,7 +2644,12 @@ a tetrahedral mesh, isovalue discretization and Lagrangian movement;
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l")))) "1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l"))
;; This patch required to build PrusaSlicer 2.6.
;;
;; It is taken from
;; <https://github.com/fltk/nanosvg/commit/abcd277ea45e9098bed752cf9c6875b533c0892f.patch>
(patches (search-patches "nanosvg-prusa-slicer.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f ;no test suite (arguments (list #:tests? #f ;no test suite
#:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"))) #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
@ -2655,6 +2661,80 @@ anything from rendering scalable icons in an editor application to prototyping
a game.") a game.")
(license license:zlib)))) (license license:zlib))))
(define-public asli
(package
(name "asli")
(version "0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tpms-lattice/ASLI")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "02hwdavpsy3vmivd6prp03jn004ykrl11lbkvksy5i2zm38zbknr"))
(patches (search-patches "asli-use-system-libs.patch"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries except (the ones missing from Guix and)
;; KU Leuven's mTT, which is an obscure (i.e., unfindable by searching
;; online for “mTT KU Leuven”), BSD-3 licensed, header-only library.
#~(begin
;;(delete-file-recursively "libs/AdaptTools") ; Missing from Guix
(delete-file-recursively "libs/CGAL")
;;(delete-file-recursively "libs/alglib") ; Missing from Guix
(delete-file-recursively "libs/eigen")
(delete-file-recursively "libs/mmg")
;;(delete-file-recursively "libs/tetgen") ; Missing from Guix
(delete-file-recursively "libs/yaml")))))
(build-system cmake-build-system)
(inputs
(list boost
cgal
eigen
gmp
`(,mmg "lib")
mpfr
tbb-2020
yaml-cpp))
(arguments
(list #:tests? #f ; No tests
#:configure-flags
#~(list "-DCGAL_ACTIVATE_CONCURRENT_MESH_3=ON"
(string-append "-DEIGEN3_INCLUDE_DIR="
#$(this-package-input "eigen")
"/include/eigen3")
(string-append "-DMMG_INCLUDE_DIR="
(ungexp (this-package-input "mmg") "lib")
"/include")
(string-append "-DMMG_LIBRARY_DIR="
(ungexp (this-package-input "mmg") "lib")
"/lib"))
#:phases
#~(modify-phases %standard-phases
(replace 'install ; No install phase
(lambda _
(with-directory-excursion "../source/bin"
(install-file "ASLI" (string-append #$output "/bin"))
;; The manual is included in the repository.
;; Building it requires -DASLI_DOC=ON, but this is marked
;; as unsupported (presumably for users).
;; Besides, some of the LaTeX packages it uses are
;; missing from Guix, for example emptypage, fvextra and
;; menukeys.
(install-file "docs/ASLI [User Manual].pdf"
(string-append #$output "/share/doc/"
#$name "-" #$version))))))))
(home-page "http://www.biomech.ulg.ac.be/ASLI/")
(synopsis "Create lattice infills with varying unit cell type, size and feature")
(description "ASLI (A Simple Lattice Infiller) is a command-line tool that
allows users to fill any 3D geometry with a functionally graded lattice. The
lattice infill is constructed out of unit cells, described by implicit
functions, whose type, size and feature can be varied locally to obtain the
desired local properties.")
(license license:agpl3+)))
(define-public f3d (define-public f3d
(package (package
(name "f3d") (name "f3d")

74
gnu/packages/guile-xyz.scm
View file

@ -728,7 +728,7 @@ you send to a FIFO file.")
(define-public guile-dsv (define-public guile-dsv
(package (package
(name "guile-dsv") (name "guile-dsv")
(version "0.6.0") (version "0.7.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -737,12 +737,19 @@ you send to a FIFO file.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0llivcgb7idglsapcmvb2qscds7768f2xfgr4lns8mzl2xf5hwvv")))) "0shrzmbh6x3n3xzpcijkxk3f73z6m1i50zgc2dnnccwf4j1c78p2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list autoconf
(list autoconf automake pkg-config texinfo help2man)) automake
(inputs (list guile-3.0)) pkg-config
(propagated-inputs (list guile-lib)) texinfo
help2man
;; needed when cross-compiling.
guile-3.0
guile-lib
guile-smc))
(inputs (list bash-minimal guile-3.0))
(propagated-inputs (list guile-lib guile-smc))
(arguments (arguments
`(#:modules (((guix build guile-build-system) `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
@ -756,32 +763,41 @@ you send to a FIFO file.")
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(guile-lib (assoc-ref inputs "guile-lib")) (guile-lib (assoc-ref inputs "guile-lib"))
(version (target-guile-effective-version)) (version (target-guile-effective-version))
(scm (string-append "/share/guile/site/" (scm (string-append "/share/guile/site/" version))
version)) (go (string-append "/lib/guile/" version
(go (string-append "/lib/guile/" "/site-ccache")))
version "/site-ccache")))
(wrap-program (string-append bin "/dsv") (wrap-program (string-append bin "/dsv")
`("GUILE_LOAD_PATH" prefix `("GUILE_LOAD_PATH" prefix
(,(string-append out scm) (,(string-append out scm) ,(string-append
,(string-append guile-lib scm))) guile-lib scm)))
`("GUILE_LOAD_COMPILED_PATH" prefix `("GUILE_LOAD_COMPILED_PATH" prefix
(,(string-append out go) (,(string-append out go) ,(string-append guile-lib
,(string-append guile-lib go))))) go))))) #t)))))
#t)))))
(home-page "https://github.com/artyom-poptsov/guile-dsv") (home-page "https://github.com/artyom-poptsov/guile-dsv")
(synopsis "DSV module for Guile") (synopsis "DSV module for Guile")
(description (description
"Guile-DSV is a GNU Guile module for working with the "Guile-DSV is a GNU Guile module for working with the delimiter-separated
delimiter-separated values (DSV) data format. Guile-DSV supports the values (DSV) data format. Guile-DSV supports the Unix-style DSV format and RFC 4180
Unix-style DSV format and RFC 4180 format.") style format. Also Guile-DSV includes a console program named @code{dsv} that allows
to view and process DSV data, including such operations as delimiter change,
conversion from one DSV standard to another and printing the data as pseudographics
tables.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public guile2.2-dsv (define-public guile2.2-dsv
(package (package
(inherit guile-dsv) (inherit guile-dsv)
(name "guile2.2-dsv") (name "guile2.2-dsv")
(inputs (list guile-2.2)) (native-inputs (modify-inputs (package-native-inputs guile-dsv)
(propagated-inputs `(("guile-lib" ,guile2.2-lib))))) (replace "guile-smc" guile2.2-smc)
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
(inputs (modify-inputs (package-inputs guile-dsv)
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
(propagated-inputs (modify-inputs (package-propagated-inputs guile-dsv)
(replace "guile-lib" guile2.2-lib)
(replace "guile-smc" guile2.2-smc)))))
(define-public guile-fibers-1.3 (define-public guile-fibers-1.3
(package (package
@ -3840,7 +3856,7 @@ debugging code.")
(define-public guile-png (define-public guile-png
(package (package
(name "guile-png") (name "guile-png")
(version "0.7.0") (version "0.7.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3849,10 +3865,13 @@ debugging code.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0nkim662lb48y8n5hik8rrj76600v2inwaxwnfpdny7h2j0yq1wm")))) "0y65795s9bs69msqvdbq8h34n00bkfs5v1d44wz21nwdffvq6557"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (list
#:make-flags #~(list "GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:phases #~(modify-phases %standard-phases
(delete 'strip))))
(native-inputs (list autoconf (native-inputs (list autoconf
automake automake
pkg-config pkg-config
@ -3868,9 +3887,9 @@ debugging code.")
(synopsis "PNG file parsing library for Guile") (synopsis "PNG file parsing library for Guile")
(description (description
"@code{guile-png} is a GNU Guile library for working with the "@code{guile-png} is a GNU Guile library for working with the
@url{https://en.wikipedia.org/wiki/PNG, PNG format}. This library provides @url{https://en.wikipedia.org/wiki/PNG, PNG format}. This library provides API for
API for reading and writing PNG data, as well as some basic image processing reading and writing PNG data, as well as some graphic primitives and basic image
filters.") processing filters.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public nomad (define-public nomad
@ -5413,6 +5432,9 @@ with a FSM is being built (for example, from a Makefile.)")
(package (package
(inherit guile-smc) (inherit guile-smc)
(name "guile2.2-smc") (name "guile2.2-smc")
(native-inputs (modify-inputs (package-native-inputs guile-smc)
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
(inputs (modify-inputs (package-inputs guile-smc) (inputs (modify-inputs (package-inputs guile-smc)
(replace "guile" guile-2.2) (replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib))))) (replace "guile-lib" guile2.2-lib)))))

1
gnu/packages/heads.scm
View file

@ -158,6 +158,7 @@ done
(uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz") (uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz")
(sha256 (sha256
(base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k")))))) (base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"))))))
(supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://github.com/osresearch/heads") (home-page "https://github.com/osresearch/heads")
(synopsis "Musl-cross gcc 5 toolchain") (synopsis "Musl-cross gcc 5 toolchain")
(description "Musl-cross toolchain: binutils, gcc 5 and musl.") (description "Musl-cross toolchain: binutils, gcc 5 and musl.")

89
gnu/packages/image.scm
View file

@ -1475,7 +1475,7 @@ channels.")
(package (package
(inherit libwebp) (inherit libwebp)
(name "libwebp") (name "libwebp")
(version "1.3.1") (version "1.3.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1485,7 +1485,7 @@ channels.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1aas6gwy7kfcq34cil781kcsl286khh9grwcx7k4d2n1g7zcpl3m")))))) "1x37795gpc63g1ma9kqw4q3dikwhrjklixqzjjsj6viqksa19z41"))))))
(define-public libmng (define-public libmng
(package (package
@ -1931,6 +1931,91 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
(home-page "https://niftilib.sourceforge.net") (home-page "https://niftilib.sourceforge.net")
(license license:public-domain))) (license license:public-domain)))
(define-public mini
(package
(name "mini")
(version "0.9.14")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pulzed/mINI")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"01wn7h9rjz9h6cr11dd62jsb3315d1h6c33pdmwi2l7d8a4n3h8d"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(delete 'build)
(delete 'configure)
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion "tests"
(for-each (lambda (test)
(let ((test-name (basename test
".cpp")))
(invoke "./build.sh" test-name)
(invoke "./run.sh" test-name)))
(find-files "." ".cpp"))))))
(replace 'install
(lambda _
(install-file "src/mini/ini.h"
(string-append #$output "/include/mini")))))))
(home-page "https://github.com/pulzed/mINI")
(synopsis "INI file reader and writer header library")
(description
"This is a tiny, header-only C++ library for manipulating INI files.")
(license license:expat)))
(define-public picket
(package
(name "picket")
(version "1.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rajter/picket")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1zhpynyakjx9nc51b1j80b4y3138p3l380kp1cqmmjx2n9430144"))
(snippet '(begin
;; bundled mINI header library.
(delete-file "src/cfg/ini.h")))))
(native-inputs (list pkg-config))
(inputs (list gtkmm-3 mini))
(arguments
(list #:tests? #f
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-mini-includes
(lambda _
(substitute* '("src/cfg/config.h"
"src/cfg/config.cpp")
(("#include \"ini.h\"")
"#include \"mini/ini.h\""))
(substitute* "src/main.cpp"
(("/usr")
#$output))))
(add-after 'unpack 'fix-cmake-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("src/cfg/ini.h")
(search-input-file inputs
"/include/mini/ini.h"))
(("/usr/")
#$output)))))))
(build-system cmake-build-system)
(home-page "https://github.com/rajter/picket")
(synopsis "Screen color picker with custom format output")
(description
"Picket is a screen color picker that includes a magnifier and supports
custom formats for representing color values..")
(license license:gpl3+)))
(define-public gpick (define-public gpick
(package (package
(name "gpick") (name "gpick")

7
gnu/packages/ipfs.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -220,7 +221,7 @@ written in Go.")
(define-public go-ipfs (define-public go-ipfs
(package (package
(name "go-ipfs") (name "go-ipfs")
(version "0.11.0") (version "0.13.0")
(source (source
(origin (origin
(method url-fetch/tarbomb) (method url-fetch/tarbomb)
@ -228,7 +229,7 @@ written in Go.")
"https://dist.ipfs.io/go-ipfs/v" version "https://dist.ipfs.io/go-ipfs/v" version
"/go-ipfs-source.tar.gz")) "/go-ipfs-source.tar.gz"))
(sha256 (sha256
(base32 "13pmj83hwpz6mk7x52qn0cjnfqxqw2qri3r0k4b270w3bafcccwm")) (base32 "1cx47ais2zn62c0r7lmrpfzia2gjyr61qi8my5wg3pj3dfr0fhkq"))
(file-name (string-append name "-" version "-source")) (file-name (string-append name "-" version "-source"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(for-each delete-file-recursively (snippet '(for-each delete-file-recursively
@ -350,6 +351,8 @@ written in Go.")
go-golang-org-x-term go-golang-org-x-term
go-golang-org-x-tools go-golang-org-x-tools
go-golang-org-x-xerrors go-golang-org-x-xerrors
go-golang-org-x-exp
go-golang-org-x-text
go-lukechampine-com-blake3)) go-lukechampine-com-blake3))
(native-inputs (native-inputs
(append (if (%current-target-system) (append (if (%current-target-system)

7
gnu/packages/julia-jll.scm
View file

@ -401,7 +401,7 @@ build tree Yggdrasil.")
(define-public julia-freetype2-jll (define-public julia-freetype2-jll
(package (package
(name "julia-freetype2-jll") (name "julia-freetype2-jll")
(version "2.10.4+0") (version "2.13.1+0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -410,7 +410,7 @@ build tree Yggdrasil.")
(commit (string-append "FreeType2-v" version)))) (commit (string-append "FreeType2-v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "03lgmb59lipc3bi7z22j4a53bbjmcwkf0xzpwan889p1ix3ry1lr")))) (base32 "1kngkk3kkf6dam8g4g2ajvzvydzxbgpgxlcpsg7nm7q6r5b4b4db"))))
(build-system julia-build-system) (build-system julia-build-system)
(arguments (arguments
'(#:tests? #f ; No runtests.jl '(#:tests? #f ; No runtests.jl
@ -426,8 +426,7 @@ build tree Yggdrasil.")
"generate_wrapper_header(\"FreeType2\", \"" "generate_wrapper_header(\"FreeType2\", \""
(assoc-ref inputs "freetype") "\")\n")))) (assoc-ref inputs "freetype") "\")\n"))))
;; There's a Julia file for each platform, override them all ;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$")) (find-files "src/wrappers/" "\\.jl$")))))))
#t)))))
(inputs (inputs
(list freetype)) (list freetype))
(propagated-inputs (propagated-inputs

3
gnu/packages/julia-xyz.scm
View file

@ -6084,7 +6084,8 @@ with ANSI escape sequences.")
"test/runtests.jl") "test/runtests.jl")
(("Int64") "Int32")))))))) (("Int64") "Int32"))))))))
(propagated-inputs (propagated-inputs
(list julia-dataapi (list julia-adapt
julia-dataapi
julia-staticarrays julia-staticarrays
julia-tables)) julia-tables))
(native-inputs (native-inputs

1
gnu/packages/kde-plasma.scm
View file

@ -1210,6 +1210,7 @@ KDE Frameworks components.")
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/" (uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch"))
(sha256 (sha256
(base32 (base32
"0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb")))) "0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb"))))

77
gnu/packages/libftdi.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -18,32 +19,86 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libftdi) (define-module (gnu packages libftdi)
#:use-module (guix licenses) #:use-module (guix build utils)
#:use-module (guix build-system cmake)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages boost)
#:use-module (gnu packages documentation)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (guix build-system cmake)) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages swig)
#:use-module (gnu packages textutils))
(define-public libftdi (define-public libftdi
(package (package
(name "libftdi") (name "libftdi")
(version "1.4") (version "1.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://www.intra2net.com/en/developer/libftdi/download/libftdi1-" "https://www.intra2net.com/en/developer/libftdi/download/"
version ".tar.bz2")) "libftdi1-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc")))) "0jdh5r499wbz83vmpskczq5m3cfc1mcv8xqisj5i95k1r3lr2w3w"))
(patches
(search-patches "libftdi-fix-paths-when-FTDIPP-set.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "doc" "python"))
(arguments
(list
#:configure-flags
#~(list (string-append "-DCMAKE_INSTALL_DOCDIR="
#$output "/share/doc/" #$name "-" #$version)
"-DDOCUMENTATION=ON"
"-DEXAMPLES=OFF"
"-DFTDIPP=ON"
"-DLIB_SUFFIX=''" ; place libraries in /lib, not /lib64
"-DPYTHON_BINDINGS=ON")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-python-binding
(lambda _
(let* ((python-version
#$(version-major+minor (package-version python)))
(python-lib-path
(string-append "/lib/python" python-version)))
(mkdir-p (string-append #$output:python "/lib"))
(mkdir-p (string-append #$output:python "/share/libftdi"))
(rename-file (string-append #$output python-lib-path)
(string-append #$output:python python-lib-path))
(rename-file (string-append #$output
"/share/libftdi/examples")
(string-append #$output:python
"/share/libftdi/examples")))))
(add-after 'install-python-binding 'install-documentation
(lambda _
(let ((share (string-append #$output:doc "/share")))
(copy-recursively "doc/man"
(string-append share "/man"))
(copy-recursively "doc/html"
(string-append share "/doc/"
#$name "-" #$version
"/html"))))))
#:test-target "check"
#:tests? #f)) ; tests fail without access to USB
(native-inputs
(list doxygen graphviz pkg-config python swig))
(inputs
(list boost libconfuse))
(propagated-inputs (propagated-inputs
(list libusb)) ; required by libftdi1.pc (list libusb)) ; required by libftdi1.pc
(home-page "https://www.intra2net.com/en/developer/libftdi/") (home-page "https://www.intra2net.com/en/developer/libftdi/")
(synopsis "FTDI USB driver with bitbang mode") (synopsis "FTDI USB driver with bitbang mode")
(description (description
"libFTDI is a library to talk to FTDI chips: FT232BM, "libFTDI is a library to talk to FTDI chips: FT232BM, FT245BM, FT2232C,
FT245BM, FT2232C, FT2232D, FT245R and FT232H including the popular FT2232D, FT245R and FT232H including the popular bitbangmode.")
bitbangmode.") (license (list license:gpl2 ; ftdi_eeprom, C++ bindings
(license lgpl2.1))) license:lgpl2.1)))) ; main library

34
gnu/packages/linux.scm
View file

@ -490,7 +490,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major ;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream. ;; versions that are still supported upstream.
(define-public linux-libre-6.4-version "6.4.14") (define-public linux-libre-6.4-version "6.4.15")
(define-public linux-libre-6.4-gnu-revision "gnu") (define-public linux-libre-6.4-gnu-revision "gnu")
(define deblob-scripts-6.4 (define deblob-scripts-6.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -500,7 +500,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1rwm09anyn4py1g877f9vh6ya86y2hfvlqx51bpa53dci5k0b0ds"))) (base32 "1rwm09anyn4py1g877f9vh6ya86y2hfvlqx51bpa53dci5k0b0ds")))
(define-public linux-libre-6.4-pristine-source (define-public linux-libre-6.4-pristine-source
(let ((version linux-libre-6.4-version) (let ((version linux-libre-6.4-version)
(hash (base32 "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm"))) (hash (base32 "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.4))) deblob-scripts-6.4)))
@ -508,7 +508,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support. ;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines: ;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html> ;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-6.1-version "6.1.51") (define-public linux-libre-6.1-version "6.1.52")
(define-public linux-libre-6.1-gnu-revision "gnu") (define-public linux-libre-6.1-gnu-revision "gnu")
(define deblob-scripts-6.1 (define deblob-scripts-6.1
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -518,12 +518,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11"))) (base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11")))
(define-public linux-libre-6.1-pristine-source (define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version) (let ((version linux-libre-6.1-version)
(hash (base32 "0fqhmb6v28rssd44z7jw57mwvvskpl4kabjylck0pg54irnl9c2q"))) (hash (base32 "0lis73mxnl7hxz8lyja6sfgmbym944l3k1h7dab6b4mw1nckfxsn")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.1))) deblob-scripts-6.1)))
(define-public linux-libre-5.15-version "5.15.130") (define-public linux-libre-5.15-version "5.15.131")
(define-public linux-libre-5.15-gnu-revision "gnu") (define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15 (define deblob-scripts-5.15
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -533,7 +533,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1c3lm0j401lv2lk39dmr4mlf5ic173snm7cc0cckl6czyvxr5ysy"))) (base32 "1c3lm0j401lv2lk39dmr4mlf5ic173snm7cc0cckl6czyvxr5ysy")))
(define-public linux-libre-5.15-pristine-source (define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version) (let ((version linux-libre-5.15-version)
(hash (base32 "0qix62jsn3z9yccakac7fvqnip19zi05qn0w5wkgb7rj0x0lwimb"))) (hash (base32 "0sacnbw48lblnqaj56nybh588sq4k84gwf0r5zinzyrryj8k6z4r")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.15))) deblob-scripts-5.15)))
@ -739,6 +739,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(format p "~a-default~%" ,version))))))) (format p "~a-default~%" ,version)))))))
#:allowed-references () #:allowed-references ()
#:tests? #f)) #:tests? #f))
(supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://www.gnu.org/software/linux-libre/") (home-page "https://www.gnu.org/software/linux-libre/")
(synopsis "GNU Linux-Libre kernel headers") (synopsis "GNU Linux-Libre kernel headers")
(description "Headers of the Linux-Libre kernel.") (description "Headers of the Linux-Libre kernel.")
@ -1071,6 +1072,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
elfutils ;needed to enable CONFIG_STACK_VALIDATION elfutils ;needed to enable CONFIG_STACK_VALIDATION
flex flex
bison bison
util-linux ;needed for hexdump
;; These are needed to compile the GCC plugins. ;; These are needed to compile the GCC plugins.
gmp gmp
mpfr mpfr
@ -5547,7 +5549,7 @@ arrays when needed.")
(define-public multipath-tools (define-public multipath-tools
(package (package
(name "multipath-tools") (name "multipath-tools")
(version "0.9.3") (version "0.9.6")
(home-page "https://github.com/opensvc/multipath-tools") (home-page "https://github.com/opensvc/multipath-tools")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -5555,7 +5557,7 @@ arrays when needed.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0zcnr1135znizbnfqhqv3by9i2qwn5vg6kgmj6ma3yy1x1krx0d4")) "1933iqh9r54pdl95yck0n4bw7jiiblymc964vlc1787qd4q012sz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -5573,7 +5575,7 @@ arrays when needed.")
(string-append "prefix=" #$output) (string-append "prefix=" #$output)
;; Install Udev rules below this directory, relative ;; Install Udev rules below this directory, relative
;; to the prefix. ;; to the prefix.
"SYSTEMDPATH=lib") (string-append "systemd_prefix=" #$output))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -5605,6 +5607,16 @@ arrays when needed.")
(("CFLAGS \\+= " match) (("CFLAGS \\+= " match)
(string-append match "-Wno-error=unused-function "))))) (string-append match "-Wno-error=unused-function ")))))
(delete 'configure) ;no configure script (delete 'configure) ;no configure script
(add-before 'build 'no-fortify-3
(lambda _
;; NOTE: The check made seems to wrongly assume the
;; FORTIFY_SOURCE=3 is valid. However, when compiling, warnings
;; are emitted from glibc, resulting in failed build. Fix this
;; by forcing the usage of FORTIFY_SOURCE=2.
(substitute* "create-config.mk"
(("FORTIFY_SOURCE=3")
"FORTIFY_SOURCE=2"))
))
(add-before 'build 'set-LDFLAGS (add-before 'build 'set-LDFLAGS
(lambda _ (lambda _
;; Note: this cannot be passed as a make flag because that will ;; Note: this cannot be passed as a make flag because that will
@ -5622,7 +5634,9 @@ arrays when needed.")
liburcu liburcu
lvm2 lvm2
readline readline
eudev)) eudev
;; For libmount.
`(,util-linux "lib")))
(synopsis "Access block devices through multiple paths") (synopsis "Access block devices through multiple paths")
(description (description
"This package provides the following binaries to drive the "This package provides the following binaries to drive the

11
gnu/packages/lisp-xyz.scm
View file

@ -25824,12 +25824,11 @@ change since last write.
(inputs (inputs
(cons (list "iolib" cl-iolib) (cons (list "iolib" cl-iolib)
(package-inputs sbcl-nfiles))))) (package-inputs sbcl-nfiles)))))
(define-public sbcl-nasdf (define-public sbcl-nasdf
(let ((commit "dd9fb2df7174464b54561b2a2f3c3e00fdd5d4f7")) (let ((commit "ab7a018f3a67a999c72710644b10b4545130c139"))
(package (package
(name "sbcl-nasdf") (name "sbcl-nasdf")
(version "0.1.7") (version "0.1.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -25838,7 +25837,7 @@ change since last write.
(commit commit))) (commit commit)))
(file-name (git-file-name "cl-ntemplate" version)) (file-name (git-file-name "cl-ntemplate" version))
(sha256 (sha256
(base32 "1q8ky8hz8xrr37h7yyc6ysvrcwlsp1i6r2x44c060drspgjbqj70")))) (base32 "15j7kqxvn0blr0i2xgk0il0ia91p28clfqxdh00vlp423v9a2wbx"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(arguments (arguments
`(#:phases `(#:phases
@ -26603,7 +26602,7 @@ instead of #'FOO.
(define-public sbcl-njson (define-public sbcl-njson
(package (package
(name "sbcl-njson") (name "sbcl-njson")
(version "1.1.1") (version "1.2.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -26612,7 +26611,7 @@ instead of #'FOO.
(file-name (git-file-name "cl-njson" version)) (file-name (git-file-name "cl-njson" version))
(sha256 (sha256
(base32 (base32
"0zdf6mlbpc2j95qm000ljf642af18sfz45yxh6rnxrbf8m4laxxa")))) "1zsf7sm88wjrd4da5bvpxi8fvsx01cv51p8820fnj062x6hlhg38"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (list sbcl-cl-json sbcl-jzon)) (inputs (list sbcl-cl-json sbcl-jzon))
(native-inputs (list sbcl-lisp-unit2)) (native-inputs (list sbcl-lisp-unit2))

151
gnu/packages/lua.scm
View file

@ -19,6 +19,7 @@
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> ;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la> ;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Valter Nazianzeno <manipuladordedados@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,14 +51,18 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools) #:use-module (gnu packages build-tools)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages rdf)
#:use-module (gnu packages re2c) #:use-module (gnu packages re2c)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
@ -1129,63 +1134,101 @@ shell command executions.")
(define-public emilua (define-public emilua
(package (package
(name "emilua") (name "emilua")
(version "0.3.2") (version "0.4.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/emilua/emilua.git") (url "https://gitlab.com/emilua/emilua.git")
(commit (string-append "v" version)) (commit (string-append "v" version))))
;; Current version requires Trial.Protocol and the HTTP lib (file-name (git-file-name name version))
;; developed as part of GSoC 2014 for Boost, and these are (sha256
;; dependencies unlikely to be "unbundled" in future releases. (base32
(recursive? #t))) "1dwag2pyqc0g86rris4w4fzafmz9a6kiqd47vdq7hl3a1lyi74mx"))))
(file-name (git-file-name name version)) (build-system meson-build-system)
(sha256 (arguments
(base32 (list
"1999bgrh52124a5g4qizav3x257ff2brjr855srpm1jv1nxzbygv")))) #:phases
(build-system meson-build-system) #~(modify-phases %standard-phases
(arguments (add-after 'unpack 'patch
`(;; Tests are disabled for now due to an issue that affecs guix: (lambda* (#:key inputs #:allow-other-keys)
;; <https://gitlab.com/emilua/emilua/-/issues/22> (substitute* "src/emilua_gperf.awk"
(("/usr/bin/env") (which "env")))
(substitute* "src/system.cpp"
(("P_PIDFD") "P_PID"))
(copy-recursively
(assoc-ref inputs "emilua-http")
"emilua-http")
(copy-recursively
(assoc-ref inputs "trial-protocol")
"trial-protocol")
(with-directory-excursion "subprojects"
(symlink "../emilua-http" "emilua-http")
(copy-file "packagefiles/emilua-http/meson.build"
"emilua-http/meson.build")
(symlink "../trial-protocol" "trial-protocol")
(copy-file "packagefiles/trial.protocol/meson.build"
"trial-protocol/meson.build")))))
#:configure-flags #:configure-flags
(list "-Denable_http=true" #~(list "-Denable_http=true"
"-Denable_tests=false" "-Denable_file_io=true"
"-Denable_manpages=false" "-Denable_io_uring=true"
"-Dversion_suffix=-guix1"))) ;; TODO: Linux namespaces are disabled for now due to conflict
(native-inputs ;; with some packages in guix.
(list luajit-lua52-openresty "-Denable_linux_namespaces=false"
pkg-config "-Denable_manpages=false"
re2c "-Dversion_suffix=-guix1")))
xxd)) (native-inputs
(inputs (list luajit-lua52-openresty
(list boost re2c
boost-static gperf
fmt-7 xxd
;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty pkg-config))
;; fork. Emilua is severely affected by this limit, so the upstream package (inputs
;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT `(("emilua-http"
;; configure flag[2] for some features to work (e.g. __pairs on HTTP ,(origin
;; headers). (method git-fetch)
;; (uri (git-reference
;; [1] <http://hacksoflife.blogspot.com/2012/12/integrating-luajit-with-x-plane-64-bit.html> (url "https://github.com/BoostGSoC14/boost.http")
;; [2] <http://luajit.org/extensions.html#lua52> (commit "93ae527c89ffc517862e1f5f54c8a257278f1195")))
luajit-lua52-openresty (sha256
ncurses (base32
openssl)) "0jm7fw0cjd3s9zkkvyh6mcj6z32hcy7l9bszv74l92qk15ivvp9h"))))
(native-search-paths ("trial-protocol"
(list ,(origin
(search-path-specification (method git-fetch)
(variable "EMILUA_PATH") (uri (git-reference
(files (url "https://github.com/breese/trial.protocol")
(list (string-append "lib/emilua-" (version-major+minor version))))))) (commit "79149f604a49b8dfec57857ca28aaf508069b669")))
(home-page "https://gitlab.com/emilua/emilua") (sha256
(synopsis "Lua execution engine") (base32
(description "0k42i5b4v3zz5x0r3dssiymgmn2x8zg4fzdksya9aggxgigippsx"))))
"Emilua is a LuaJIT-based Lua execution engine that supports async IO, ("boost" ,boost)
("boost-static" ,boost-static)
("fmt" ,fmt-8)
("gcc" ,gcc-12)
("luajit-lua52-openresty" ,luajit-lua52-openresty)
("ncurses" ,ncurses)
("serd" ,serd)
("sord" ,sord)
("libcap" ,libcap)
("liburing" ,liburing)
("openssl" ,openssl)))
(native-search-paths
(list
(search-path-specification
(variable "EMILUA_PATH")
(files
(list (string-append "lib/emilua-" (version-major+minor version)))))))
(home-page "https://gitlab.com/emilua/emilua")
(synopsis "Lua execution engine")
(description
"Emilua is a LuaJIT-based Lua execution engine that supports async IO,
fibers and actor-inspired threading. The experimental builtin HTTP module is fibers and actor-inspired threading. The experimental builtin HTTP module is
enabled.") enabled.")
(license license:boost1.0))) (license license:boost1.0)))
(define-public fennel (define-public fennel
(package (package

263
gnu/packages/machine-learning.scm
View file

@ -55,12 +55,14 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages adns) #:use-module (gnu packages adns)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages bdw-gc) #:use-module (gnu packages bdw-gc)
#:use-module (gnu packages c)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
@ -89,6 +91,7 @@
#:use-module (gnu packages ninja) #:use-module (gnu packages ninja)
#:use-module (gnu packages ocaml) #:use-module (gnu packages ocaml)
#:use-module (gnu packages onc-rpc) #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages opencl)
#:use-module (gnu packages parallel) #:use-module (gnu packages parallel)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -100,6 +103,7 @@
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages regex)
#:use-module (gnu packages rpc) #:use-module (gnu packages rpc)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
@ -108,6 +112,7 @@
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -115,6 +120,37 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public fasttext
(package
(name "fasttext")
(version "0.9.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/facebookresearch/fastText")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"))))
(build-system cmake-build-system)
;; Tests require downloading of test data.
(arguments (list #:tests? #false))
(home-page "https://github.com/facebookresearch/fastText")
(synopsis "Library for fast text representation and classification")
(description "fastText is a library for efficient learning of word
representations and sentence classification.")
(license license:expat)))
(define-public python-fasttext
(package
(inherit fasttext)
(name "python-fasttext")
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy))
(inputs (list fasttext))
(native-inputs (list pybind11))))
(define-public fann (define-public fann
;; The last release is >100 commits behind, so we package from git. ;; The last release is >100 commits behind, so we package from git.
(let ((commit "d71d54788bee56ba4cf7522801270152da5209d7")) (let ((commit "d71d54788bee56ba4cf7522801270152da5209d7"))
@ -2936,7 +2972,7 @@ advanced research.")
(define-public tensorflow-lite (define-public tensorflow-lite
(package (package
(name "tensorflow-lite") (name "tensorflow-lite")
(version "2.5.0") (version "2.12.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2946,97 +2982,141 @@ advanced research.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l")))) "0jkgljdagdqllnxygl35r5bh3f9qmbczymfj357gm9krh59g2kmd"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #false ; no "check" target (list
#:build-type "Release" #:tests? #false ;tests are not building now
#:configure-flags #:build-type "Release"
(list #:modules '((ice-9 match)
"-DTFLITE_ENABLE_GPU=OFF" (guix build utils)
"-DTFLITE_ENABLE_RUY=OFF" (guix build cmake-build-system))
#:configure-flags
#~(list
;; "-DTFLITE_KERNEL_TEST=ON" ; TODO: build tests
;; so cmake can be used to find this from other packages
"-DTFLITE_ENABLE_INSTALL=ON"
;; TODO: The build system attempts to build xnnpack from source. We ;; Use Guix's own packages as dependencies.
;; would like to use our xnnpack package here, but this requires more "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
;; work.
"-DTFLITE_ENABLE_XNNPACK=OFF"
;; Pretend we've already fetched abseil. We won't actually build it "-DTFLITE_ENABLE_GPU=ON"
;; but use the existing package. "-DTFLITE_ENABLE_RUY=ON"
"-Dabseil-cpp_POPULATED=TRUE"
;; Don't fetch the sources. We have already built flatbuffers. ;; TODO: turn on Farmhash
"-Dflatbuffers_POPULATED=TRUE" ;;"-DSYSTEM_FARMHASH=ON"
(string-append "-Dabsl_DIR=" #$(this-package-input "abseil-cpp")
"/lib/cmake/absl")
(string-append "-DEigen3_DIR=" #$(this-package-input "eigen")
"/share/eigen3/cmake")
(string-append "-DFlatBuffers_DIR="
#$(this-package-input "flatbuffers-shared")
"/lib/cmake/flatbuffers")
(string-append "-DNEON_2_SSE_DIR=" #$(this-package-input "neon2sse")
"/lib/cmake/NEON_2_SSE")
(string-append "-Dcpuinfo_DIR=" #$(this-package-input "cpuinfo")
"/share/cpuinfo")
(string-append "-Druy_DIR=" #$(this-package-input "ruy")
"/lib/cmake/ruy")
"-DFFT2D_SOURCE_DIR=/tmp/fft2d" ;; TODO: The build system attempts to build xnnpack from source. We
"-Dneon2sse_SOURCE_DIR=/tmp/neon2sse" ;; would like to use our xnnpack package here, but this requires more
"-Dneon2sse_BINARY_DIR=/tmp/neon2sse-bin" ;; work.
"-DFARMHASH_SOURCE_DIR=/tmp/farmhash" "-DTFLITE_ENABLE_XNNPACK=OFF"
"-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp"
(string-append "-DRUY_SOURCE_DIR="
(assoc-ref %build-inputs "ruy-src")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _ (chdir "tensorflow/lite")))
(add-after 'chdir 'copy-sources
(lambda* (#:key inputs #:allow-other-keys)
;; Use external cmake finders instead of these stubs that won't
;; find anything but the bundled sources.
(delete-file "tools/cmake/modules/Findabsl.cmake")
(delete-file "tools/cmake/modules/Findeigen.cmake")
(substitute* "CMakeLists.txt" ;; Don't fetch the sources. We have these already
(("find_package\\(eigen REQUIRED") "-Degl_headers_POPULATED=TRUE"
"find_package(eigen REQUIRED NAMES Eigen3")) "-Dfp16_headers_POPULATED=TRUE"
(substitute* "tools/cmake/modules/Findflatbuffers.cmake" "-Dopencl_headers_POPULATED=TRUE"
(("get_target_property.*") "-Dopengl_headers_POPULATED=TRUE"
(format #false "set(FLATBUFFERS_INCLUDE_DIRS ~a/include)\n" "-Dvulkan_headers_POPULATED=TRUE"
(assoc-ref inputs "flatbuffers")))) "-Dgoogletest_POPULATED=TRUE"
"-Dgoogle_benchmark_POPULATED=TRUE"
"-Dnsync_POPULATED=TRUE"
"-Dre2_POPULATED=TRUE"
;; Don't fetch source code; we already have everything we need. "-DFFT2D_SOURCE_DIR=/tmp/fft2d"
(substitute* '("tools/cmake/modules/fft2d.cmake" "-DFARMHASH_SOURCE_DIR=/tmp/farmhash"
"tools/cmake/modules/ruy.cmake" "-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp")
"tools/cmake/modules/farmhash.cmake" #:phases
"tools/cmake/modules/neon2sse.cmake" #~(modify-phases %standard-phases
"tools/cmake/modules/gemmlowp.cmake") (add-after 'unpack 'chdir
(("OverridableFetchContent_Populate.*") "")) (lambda _ (chdir "tensorflow/lite")))
(add-after 'chdir 'copy-sources
(lambda* (#:key inputs #:allow-other-keys)
;; TODO: properly use Guix's pthreaqdpool. We are not using
;; pthreadpool because we are not enabling xnnpack
(substitute* "CMakeLists.txt"
(("if\\(NOT DEFINED PTHREADPOOL_SOURCE_DIR\\)")
"if(false)"))
(substitute* "CMakeLists.txt"
(("if\\(NOT TARGET pthreadpool\\)")
"if(false)"))
(mkdir-p "/tmp/farmhash") ;; Don't fetch source code; we already have everything we need.
(with-directory-excursion "/tmp/farmhash" (substitute* '("tools/cmake/modules/fft2d.cmake"
(invoke "tar" "--strip-components=1" "tools/cmake/modules/farmhash.cmake"
"-xf" (assoc-ref inputs "farmhash-src"))) "tools/cmake/modules/gemmlowp.cmake")
(("OverridableFetchContent_Populate.*") ""))
(mkdir-p "/tmp/fft2d") (mkdir-p "/tmp/farmhash")
(with-directory-excursion "/tmp/fft2d" (with-directory-excursion "/tmp/farmhash"
(invoke "tar" "--strip-components=1" (invoke "tar" "--strip-components=1"
"-xf" (assoc-ref inputs "fft2d-src"))) "-xf" (assoc-ref inputs "farmhash-src")))
(copy-recursively (assoc-ref inputs "neon2sse-src") (mkdir-p "/tmp/fft2d")
"/tmp/neon2sse/") (with-directory-excursion "/tmp/fft2d"
(copy-recursively (assoc-ref inputs "gemmlowp-src") (invoke "tar" "--strip-components=1"
"/tmp/gemmlowp/"))) "-xf" (assoc-ref inputs "fft2d-src")))
(add-after 'copy-sources 'prepare-shared-library-build
(lambda _ (chdir "c"))) (copy-recursively (assoc-ref inputs "gemmlowp-src")
(replace 'install "/tmp/gemmlowp/")))
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (add-after 'build 'build-shared-library
(lib (string-append out "/lib")) (lambda* (#:key configure-flags #:allow-other-keys)
(headers (string-append out "/include/tensorflow/lite"))) (mkdir-p "c")
(install-file "../build/libtensorflowlite_c.so" lib) (with-directory-excursion "c"
(with-directory-excursion ".." (apply invoke "cmake" (append configure-flags (list "../../lite/c")))
(for-each (invoke "cmake" "--build" "." "-j" (number->string
(lambda (file) (parallel-job-count))))))
(let ((target-dir (string-append headers "/" (dirname file)))) (add-after 'build-shared-library 'build-benchmark-model
(install-file file target-dir))) (lambda _
(find-files "." "\\.h$"))))))))) (invoke "cmake" "--build" "." "--target" "benchmark_model"
"-j" (number->string (parallel-job-count)))))
(add-after 'install 'install-extra
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(bin (string-append out "/bin")))
(install-file "../build/c/libtensorflowlite_c.so" lib)
(install-file "../build/tools/benchmark/benchmark_model" bin))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "ctest" "-L" "plain")))))))
(inputs (inputs
`(("abseil-cpp" ,abseil-cpp-20200923.3) `(("abseil-cpp" ,abseil-cpp-20200923.3)
("eigen" ,eigen-for-tensorflow-lite) ("cpuinfo" ,cpuinfo)
("flatbuffers" ,flatbuffers) ("eigen" ,eigen)
("python" ,python))) ("fp16" ,fp16)
("flatbuffers-shared" ,flatbuffers-next-shared)
;;("gemmlowp" ,gemmlowp) ; TODO
("mesa-headers" ,mesa-headers)
("neon2sse" ,neon2sse)
("nsync" ,nsync)
("opencl-clhpp" ,opencl-clhpp)
("opencl-headers" ,opencl-headers)
("opencl-icd-loader" ,opencl-icd-loader)
("pthreadpool" ,pthreadpool)
("python" ,python)
("ruy" ,ruy)
("re2" ,re2)
;;("xnnpack" ,xnnpack) ; TODO: use Guix's copy of xnnpack
("vulkan-headers" ,vulkan-headers)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("googletest" ,googletest)
("gemmlowp-src" ("gemmlowp-src"
;; The commit hash is taken from ;; The commit hash is taken from
;; "tensorflow/lite/tools/cmake/modules/gemmlowp.cmake". ;; "tensorflow/lite/tools/cmake/modules/gemmlowp.cmake".
@ -3050,17 +3130,6 @@ advanced research.")
(sha256 (sha256
(base32 (base32
"1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"))))) "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl")))))
("neon2sse-src"
,(let ((commit "a1652fd5253afbf3e39357b012974f93511f6108"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/intel/ARM_NEON_2_x86_SSE")
(commit commit)))
(file-name (git-file-name "neon2sse" (string-take commit 8)))
(sha256
(base32
"1q8gkxag9wlnwdwad2pclsrkwzrdjy94hyrkayrsvxyj7szb5y8i")))))
("farmhash-src" ("farmhash-src"
,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45")) ,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45"))
(origin (origin
@ -3076,24 +3145,12 @@ advanced research.")
,(origin ,(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://storage.googleapis.com/" (uri (string-append "https://storage.googleapis.com/"
"mirror.tensorflow.org/" "mirror.tensorflow.org/github.com/petewarden/"
"www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz")) "OouraFFT/archive/v1.0.tar.gz"))
(file-name "fft2d.tar.gz") (file-name "fft2d.tar.gz")
(sha256 (sha256
(base32 (base32
"1jfflzi74fag9z4qmgwvp90aif4dpbr1657izmxlgvf4hy8fk9xd")))) "1jfflzi74fag9z4qmgwvp90aif4dpbr1657izmxlgvf4hy8fk9xd"))))))
("ruy-src"
,(let ((commit "9c56af3fce210a8a103eda19bd6f47c08a9e3d90"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/ruy")
(commit commit)
(recursive? #true)))
(file-name (git-file-name "ruy" (string-take commit 8)))
(sha256
(base32
"1cfd5gk6kaj8kbl3h98gx1ap8czd59y6p8qq8nr28fklpyzf5cis")))))))
(home-page "https://tensorflow.org") (home-page "https://tensorflow.org")
(synopsis "Machine learning framework") (synopsis "Machine learning framework")
(description (description

68
gnu/packages/maths.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2023 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org> ;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2014-2022 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2014-2022 Eric Bavier <bavier@posteo.net>
@ -1322,18 +1322,16 @@ computations.")
(define-public hdf4 (define-public hdf4
(package (package
(name "hdf4") (name "hdf4")
(version "4.2.14") (version "4.2.16-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF" (uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF"
version "/src/hdf-" version ".tar.bz2")) version "/src/hdf-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l")) (base32 "0b395czhqr43mmbiifmg2mhb488wnd4zccj45vpql98ja15j7hy5"))
(patches (search-patches "hdf4-architectures.patch" (patches (search-patches "hdf4-reproducibility.patch"
"hdf4-reproducibility.patch" "hdf4-shared-fortran.patch"))))
"hdf4-shared-fortran.patch"
"hdf4-tirpc.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list gfortran bison flex)) (list gfortran bison flex))
@ -1346,9 +1344,7 @@ computations.")
#:configure-flags (list "--enable-shared" #:configure-flags (list "--enable-shared"
"FCFLAGS=-fallow-argument-mismatch" "FCFLAGS=-fallow-argument-mismatch"
"FFLAGS=-fallow-argument-mismatch" "FFLAGS=-fallow-argument-mismatch"
(string-append "CPPFLAGS=-I" "--enable-hdf4-xdr")
(assoc-ref %build-inputs "libtirpc")
"/include/tirpc"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; This is inspired by two of Debian's patches. ;; This is inspired by two of Debian's patches.
@ -1363,14 +1359,7 @@ computations.")
(substitute* (substitute*
'("mfhdf/hdfimport/testutil.sh.in" "hdf/util/testutil.sh.in") '("mfhdf/hdfimport/testutil.sh.in" "hdf/util/testutil.sh.in")
(("/bin/rm") "rm") (("/bin/rm") "rm")
(("/bin/mkdir") "mkdir")) (("/bin/mkdir") "mkdir"))))
(substitute* (find-files "." "^Makefile\\.in$")
(("@HDF_BUILD_XDR_TRUE@XDR_ADD = \
-R\\$\\(abs_top_builddir\\)/mfhdf/xdr/\\.libs") "")
(("@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = \
-R\\$\\(abs_top_builddir\\)/mfhdf/libsrc/\\.libs \
-R\\$\\(abs_top_builddir\\)/hdf/src/\\.libs \\$\\(XDR_ADD\\)") ""))
#t))
(add-after 'configure 'patch-settings (add-after 'configure 'patch-settings
(lambda _ (lambda _
;; libhdf4.settings contains the full path of the ;; libhdf4.settings contains the full path of the
@ -1390,8 +1379,7 @@ computations.")
;; files. Fix it manually to avoid having to propagate it. ;; files. Fix it manually to avoid having to propagate it.
(substitute* (find-files (string-append out "/lib") "\\.la$") (substitute* (find-files (string-append out "/lib") "\\.la$")
(("-ljpeg") (("-ljpeg")
(string-append "-L" libjpeg "/lib -ljpeg"))) (string-append "-L" libjpeg "/lib -ljpeg")))))))))
#t))))))
(home-page "https://www.hdfgroup.org/products/hdf4/") (home-page "https://www.hdfgroup.org/products/hdf4/")
(synopsis (synopsis
"Library and multi-object file format for storing and managing data") "Library and multi-object file format for storing and managing data")
@ -2792,7 +2780,7 @@ can solve two kinds of problems:
(define-public octave-cli (define-public octave-cli
(package (package
(name "octave-cli") (name "octave-cli")
(version "8.2.0") (version "8.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2800,7 +2788,7 @@ can solve two kinds of problems:
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1pkh4vmq4hcrmyl2gybd54i3qamyvmcjmpgy1i2kkw2g03jxdfdp")))) "1aav8i88y2yl11g5d44wpjngkpldvzk90ja7wghkb91cy2a9974i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list alsa-lib (list alsa-lib
@ -8544,3 +8532,39 @@ statistical analysis, image enhancement, fluid dynamics simulations, numerical
optimization, and modeling, simulation of explicit and implicit dynamical optimization, and modeling, simulation of explicit and implicit dynamical
systems and symbolic manipulations.") systems and symbolic manipulations.")
(license license:cecill))) ;CeCILL v2.1 (license license:cecill))) ;CeCILL v2.1
(define-public ruy
(let ((commit "caa244343de289f913c505100e6a463d46c174de")
(version "0")
(revision "1"))
(package
(name "ruy")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/ruy")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0j2g90nzam4h52zwx2vpanj8m17068cfb1zi4hcy0pyk52kb11dy"))))
(build-system cmake-build-system)
(arguments
(list
#:configure-flags
#~(list "-DRUY_FIND_CPUINFO=ON"
;; Needed to make sure code is relocatable for use in
;; tensorflow.
"-DCMAKE_CXX_FLAGS=-fPIC ")))
(inputs (list cpuinfo))
(native-inputs (list googletest))
(home-page "https://github.com/google/ruy")
(synopsis "Matrix multiplication library")
(description
"Ruy is a matrix multiplication library. Its focus is to cover the
matrix multiplication needs of neural network inference engines. Its initial
user has been TensorFlow Lite, where it is used by default on the ARM CPU
architecture.")
(license license:asl2.0))))

6
gnu/packages/mpi.scm
View file

@ -247,6 +247,12 @@ bind processes, and much more.")
"--enable-openib-rdmacm" "--enable-openib-rdmacm"
"--enable-openib-rdmacm-ibaddr" "--enable-openib-rdmacm-ibaddr"
;; Enable support for the 'Process Management
;; Interface for Exascale' (PMIx) used e.g. by
;; Slurm for the management communication and
;; coordination of MPI processes.
"--with-pmix=internal"
;; Enable support for SLURM's Process Manager ;; Enable support for SLURM's Process Manager
;; Interface (PMI). ;; Interface (PMI).
,(string-append "--with-pmi=" ,(string-append "--with-pmi="

4
gnu/packages/music.scm
View file

@ -6517,7 +6517,7 @@ curl/include/curl/curl.h")
(define-public dpf-plugins (define-public dpf-plugins
(package (package
(name "dpf-plugins") (name "dpf-plugins")
(version "1.4") (version "1.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6527,7 +6527,7 @@ curl/include/curl/curl.h")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0y7qvpfm34g6f7d786c6c9043dlbg5c4h71l2s24dsc9m8i7x2ww")))) (base32 "082f3f78x6k58j78mqr57qhw40f5s8fmcbkhl36nn3vbcsa07bzg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target

64
gnu/packages/networking.scm
View file

@ -1564,42 +1564,33 @@ intended as a substitute for the PPPStatus and EthStatus projects.")
(define-public iputils (define-public iputils
(package (package
(name "iputils") (name "iputils")
(version "20190709") (version "20221126")
(home-page "https://github.com/iputils/iputils") (home-page "https://github.com/iputils/iputils")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url home-page) (uri (git-reference (url home-page) (commit version)))
(commit (string-append "s" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "iputils-libcap-compat.patch"))
(sha256 (sha256
(base32 (base32
"04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693")))) "1qfdvr60mlwh5kr4p27wjknz1cvrwfi6iadh9ny45661v22i0njx"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_RARPD=true") (list
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-docbook-url (add-after 'unpack 'disable-ping-test
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) ;; Disable ping test, as it requires root or raw socket capabilities.
(uri (string-append docbook-xsl "/xml/xsl/docbook-xsl-" (substitute* "test/meson.build"
,(package-version docbook-xsl)))) (("if build_ping == true")
(for-each "if false")))))))
(lambda (file)
(substitute* file
(("http://docbook\\.sourceforge\\.net/release/xsl-ns/current")
uri)))
(cons "doc/meson.build"
(find-files "doc" "\\.xsl$")))
#t))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("pkg-config" ,pkg-config) pkg-config
("docbook-xsl" ,docbook-xsl) docbook-xsl
("docbook-xml" ,docbook-xml) docbook-xml
("libxml2" ,libxml2) ;for XML_CATALOG_FILES libxml2 ;for XML_CATALOG_FILES
("xsltproc" ,libxslt))) libxslt))
(inputs (inputs
(list libcap libidn2 openssl)) (list libcap libidn2 openssl))
(synopsis "Collection of network utilities") (synopsis "Collection of network utilities")
@ -1611,20 +1602,15 @@ configuration, troubleshooting, or servers. Utilities included are:
@item @command{arping}: Ping hosts using the @dfn{Address Resolution Protocol}. @item @command{arping}: Ping hosts using the @dfn{Address Resolution Protocol}.
@item @command{clockdiff}: Compute time difference between network hosts @item @command{clockdiff}: Compute time difference between network hosts
using ICMP TSTAMP messages. using ICMP TSTAMP messages.
@item @command{ninfod}: Daemon that responds to IPv6 Node Information Queries.
@item @command{ping}: Use ICMP ECHO messages to measure round-trip delays @item @command{ping}: Use ICMP ECHO messages to measure round-trip delays
and packet loss across network paths. and packet loss across network paths.
@item @command{rarpd}: Answer RARP requests from clients.
@item @command{rdisc}: Populate network routing tables with information from
the ICMP router discovery protocol.
@item @command{tftpd}: Trivial file transfer protocol server.
@item @command{tracepath}: Trace network path to an IPv4 or IPv6 address and @item @command{tracepath}: Trace network path to an IPv4 or IPv6 address and
discover MTU along the way. discover MTU along the way.
@end itemize") @end itemize")
;; The various utilities are covered by different licenses, see LICENSE ;; The various utilities are covered by different licenses, see LICENSE
;; for details. ;; for details.
(license (list license:gpl2+ ;arping, rarpd, tracepath (license (list license:gpl2+ ;arping, tracepath
license:bsd-3 ;clockdiff, ninfod, ping, tftpd license:bsd-3 ;clockdiff, ping
(license:non-copyleft (license:non-copyleft
"https://spdx.org/licenses/Rdisc.html" "https://spdx.org/licenses/Rdisc.html"
"Sun Microsystems license, see rdisc.c for details"))))) "Sun Microsystems license, see rdisc.c for details")))))
@ -2012,14 +1998,14 @@ TCP connection, TLS handshake and so on) in the terminal.")
(define-public squid (define-public squid
(package (package
(name "squid") (name "squid")
(version "4.17") (version "6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.squid-cache.org/Versions/v4/squid-" (uri (string-append "http://www.squid-cache.org/Versions/v6/squid-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "060lwghn6q982bay11ia38c86kd8w6mjgy68n58v31kwik08m4nb")))) (base32 "1yj869jnbdv1fb604j6g602dyvfnw7ahh9sh7mbqjpbsd9cgb83l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -2768,7 +2754,7 @@ procedure calls (RPCs).")
(define-public openvswitch (define-public openvswitch
(package (package
(name "openvswitch") (name "openvswitch")
(version "3.0.3") (version "3.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2776,7 +2762,7 @@ procedure calls (RPCs).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0qwlpnwjcyb7fpw6yp65mdqg20i1851z70xmvzxwxwpifq56a1pm")))) "1i0lb40lwbakmmqklmfcgr01l1ymsawgdi7k9a1zzp8ariw7x4ff"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

15
gnu/packages/openstack.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2019, 2021 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016, 2017, 2019, 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2018, 2022 Marius Bakke <marius@gnu.org>
@ -138,26 +138,23 @@ manner.")
(define-public python-hacking (define-public python-hacking
(package (package
(name "python-hacking") (name "python-hacking")
(version "4.1.0") (version "5.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "hacking" version)) (uri (pypi-uri "hacking" version))
(sha256 (sha256
(base32 (base32
"0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m")))) "09p0avmz914asszvdknc46n43bl070f369wmjmppl51zmw4b4ddb"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-flake8-3.8)) (list python-flake8))
(native-inputs (native-inputs
(list ;; Tests (list ;; Tests
python-coverage python-coverage
python-ddt python-ddt
python-dnspython
python-fixtures
python-eventlet python-eventlet
python-mock python-fixtures
python-monotonic
python-subunit python-subunit
python-stestr python-stestr
python-testscenarios python-testscenarios

59
gnu/packages/package-management.scm
View file

@ -961,6 +961,57 @@ transactions from C or Python.")
;; The whole is GPLv2+; librpm itself is dual-licensed LGPLv2+ | GPLv2+. ;; The whole is GPLv2+; librpm itself is dual-licensed LGPLv2+ | GPLv2+.
(license license:gpl2+))) (license license:gpl2+)))
(define-public bffe
(let ((commit "634d3444c094dd594bdf2b15b9a71055462ae676")
(revision "1"))
(package
(name "bffe")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.cbaines.net/guix/bffe")
(commit commit)))
(sha256
(base32
"0z13hyaq6bs2j3hnr7ys2vsyx2554zy69ka21savywx0ci3hhfk3"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config
autoconf
automake
;; Guile libraries are needed here for cross-compilation.
guile-next
guile-gnutls
guile-json-4
guix
guix-data-service
guix-build-coordinator
guile-fibers-1.3
guile-prometheus
guile-lib))
(propagated-inputs
(list guile-gnutls
guile-json-4
guix
guix-data-service
guix-build-coordinator
guile-fibers-1.3
guile-prometheus
guile-lib))
(home-page "https://git.cbaines.net/guix/bffe")
(synopsis "Build Farm Front-end for Guix")
(description
"The BFFE of Build Farm Front-end is an experimental frontend for Guix
build farms. It works together with the Guix Data Service and Guix Build
Coordinator to submit builds and monitor the activity.
It functions as a Guile library, with the @code{run-bffe-service} procedure in
the @code{(bffe)} module as the entry point.")
(license license:gpl3+))))
(define-public python-anaconda-client (define-public python-anaconda-client
(package (package
(name "python-anaconda-client") (name "python-anaconda-client")
@ -1771,7 +1822,7 @@ in an isolated environment, in separate namespaces.")
guile-gnutls guile-gnutls
;; Guile libraries are needed here for cross-compilation. ;; Guile libraries are needed here for cross-compilation.
(car (assoc-ref (package-native-inputs guix) "guile")) guile-next
guile-json-4 guile-json-4
guile-gcrypt guile-gcrypt
guix guix
@ -1783,7 +1834,7 @@ in an isolated environment, in separate namespaces.")
guile-sqlite3)) guile-sqlite3))
(inputs (inputs
(list bash-minimal (list bash-minimal
(car (assoc-ref (package-native-inputs guix) "guile")))) guile-next))
(propagated-inputs (propagated-inputs
(list guile-json-4 (list guile-json-4
guile-gcrypt guile-gcrypt
@ -1870,7 +1921,7 @@ for packaging and deployment of cross-compiled Windows applications.")
(define-public libostree (define-public libostree
(package (package
(name "libostree") (name "libostree")
(version "2022.7") (version "2023.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1878,7 +1929,7 @@ for packaging and deployment of cross-compiled Windows applications.")
"https://github.com/ostreedev/ostree/releases/download/v" "https://github.com/ostreedev/ostree/releases/download/v"
(version-major+minor version) "/libostree-" version ".tar.xz")) (version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256 (sha256
(base32 "07s14awf9ynlp84s08dkbwj9i18g93y0yf0k87nbks4l3hkakqlb")))) (base32 "056v7bz40dx8k2j2pfypc4shl6ijzvx1gy8r0kaw66py67xklndw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

4
gnu/packages/parallel.scm
View file

@ -64,14 +64,14 @@
(define-public parallel (define-public parallel
(package (package
(name "parallel") (name "parallel")
(version "20230622") (version "20230822")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/parallel/parallel-" (uri (string-append "mirror://gnu/parallel/parallel-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 "13i3himpq1gzhn3b0hl8vp34kz950ql9pssw251ad611f2nj8fny")) (base32 "0ppwdgp9j7r0a5l5zb0mla70jq24wmy1n33b5naw44y1lfclanab"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))

72
gnu/packages/patches/asli-use-system-libs.patch Normal file
View file

@ -0,0 +1,72 @@
Adjust CMakeLists.txt to use system-provided mmg and yaml-cpp libraries.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b11c5ba..702423e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,28 +122,8 @@ if(MMG_MESH)
add_definitions(-DMMG_MESH)
# MMG
- set(MMG_PREFIX mmg3d)
- set(MMG_PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX})
- set(MMG_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX})
- ExternalProject_Add(${MMG_PREFIX}
- PREFIX ${MMG_PREFIX_DIR}
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/mmg
-
- BUILD_ALWAYS OFF
- INSTALL_DIR ${MMG_INSTALL_DIR}
-
- CMAKE_ARGS(-DCMAKE_BUILD_TYPE=Release -DBUILD=MMG3D -DLIBMMG3D_STATIC=ON
- -DLIBMMG3D_SHARED=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
-
- BUILD_COMMAND make
- INSTALL_COMMAND make install
- )
- set(MMG3D_INCLUDE_DIRS "${MMG_INSTALL_DIR}/include")
- set(MMG3D_LIBRARIES "${MMG_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${MMG_PREFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-
- include_directories(${MMG3D_INCLUDE_DIRS})
- #add_library(MMG3D STATIC IMPORTED)
- #set_target_properties(MMG3D PROPERTIES IMPORTED_LOCATION "${MMG3D_LIBRARIES}")
+ include_directories(${MMG_INCLUDE_DIR})
+ set(MMG3D_LIBRARIES ${MMG_LIBRARY_DIR}/libmmg3d.so)
# MshMet
set(MSHMET_PREFIX mshmet)
@@ -192,14 +172,8 @@ target_include_directories(tet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/tetgen)
target_compile_definitions(tet PUBLIC TETLIBRARY) # -DTETLIBRARY: flag to compile tetgen as a library
# yaml
-file(GLOB yaml_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src/*.cpp) # Using file GLOB is not recomended!
-add_library(yaml STATIC)
-target_include_directories(yaml
- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/include
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src
-)
-target_sources(yaml PRIVATE ${yaml_SRC})
-set_target_properties(yaml PROPERTIES CXX_STANDARD 11)
+find_package(yaml-cpp REQUIRED)
+include_directories(${YAML_CPP_INCLUDE_DIRS})
# Compile options for debuging
if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -259,7 +233,7 @@ if(MARCH_NATIVE)
endif()
# Create entries for C++ files in "ASLI" routine
-target_link_libraries(ASLI PUBLIC alg tet yaml)
+target_link_libraries(ASLI PUBLIC alg tet ${YAML_CPP_LIBRARIES})
if(NOT MSVC)
target_link_libraries(ASLI PUBLIC stdc++fs)
endif()
@@ -272,7 +246,7 @@ if(CGAL_MESH)
endif()
if(MMG_MESH)
- add_dependencies(ASLI ${MMG_PREFIX} ${MSHMET_PREFIX})
+ add_dependencies(ASLI ${MSHMET_PREFIX})
target_link_libraries(ASLI PUBLIC ${MMG3D_LIBRARIES} ${MSHMET_LIBRARIES})
if(SCOTCH_FOUND)
target_link_libraries(ASLI PUBLIC ${SCOTCH_LIBRARIES} scotch)

40
gnu/packages/patches/ganeti-lens-compat.patch Normal file
View file

@ -0,0 +1,40 @@
Fix building against Lens 5 by commenting out type signatures(!).
Taken from upstream:
https://github.com/ganeti/ganeti/commit/5e30bad1bba63c9f6c782003ef2560f107a0ba24
diff --git a/src/Ganeti/Network.hs b/src/Ganeti/Network.hs
index 1cb6aa1ec..696c1cd1b 100644
--- a/src/Ganeti/Network.hs
+++ b/src/Ganeti/Network.hs
@@ -87,11 +87,11 @@ data PoolPart = PoolInstances | PoolExt
addressPoolIso :: Iso' AddressPool BA.BitArray
addressPoolIso = iso apReservations AddressPool
-poolLens :: PoolPart -> Lens' Network (Maybe AddressPool)
+--poolLens :: PoolPart -> Lens' Network (Maybe AddressPool)
poolLens PoolInstances = networkReservationsL
poolLens PoolExt = networkExtReservationsL
-poolArrayLens :: PoolPart -> Lens' Network (Maybe BA.BitArray)
+--poolArrayLens :: PoolPart -> Lens' Network (Maybe BA.BitArray)
poolArrayLens part = poolLens part . mapping addressPoolIso
netIpv4NumHosts :: Network -> Integer
diff --git a/src/Ganeti/Utils/MultiMap.hs b/src/Ganeti/Utils/MultiMap.hs
index d54da3ab0..279e9335a 100644
--- a/src/Ganeti/Utils/MultiMap.hs
+++ b/src/Ganeti/Utils/MultiMap.hs
@@ -91,7 +91,7 @@ multiMap :: (Ord k, Ord v) => M.Map k (S.Set v) -> MultiMap k v
multiMap = MultiMap . M.filter (not . S.null)
-- | A 'Lens' that allows to access a set under a given key in a multi-map.
-multiMapL :: (Ord k, Ord v) => k -> Lens' (MultiMap k v) (S.Set v)
+--multiMapL :: (Ord k, Ord v) => k -> Lens' (MultiMap k v) (S.Set v)
multiMapL k f = fmap MultiMap
. at k (fmap (mfilter (not . S.null) . Just)
. f . fromMaybe S.empty)
--
2.41.0

45
gnu/packages/patches/ganeti-procps-compat.patch Normal file
View file

@ -0,0 +1,45 @@
Fix compatibility with procps 4.
Negative UIDs are no longer allowed. Use a very high one instead.
Taken from upstream:
https://github.com/ganeti/ganeti/commit/9cd67e6a81c66ed326d68ea8c3241d14eea6550b
diff --git a/test/py/ganeti.uidpool_unittest.py b/test/py/ganeti.uidpool_unittest.py
index b2f5bc5cf2..2d9227cbf5 100755
--- a/test/py/ganeti.uidpool_unittest.py
+++ b/test/py/ganeti.uidpool_unittest.py
@@ -106,23 +106,24 @@ def testRequestUnusedUid(self):
# Check with a single, known unused user-id
#
- # We use "-1" here, which is not a valid user-id, so it's
- # guaranteed that it's unused.
- uid = uidpool.RequestUnusedUid(set([-1]))
- self.assertEqualValues(uid.GetUid(), -1)
+ # We use 2^30+42 here, which is a valid UID, but unlikely to be used on
+ # most systems (even as a subuid).
+ free_uid = 2**30 + 42
+ uid = uidpool.RequestUnusedUid(set([free_uid]))
+ self.assertEqualValues(uid.GetUid(), free_uid)
# Check uid-pool exhaustion
#
- # uid "-1" is locked now, so RequestUnusedUid is expected to fail
+ # free_uid is locked now, so RequestUnusedUid is expected to fail
self.assertRaises(errors.LockError,
uidpool.RequestUnusedUid,
- set([-1]))
+ set([free_uid]))
# Check unlocking
uid.Unlock()
# After unlocking, "-1" should be available again
- uid = uidpool.RequestUnusedUid(set([-1]))
- self.assertEqualValues(uid.GetUid(), -1)
+ uid = uidpool.RequestUnusedUid(set([free_uid]))
+ self.assertEqualValues(uid.GetUid(), free_uid)
if __name__ == "__main__":

28
gnu/packages/patches/ganeti-relax-dependencies.patch Normal file
View file

@ -0,0 +1,28 @@
Relax version constraints to work with Stackage LTS 19.
Taken from upstream:
https://github.com/ganeti/ganeti/commit/4f8d61ea0101721eae1c6f43be8430d819e5e611
diff --git a/cabal/ganeti.template.cabal b/cabal/ganeti.template.cabal
index bb4ff8053..98491dd9f 100644
--- a/cabal/ganeti.template.cabal
+++ b/cabal/ganeti.template.cabal
@@ -63,14 +63,14 @@ library
, unix >= 2.5.1.0
, utf8-string >= 0.3.7
- , attoparsec >= 0.10.1.1 && < 0.14
- , base64-bytestring >= 1.0.0.1 && < 1.2
+ , attoparsec >= 0.10.1.1 && < 0.15
+ , base64-bytestring >= 1.0.0.1 && < 1.3
, case-insensitive >= 0.4.0.1 && < 1.3
, curl >= 1.3.7 && < 1.4
, hinotify >= 0.3.2 && < 0.5
, hslogger >= 1.1.4 && < 1.4
, json >= 0.5 && < 1.0
- , lens >= 3.10 && < 5.0
+ , lens >= 3.10 && < 6.0
, lifted-base >= 0.2.0.3 && < 0.3
, monad-control >= 0.3.1.3 && < 1.1
, parallel >= 3.2.0.2 && < 3.3

90
gnu/packages/patches/ganeti-reorder-arbitrary-definitions.patch Normal file
View file

@ -0,0 +1,90 @@
Fix ordering of Arbitrary definitions for GHC 9 compatibility.
Taken from upstream:
https://github.com/ganeti/ganeti/commit/feab8faa8fe055c89205497e4f277ae4c7b8caad
diff --git a/test/hs/Test/Ganeti/Objects.hs b/test/hs/Test/Ganeti/Objects.hs
index 97ceb36dca..8d80be9e80 100644
--- a/test/hs/Test/Ganeti/Objects.hs
+++ b/test/hs/Test/Ganeti/Objects.hs
@@ -93,8 +93,14 @@ instance Arbitrary (Container DataCollectorConfig) where
instance Arbitrary BS.ByteString where
arbitrary = genPrintableByteString
+instance Arbitrary a => Arbitrary (Private a) where
+ arbitrary = Private <$> arbitrary
+
$(genArbitrary ''PartialNDParams)
+instance Arbitrary (Container J.JSValue) where
+ arbitrary = return $ GenericContainer Map.empty
+
instance Arbitrary Node where
arbitrary = Node <$> genFQDN <*> genFQDN <*> genFQDN
<*> arbitrary <*> arbitrary <*> arbitrary <*> genFQDN
@@ -297,10 +303,6 @@ genDisk = genDiskWithChildren 3
-- validation rules.
$(genArbitrary ''PartialISpecParams)
--- | FIXME: This generates completely random data, without normal
--- validation rules.
-$(genArbitrary ''PartialIPolicy)
-
$(genArbitrary ''FilledISpecParams)
$(genArbitrary ''MinMaxISpecs)
$(genArbitrary ''FilledIPolicy)
@@ -309,6 +311,10 @@ $(genArbitrary ''FilledNDParams)
$(genArbitrary ''FilledNicParams)
$(genArbitrary ''FilledBeParams)
+-- | FIXME: This generates completely random data, without normal
+-- validation rules.
+$(genArbitrary ''PartialIPolicy)
+
-- | No real arbitrary instance for 'ClusterHvParams' yet.
instance Arbitrary ClusterHvParams where
arbitrary = return $ GenericContainer Map.empty
@@ -331,18 +337,12 @@ instance Arbitrary OsParams where
instance Arbitrary Objects.ClusterOsParamsPrivate where
arbitrary = (GenericContainer . Map.fromList) <$> arbitrary
-instance Arbitrary a => Arbitrary (Private a) where
- arbitrary = Private <$> arbitrary
-
instance Arbitrary ClusterOsParams where
arbitrary = (GenericContainer . Map.fromList) <$> arbitrary
instance Arbitrary ClusterBeParams where
arbitrary = (GenericContainer . Map.fromList) <$> arbitrary
-instance Arbitrary IAllocatorParams where
- arbitrary = return $ GenericContainer Map.empty
-
$(genArbitrary ''Cluster)
instance Arbitrary ConfigData where
diff --git a/test/hs/Test/Ganeti/Query/Language.hs b/test/hs/Test/Ganeti/Query/Language.hs
index 04fb8c3898..fa50196f00 100644
--- a/test/hs/Test/Ganeti/Query/Language.hs
+++ b/test/hs/Test/Ganeti/Query/Language.hs
@@ -59,6 +59,9 @@ import Ganeti.Query.Language
instance Arbitrary (Filter FilterField) where
arbitrary = genFilter
+instance Arbitrary FilterRegex where
+ arbitrary = genName >>= mkRegex -- a name should be a good regex
+
-- | Custom 'Filter' generator (top-level), which enforces a
-- (sane) limit on the depth of the generated filters.
genFilter :: Gen (Filter FilterField)
@@ -97,9 +100,6 @@ $(genArbitrary ''QueryTypeLuxi)
$(genArbitrary ''ItemType)
-instance Arbitrary FilterRegex where
- arbitrary = genName >>= mkRegex -- a name should be a good regex
-
$(genArbitrary ''ResultStatus)
$(genArbitrary ''FieldType)

69
gnu/packages/patches/ganeti-template-haskell-2.17.patch Normal file
View file

@ -0,0 +1,69 @@
Handle GHC 9 changes in a backwards compatible manner.
Taken from upstream:
https://github.com/ganeti/ganeti/commit/b279fa738fd5b30320584f79f4d2f0e894315aab
diff --git a/src/Ganeti/THH.hs b/src/Ganeti/THH.hs
index 818c11f84..9ab93d5e3 100644
--- a/src/Ganeti/THH.hs
+++ b/src/Ganeti/THH.hs
@@ -884,7 +884,7 @@ genLoadOpCode opdefs fn = do
) $ zip mexps opdefs
defmatch = Match WildP (NormalB fails) []
cst = NoBindS $ CaseE (VarE opid) $ mpats++[defmatch]
- body = DoE [st, cst]
+ body = mkDoE [st, cst]
-- include "OP_ID" to the list of used keys
bodyAndOpId <- [| $(return body)
<* tell (mkUsedKeys . S.singleton . T.pack $ opidKey) |]
@@ -1541,7 +1541,7 @@ loadExcConstructor inname sname fields = do
[x] -> BindS (ListP [VarP x])
_ -> BindS (TupP (map VarP f_names))
cval = appCons name $ map VarE f_names
- return $ DoE [binds read_args, NoBindS (AppE (VarE 'return) cval)]
+ return $ mkDoE [binds read_args, NoBindS (AppE (VarE 'return) cval)]
{-| Generates the loadException function.
diff --git a/src/Ganeti/THH/Compat.hs b/src/Ganeti/THH/Compat.hs
index d29e30d18..1f51e49d7 100644
--- a/src/Ganeti/THH/Compat.hs
+++ b/src/Ganeti/THH/Compat.hs
@@ -40,9 +40,11 @@ module Ganeti.THH.Compat
, extractDataDConstructors
, myNotStrict
, nonUnaryTupE
+ , mkDoE
) where
import Language.Haskell.TH
+import Language.Haskell.TH.Syntax
-- | Convert Names to DerivClauses
--
@@ -61,7 +63,11 @@ derivesFromNames names = map ConT names
--
-- Handle TH 2.11 and 2.12 changes in a transparent manner using the pre-2.11
-- API.
+#if MIN_VERSION_template_haskell(2,17,0)
+gntDataD :: Cxt -> Name -> [TyVarBndr ()] -> [Con] -> [Name] -> Dec
+#else
gntDataD :: Cxt -> Name -> [TyVarBndr] -> [Con] -> [Name] -> Dec
+#endif
gntDataD x y z a b =
#if MIN_VERSION_template_haskell(2,12,0)
DataD x y z Nothing a $ derivesFromNames b
@@ -114,3 +120,12 @@ nonUnaryTupE es = TupE $ map Just es
#else
nonUnaryTupE es = TupE $ es
#endif
+
+-- | DoE is now qualified with an optional ModName
+mkDoE :: [Stmt] -> Exp
+mkDoE s =
+#if MIN_VERSION_template_haskell(2,17,0)
+ DoE Nothing s
+#else
+ DoE s
+#endif

179
gnu/packages/patches/ganeti-template-haskell-2.18.patch Normal file
View file

@ -0,0 +1,179 @@
Fix compatibility with Template Haskell 2.18 and GHC 9.2.
diff --git a/src/Ganeti/BasicTypes.hs b/src/Ganeti/BasicTypes.hs
index 10d0426cd..d68bc7d5b 100644
--- a/src/Ganeti/BasicTypes.hs
+++ b/src/Ganeti/BasicTypes.hs
@@ -206,12 +206,12 @@ instance MonadTrans (ResultT a) where
instance (MonadIO m, Error a) => MonadIO (ResultT a m) where
liftIO = ResultT . liftIO
. liftM (either (failError . show) return)
- . (try :: IO a -> IO (Either IOError a))
+ . (try :: IO α -> IO (Either IOError α))
instance (MonadBase IO m, Error a) => MonadBase IO (ResultT a m) where
liftBase = ResultT . liftBase
. liftM (either (failError . show) return)
- . (try :: IO a -> IO (Either IOError a))
+ . (try :: IO α -> IO (Either IOError α))
instance (Error a) => MonadTransControl (ResultT a) where
#if MIN_VERSION_monad_control(1,0,0)
diff --git a/src/Ganeti/Lens.hs b/src/Ganeti/Lens.hs
index faa5900ed..747366e6a 100644
--- a/src/Ganeti/Lens.hs
+++ b/src/Ganeti/Lens.hs
@@ -93,14 +93,14 @@ makeCustomLenses' name lst = makeCustomLensesFiltered f name
-- Most often the @g@ functor is @(,) r@ and 'traverseOf2' is used to
-- traverse an effectful computation that also returns an additional output
-- value.
-traverseOf2 :: Over (->) (Compose f g) s t a b
- -> (a -> f (g b)) -> s -> f (g t)
+-- traverseOf2 :: Over (->) (Compose f g) s t a b
+-- -> (a -> f (g b)) -> s -> f (g t)
traverseOf2 k f = getCompose . traverseOf k (Compose . f)
-- | Traverses over a composition of a monad and a functor.
-- See 'traverseOf2'.
-mapMOf2 :: Over (->) (Compose (WrappedMonad m) g) s t a b
- -> (a -> m (g b)) -> s -> m (g t)
+-- mapMOf2 :: Over (->) (Compose (WrappedMonad m) g) s t a b
+-- -> (a -> m (g b)) -> s -> m (g t)
mapMOf2 k f = unwrapMonad . traverseOf2 k (WrapMonad . f)
-- | A helper lens over sets.
diff --git a/src/Ganeti/THH.hs b/src/Ganeti/THH.hs
index 9ab93d5e3..9a10a9a07 100644
--- a/src/Ganeti/THH.hs
+++ b/src/Ganeti/THH.hs
@@ -996,8 +996,8 @@ buildAccessor fnm fpfx rnm rpfx nm pfx field = do
f_body = AppE (VarE fpfx_name) $ VarE x
return $ [ SigD pfx_name $ ArrowT `AppT` ConT nm `AppT` ftype
, FunD pfx_name
- [ Clause [ConP rnm [VarP x]] (NormalB r_body) []
- , Clause [ConP fnm [VarP x]] (NormalB f_body) []
+ [ Clause [myConP rnm [VarP x]] (NormalB r_body) []
+ , Clause [myConP fnm [VarP x]] (NormalB f_body) []
]]
-- | Build lense declartions for a field.
@@ -1037,10 +1037,10 @@ buildLens (fnm, fdnm) (rnm, rdnm) nm pfx ar (field, i) = do
(ConE cdn)
$ zip [0..] vars
let setterE = LamE [VarP context, VarP var] $ CaseE (VarE context)
- [ Match (ConP fnm [ConP fdnm . set (element i) WildP
+ [ Match (myConP fnm [myConP fdnm . set (element i) WildP
$ map VarP vars])
(body (not isSimple) fnm fdnm) []
- , Match (ConP rnm [ConP rdnm . set (element i) WildP
+ , Match (myConP rnm [myConP rdnm . set (element i) WildP
$ map VarP vars])
(body False rnm rdnm) []
]
@@ -1098,9 +1098,9 @@ buildObjectWithForthcoming sname field_pfx fields = do
$ JSON.showJSON $(varE x) |]
let rdjson = FunD 'JSON.readJSON [Clause [] (NormalB read_body) []]
shjson = FunD 'JSON.showJSON
- [ Clause [ConP (mkName real_nm) [VarP x]]
+ [ Clause [myConP (mkName real_nm) [VarP x]]
(NormalB show_real_body) []
- , Clause [ConP (mkName forth_nm) [VarP x]]
+ , Clause [myConP (mkName forth_nm) [VarP x]]
(NormalB show_forth_body) []
]
instJSONdecl = gntInstanceD [] (AppT (ConT ''JSON.JSON) (ConT name))
@@ -1121,9 +1121,9 @@ buildObjectWithForthcoming sname field_pfx fields = do
(fromDictWKeys $(varE xs)) |]
todictx_r <- [| toDict $(varE x) |]
todictx_f <- [| ("forthcoming", JSON.JSBool True) : toDict $(varE x) |]
- let todict = FunD 'toDict [ Clause [ConP (mkName real_nm) [VarP x]]
+ let todict = FunD 'toDict [ Clause [myConP (mkName real_nm) [VarP x]]
(NormalB todictx_r) []
- , Clause [ConP (mkName forth_nm) [VarP x]]
+ , Clause [myConP (mkName forth_nm) [VarP x]]
(NormalB todictx_f) []
]
fromdict = FunD 'fromDictWKeys [ Clause [VarP xs]
@@ -1136,9 +1136,9 @@ buildObjectWithForthcoming sname field_pfx fields = do
let forthPredDecls = [ SigD forthPredName
$ ArrowT `AppT` ConT name `AppT` ConT ''Bool
, FunD forthPredName
- [ Clause [ConP (mkName real_nm) [WildP]]
+ [ Clause [myConP (mkName real_nm) [WildP]]
(NormalB $ ConE 'False) []
- , Clause [ConP (mkName forth_nm) [WildP]]
+ , Clause [myConP (mkName forth_nm) [WildP]]
(NormalB $ ConE 'True) []
]
]
@@ -1412,9 +1412,9 @@ savePParamField fvar field = do
normalexpr <- saveObjectField actualVal field
-- we have to construct the block here manually, because we can't
-- splice-in-splice
- return $ CaseE (VarE fvar) [ Match (ConP 'Nothing [])
+ return $ CaseE (VarE fvar) [ Match (myConP 'Nothing [])
(NormalB (ConE '[])) []
- , Match (ConP 'Just [VarP actualVal])
+ , Match (myConP 'Just [VarP actualVal])
(NormalB normalexpr) []
]
@@ -1440,9 +1440,9 @@ fillParam sname field_pfx fields = do
-- due to apparent bugs in some older GHC versions, we need to add these
-- prefixes to avoid "binding shadows ..." errors
fbinds <- mapM (newName . ("f_" ++) . nameBase) fnames
- let fConP = ConP name_f (map VarP fbinds)
+ let fConP = myConP name_f (map VarP fbinds)
pbinds <- mapM (newName . ("p_" ++) . nameBase) pnames
- let pConP = ConP name_p (map VarP pbinds)
+ let pConP = myConP name_p (map VarP pbinds)
-- PartialParams instance --------
-- fillParams
let fromMaybeExp fn pn = AppE (AppE (VarE 'fromMaybe) (VarE fn)) (VarE pn)
@@ -1462,7 +1462,7 @@ fillParam sname field_pfx fields = do
memptyClause = Clause [] (NormalB memptyExp) []
-- mappend
pbinds2 <- mapM (newName . ("p2_" ++) . nameBase) pnames
- let pConP2 = ConP name_p (map VarP pbinds2)
+ let pConP2 = myConP name_p (map VarP pbinds2)
-- note the reversal of 'l' and 'r' in the call to <|>
-- as we want the result to be the rightmost value
let altExp = zipWith (\l r -> AppE (AppE (VarE '(<|>)) (VarE r)) (VarE l))
@@ -1575,9 +1575,9 @@ genLoadExc tname sname opdefs = do
opdefs
-- the first function clause; we can't use [| |] due to TH
-- limitations, so we have to build the AST by hand
- let clause1 = Clause [ConP 'JSON.JSArray
- [ListP [ConP 'JSON.JSString [VarP exc_name],
- VarP exc_args]]]
+ let clause1 = Clause [myConP 'JSON.JSArray
+ [ListP [myConP 'JSON.JSString [VarP exc_name],
+ VarP exc_args]]]
(NormalB (CaseE (AppE (VarE 'JSON.fromJSString)
(VarE exc_name))
(str_matches ++ [defmatch]))) []
diff --git a/src/Ganeti/THH/Compat.hs b/src/Ganeti/THH/Compat.hs
index 1f51e49d7..9b07c47ef 100644
--- a/src/Ganeti/THH/Compat.hs
+++ b/src/Ganeti/THH/Compat.hs
@@ -41,6 +41,7 @@ module Ganeti.THH.Compat
, myNotStrict
, nonUnaryTupE
, mkDoE
+ , myConP
) where
import Language.Haskell.TH
@@ -129,3 +130,11 @@ mkDoE s =
#else
DoE s
#endif
+
+-- | ConP is now qualified with an optional [Type].
+myConP :: Name -> [Pat] -> Pat
+myConP n patterns = ConP n
+#if MIN_VERSION_template_haskell(2,18,0)
+ []
+#endif
+ patterns

34
gnu/packages/patches/glibc-hurd-getauxval.patch Normal file
View file

@ -0,0 +1,34 @@
Taken from https://salsa.debian.org/glibc-team/glibc/-/blob/5af8e3701c63ad202b652b5051bec592b8385820/debian/patches/hurd-i386/unsubmitted-getaux_at_secure.diff
This fixes gdk-pixbuf, gobject-introspection.
FIXME: sysdeps/mach/hurd/i386/init-first.c should instead pass an auxv
to __libc_start_main
Index: glibc-2.33/misc/getauxval.c
===================================================================
--- glibc-2.33.orig/misc/getauxval.c
+++ glibc-2.33/misc/getauxval.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <ldsodefs.h>
#include <stdbool.h>
+#include <unistd.h>
bool
__getauxval2 (unsigned long int type, unsigned long int *result)
@@ -27,6 +28,14 @@ __getauxval2 (unsigned long int type, un
ElfW(auxv_t) *p;
#endif
+#ifdef AT_SECURE
+ if (type == AT_SECURE)
+ {
+ *result = __libc_enable_secure;
+ return true;
+ }
+#endif
+
if (type == AT_HWCAP)
{
*result = GLRO(dl_hwcap);

632
gnu/packages/patches/hdf4-architectures.patch
View file

@ -1,632 +0,0 @@
Copied from Debian.
Description: Support additional architectures.
Author: Francesco Paolo Lovergine <frankie@debian.org>
--- a/hdf/src/hdfi.h
+++ b/hdf/src/hdfi.h
@@ -48,6 +48,7 @@
/* 8 - Cray IEEE */
/* (i.e. Big-Endian, all 64-bit architecture w/IEEE Floats) */
/*--------------------------------------------------------------------------*/
+#define DFMT_S390 0x1111
#define DFMT_SUN 0x1111
#define DFMT_SUN_INTEL 0x4441
#define DFMT_ALLIANT 0x1111
@@ -62,6 +63,7 @@
#define DFMT_CTSS 0x3331
#define DFMT_VAX 0x2221
#define DFMT_MIPSEL 0x4441
+#define DFMT_MIPSEB 0x1111
#define DFMT_PC 0x4441
#define DFMT_APPLE 0x1111
#define DFMT_APPLE_INTEL 0x4441
@@ -75,6 +77,13 @@
#define DFMT_IA64 0x4441
#define DFMT_LINUX64 0x4441
#define DFMT_POWERPC64 0x1111
+#define DFMT_POWERPC64LE 0x4441
+#define DFMT_ARMV4L 0x4441
+#define DFMT_AARCH64 0x4441
+#define DFMT_X86_64 0x4441
+#define DFMT_SH 0x4441
+#define DFMT_SHEB 0x1111
+#define DFMT_RISCV64 0x4441
/* I/O library constants */
#define UNIXUNBUFIO 1
@@ -288,7 +297,7 @@ typedef int hdf_pint_t;
#endif /* IBM6000 */
-#if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux)))
+#if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux) || defined(__hppa__)))
#ifndef HP9000
#define HP9000
@@ -347,6 +356,10 @@ typedef int hdf_pint_t;
/* what each does */
#define JMEMSYS MEM_ANSI
+#ifdef __linux__
+#define FNAME_POST_UNDERSCORE
+#endif
+
#endif /* HP9000 */
@@ -670,6 +683,462 @@ typedef int hdf_pint_t;
#endif /* !(defined(__APPLE__)) */
/*-----------------------------------------------------*/
+#if defined (__linux__) && defined (__mc68000__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_MOTOROLA
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef long int int32;
+typedef unsigned long int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf; /* size of INTEGERs in Fortran compiler */
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/m68k */
+
+#if defined (__linux__) && defined (__sparc__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_SUN
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+#ifdef _LP64 /* 64-bit environment */
+typedef int int32;
+typedef unsigned int uint32;
+#else /* 32-bit environment */
+typedef long int int32;
+typedef unsigned long int uint32;
+#endif
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf; /* size of INTEGERs in Fortran compiler */
+#ifdef _LP64 /* 64-bit environment */
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#else /* 32-bit environment */
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
+#endif
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/Sparc */
+
+#if defined (__linux__) && defined (__powerpc__) && !defined(__powerpc64__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_MOTOROLA
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef long int int32;
+typedef unsigned long int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf; /* size of INTEGERs in Fortran compiler */
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/powerpc */
+
+#if defined (__linux__) && defined (__s390__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_S390
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+#ifdef _LP64 /* 64-bit environment */
+typedef int int32;
+typedef unsigned int uint32;
+#else /* 32-bit environment */
+typedef long int int32;
+typedef unsigned long int uint32;
+#endif
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf; /* size of INTEGERs in Fortran compiler */
+#ifdef _LP64 /* 64-bit environment */
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#else /* 32-bit environment */
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
+#endif
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/s390 */
+
+#if defined (__linux__) && (defined (__MIPSEB__) || defined(__MIPSEL__))
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#if defined (__MIPSEB__)
+#define DF_MT DFMT_MIPSEB
+#elif defined(__MIPSEL__)
+#define DF_MT DFMT_MIPSEL
+#endif
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef int int32;
+typedef unsigned int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf; /* size of INTEGERs in Fortran compiler */
+typedef long int hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/mips */
+
+#if defined (__linux__) && defined (__arm__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_ARMV4L
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef int int32;
+typedef unsigned int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf; /* size of INTEGERs in Fortran compiler */
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/arm */
+
+#if defined (__linux__) && defined (__aarch64__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_AARCH64
+
+typedef void VOID;
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef int int32;
+typedef unsigned int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef int intf; /* size of INTEGERs in Fortran compiler */
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+#define FILELIB UNIXBUFIO
+
+#ifndef BIG_LONGS
+#define BIG_LONGS
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/aarch64 */
+
+#if defined (__linux__) && defined (__riscv) && (__riscv_xlen == 64)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#define DF_MT DFMT_RISCV64
+
+typedef void VOID;
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef int int32;
+typedef unsigned int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef int intf; /* size of INTEGERs in Fortran compiler */
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+#define FILELIB UNIXBUFIO
+
+#ifndef BIG_LONGS
+#define BIG_LONGS
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/riscv64 */
+
#if defined(NEXT) || defined(NeXT)
#ifndef NEXT
@@ -932,7 +1401,11 @@ Please check your Makefile.
#include <sys/file.h> /* for unbuffered i/o stuff */
#include <sys/stat.h>
-#define DF_MT DFMT_POWERPC64
+#ifdef __LITTLE_ENDIAN__
+#define DF_MT DFMT_POWERPC64LE
+#else
+#define DF_MT DFMT_POWERPC64
+#endif
typedef void VOID;
typedef void *VOIDP;
typedef char *_fcd;
@@ -956,6 +1429,11 @@ typedef long hdf_pint_t;
#define _fcdtocp(desc) (desc)
#define FILELIB UNIXBUFIO
+#ifndef BIG_LONGS
+#define BIG_LONGS
+#endif
+
+
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
/* Determine the memory manager we are going to use. Valid values are: */
@@ -1101,6 +1579,8 @@ typedef long hdf_pint_t;
#define _fcdtocp(desc) (desc)
#define FILELIB UNIXBUFIO
+#define BIG_LONGS
+
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
/* Determine the memory manager we are going to use. Valid values are: */
@@ -1115,6 +1595,66 @@ typedef long hdf_pint_t;
#endif /* IA64 */
+/* Renesas SuperH SH3(little/big)/SH4(little/big) */
+#if defined (__linux__) && defined(__sh__)
+
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE 1
+
+#include <fcntl.h>
+#include <sys/types.h> /* for unbuffered file I/O */
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h> /* for character macros */
+
+#if defined (__LITTLE_ENDIAN__)
+#define DF_MT DFMT_SH
+#elif defined(__BIG_ENDIAN__)
+#define DF_MT DFMT_SHEB
+#endif
+
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
+typedef void VOID;
+#endif /* end VOID */
+
+typedef void * VOIDP;
+typedef char * _fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef signed char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef long int int32;
+typedef unsigned long int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef float float32;
+typedef double float64;
+typedef long intf;
+typedef int hdf_pint_t;
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+
+#endif /* Linux/sh */
+
#ifndef GOT_MACHINE
No machine type has been defined. Your Makefile needs to have someing like
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
--- a/hdf/src/hconv.h
+++ b/hdf/src/hconv.h
@@ -59,7 +59,7 @@
/* CONSTANT DEFINITIONS */
/*****************************************************************************/
/* Generally Big-Endian machines */
-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__)
+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !(defined(__powerpc__) && defined(__LITTLE_ENDIAN__)) && !defined(__aarch64__) && !defined(__ARM_EABI__) && !defined(__riscv)
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
# define UI8_OUT DFKnb1b
# define SI16_IN DFKnb2b /* S = Signed */

33
gnu/packages/patches/hdf4-tirpc.patch
View file

@ -1,33 +0,0 @@
Build with libtirpc on all architectures because glibc no longer provides
SunRPC support.
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -23635,10 +23635,13 @@
*-pc-cygwin*)
LIBS="$LIBS -ltirpc"
CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
+ *-linux-gnu)
+ LIBS="$LIBS -ltirpc"
+ CPPFLAGS="$CPPFLAGS" ;;
*) ;;
esac
-if test "X$BUILD_XDR" != "Xyes"; then
+if test "X$BUILD_XDR" = "Xyes"; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -23693,9 +23696,9 @@
## but we need to make sure that it is present on the system. Do that here,
## The SunRPC of the glibc has been replaced by a TI-RPC (Transport Independent RPC) library for IPv6 support
case "$host" in
- *-pc-cygwin*)
+ *)
HAVE_RPC="yes"
- ac_fn_c_check_header_mongrel "$LINENO" "rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default"
if test "x$ac_cv_header_rpc_h" = xyes; then :
:
else

37
gnu/packages/patches/iputils-libcap-compat.patch
View file

@ -1,37 +0,0 @@
Fix name clash with libcap 2.29.
Taken from upstream:
https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83
diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c
--- a/ninfod/ninfod.c
+++ b/ninfod/ninfod.c
@@ -455,7 +455,7 @@ static void do_daemonize(void)
/* --------- */
#ifdef HAVE_LIBCAP
static const cap_value_t cap_net_raw = CAP_NET_RAW;
-static const cap_value_t cap_setuid = CAP_SETUID;
+static const cap_value_t cap_setuserid = CAP_SETUID;
static cap_flag_value_t cap_ok;
#else
static uid_t euid;
@@ -487,7 +487,7 @@ static void limit_capabilities(void)
cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok);
if (cap_ok != CAP_CLEAR)
- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
if (cap_set_proc(cap_p) < 0) {
DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
@@ -520,8 +520,8 @@ static void drop_capabilities(void)
/* setuid / setuid */
if (cap_ok != CAP_CLEAR) {
- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET);
+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
+ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET);
if (cap_set_proc(cap_p) < 0) {
DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));

89
gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch Normal file
View file

@ -0,0 +1,89 @@
origin patch from nixos.
see https://github.com/NixOS/nixpkgs/blob/2457551a54ffbd93b7d8f84af8b8fb3aac5cbdd5/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
---
src/guix_utils.h | 41 +++++++++++++++++++++++++++++++++++++++++
src/service_utils.h | 4 +++-
src/waylandwindow.cpp | 5 ++++-
3 files changed, 48 insertions(+), 2 deletions(-)
create mode 100644 src/guix_utils.h
diff a/src/guix_utils.h b/src/guix_utils.h
new file mode 100644
index 0000000..726065d
--- /dev/null
+++ b/src/guix_utils.h
@@ -0,0 +1,24 @@
+#ifndef GUIX_UTILS_H
+#define GUIX_UTILS_H
+
+// kwin
+#include <kwinglobals.h>
+
+namespace KWin
+{
+
+static QString unwrapExecutablePath(const QString &in_executablePath)
+{
+ QString executablePath(in_executablePath);
+
+ while (executablePath.endsWith("-real") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
+ executablePath.remove(executablePath.length() - 5, 5);
+ executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
+ }
+
+ return executablePath;
+}
+
+}// namespace
+
+#endif // GUIX_UTILS_H
diff a/src/utils/serviceutils.h b/src/utils/serviceutils.h
index 8a70c1f..475b15d 100644
--- a/src/utils/serviceutils.h
+++ b/src/utils/serviceutils.h
@@ -19,6 +19,7 @@
#include <QLoggingCategory>
//KF
#include <KApplicationTrader>
+#include "guix_utils.h"
namespace KWin
{
@@ -26,8 +27,9 @@ namespace KWin
const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
{
+ const QString executablePath = unwrapExecutablePath(in_executablePath);
// needed to be able to use the logging category in a header static function
static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
diff a/src/waylandwindow.cpp b/src/waylandwindow.cpp
index fd2c0c1..ae8cf96 100644
--- a/src/waylandwindow.cpp
+++ b/src/waylandwindow.cpp
@@ -10,6 +10,7 @@
#include "screens.h"
#include "wayland_server.h"
#include "workspace.h"
+#include "guix_utils.h"
#include <KWaylandServer/display.h>
#include <KWaylandServer/clientbuffer.h>
@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
void WaylandWindow::updateResourceName()
{
- const QFileInfo fileInfo(surface()->client()->executablePath());
+ const QString in_path = surface()->client()->executablePath();
+ const QString path = unwrapExecutablePath(in_path);
+ const QFileInfo fileInfo(path);
if (fileInfo.exists()) {
const QByteArray executableFileName = fileInfo.fileName().toUtf8();
setResourceClass(executableFileName, executableFileName);
--
2.32.0

39
gnu/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch Normal file
View file

@ -0,0 +1,39 @@
commit cdb28383402d248dbc6062f4391b038375c52385
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri Jul 17 21:25:03 2020 +0200
CMakeLists.txt: fix paths when FTDIPP is set
Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
is enabled as suggested by Aurelien Jarno in
http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
Without this change, the libftdi1.pc config file defines the include
path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
installed in /usr/local/include/libftdi1
This is an issue for example for libsigrok which will fail on:
In file included from src/hardware/asix-sigma/protocol.c:27:
src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
28 | #include <ftdi.h>
| ^~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5aecafc..3b0b87c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ endif ()
add_subdirectory(src)
if ( FTDIPP )
- project(libftdipp1 C CXX)
+ project(libftdi1 C CXX)
add_subdirectory(ftdipp)
endif ()
if ( PYTHON_BINDINGS )

248
gnu/packages/patches/nanosvg-prusa-slicer.patch Normal file
View file

@ -0,0 +1,248 @@
From abcd277ea45e9098bed752cf9c6875b533c0892f Mon Sep 17 00:00:00 2001
From: AlbrechtS <AlbrechtS.svn@fltk.example.org>
Date: Sun, 4 Feb 2018 23:47:38 +0100
Subject: [PATCH] Modify rasterizer to support non-square X,Y axes scaling.
Add new function nsvgRasterizeXY() similar to nsvgRasterize() but with
separate scaling factors for x-axis and y-axis.
---
src/nanosvgrast.h | 78 +++++++++++++++++++++++++++++++----------------
1 file changed, 51 insertions(+), 27 deletions(-)
diff --git a/src/nanosvgrast.h b/src/nanosvgrast.h
index 17ba3b0..a83db27 100644
--- a/src/nanosvgrast.h
+++ b/src/nanosvgrast.h
@@ -22,6 +22,12 @@
*
*/
+/* Modified by FLTK to support non-square X,Y axes scaling.
+ *
+ * Added: nsvgRasterizeXY()
+*/
+
+
#ifndef NANOSVGRAST_H
#define NANOSVGRAST_H
@@ -46,6 +52,9 @@ typedef struct NSVGrasterizer NSVGrasterizer;
unsigned char* img = malloc(w*h*4);
// Rasterize
nsvgRasterize(rast, image, 0,0,1, img, w, h, w*4);
+
+ // For non-square X,Y scaling, use
+ nsvgRasterizeXY(rast, image, 0,0,1,1, img, w, h, w*4);
*/
// Allocated rasterizer context.
@@ -55,7 +64,7 @@ NSVGrasterizer* nsvgCreateRasterizer(void);
// r - pointer to rasterizer context
// image - pointer to image to rasterize
// tx,ty - image offset (applied after scaling)
-// scale - image scale
+// scale - image scale (assumes square aspect ratio)
// dst - pointer to destination image data, 4 bytes per pixel (RGBA)
// w - width of the image to render
// h - height of the image to render
@@ -64,6 +73,12 @@ void nsvgRasterize(NSVGrasterizer* r,
NSVGimage* image, float tx, float ty, float scale,
unsigned char* dst, int w, int h, int stride);
+// As above, but allow X and Y axes to scale independently for non-square aspects
+void nsvgRasterizeXY(NSVGrasterizer* r,
+ NSVGimage* image, float tx, float ty,
+ float sx, float sy,
+ unsigned char* dst, int w, int h, int stride);
+
// Deletes rasterizer context.
void nsvgDeleteRasterizer(NSVGrasterizer*);
@@ -370,7 +385,7 @@ static void nsvg__flattenCubicBez(NSVGrasterizer* r,
nsvg__flattenCubicBez(r, x1234,y1234, x234,y234, x34,y34, x4,y4, level+1, type);
}
-static void nsvg__flattenShape(NSVGrasterizer* r, NSVGshape* shape, float scale)
+static void nsvg__flattenShape(NSVGrasterizer* r, NSVGshape* shape, float sx, float sy)
{
int i, j;
NSVGpath* path;
@@ -378,13 +393,13 @@ static void nsvg__flattenShape(NSVGrasterizer* r, NSVGshape* shape, float scale)
for (path = shape->paths; path != NULL; path = path->next) {
r->npoints = 0;
// Flatten path
- nsvg__addPathPoint(r, path->pts[0]*scale, path->pts[1]*scale, 0);
+ nsvg__addPathPoint(r, path->pts[0]*sx, path->pts[1]*sy, 0);
for (i = 0; i < path->npts-1; i += 3) {
float* p = &path->pts[i*2];
- nsvg__flattenCubicBez(r, p[0]*scale,p[1]*scale, p[2]*scale,p[3]*scale, p[4]*scale,p[5]*scale, p[6]*scale,p[7]*scale, 0, 0);
+ nsvg__flattenCubicBez(r, p[0]*sx,p[1]*sy, p[2]*sx,p[3]*sy, p[4]*sx,p[5]*sy, p[6]*sx,p[7]*sy, 0, 0);
}
// Close path
- nsvg__addPathPoint(r, path->pts[0]*scale, path->pts[1]*scale, 0);
+ nsvg__addPathPoint(r, path->pts[0]*sx, path->pts[1]*sy, 0);
// Build edges
for (i = 0, j = r->npoints-1; i < r->npoints; j = i++)
nsvg__addEdge(r, r->points[j].x, r->points[j].y, r->points[i].x, r->points[i].y);
@@ -734,7 +749,7 @@ static void nsvg__prepareStroke(NSVGrasterizer* r, float miterLimit, int lineJoi
}
}
-static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float scale)
+static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float sx, float sy)
{
int i, j, closed;
NSVGpath* path;
@@ -742,15 +757,16 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
float miterLimit = shape->miterLimit;
int lineJoin = shape->strokeLineJoin;
int lineCap = shape->strokeLineCap;
- float lineWidth = shape->strokeWidth * scale;
+ const float sw = (sx + sy) / 2; // average scaling factor
+ const float lineWidth = shape->strokeWidth * sw; // FIXME (?)
for (path = shape->paths; path != NULL; path = path->next) {
// Flatten path
r->npoints = 0;
- nsvg__addPathPoint(r, path->pts[0]*scale, path->pts[1]*scale, NSVG_PT_CORNER);
+ nsvg__addPathPoint(r, path->pts[0]*sx, path->pts[1]*sy, NSVG_PT_CORNER);
for (i = 0; i < path->npts-1; i += 3) {
float* p = &path->pts[i*2];
- nsvg__flattenCubicBez(r, p[0]*scale,p[1]*scale, p[2]*scale,p[3]*scale, p[4]*scale,p[5]*scale, p[6]*scale,p[7]*scale, 0, NSVG_PT_CORNER);
+ nsvg__flattenCubicBez(r, p[0]*sx,p[1]*sy, p[2]*sx,p[3]*sy, p[4]*sx,p[5]*sy, p[6]*sx,p[7]*sy, 0, NSVG_PT_CORNER);
}
if (r->npoints < 2)
continue;
@@ -796,7 +812,7 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
dashOffset -= shape->strokeDashArray[idash];
idash = (idash + 1) % shape->strokeDashCount;
}
- dashLen = (shape->strokeDashArray[idash] - dashOffset) * scale;
+ dashLen = (shape->strokeDashArray[idash] - dashOffset) * sw;
for (j = 1; j < r->npoints2; ) {
float dx = r->points2[j].x - cur.x;
@@ -818,7 +834,7 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
// Advance dash pattern
dashState = !dashState;
idash = (idash+1) % shape->strokeDashCount;
- dashLen = shape->strokeDashArray[idash] * scale;
+ dashLen = shape->strokeDashArray[idash] * sw;
// Restart
cur.x = x;
cur.y = y;
@@ -987,7 +1003,7 @@ static inline int nsvg__div255(int x)
}
static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* cover, int x, int y,
- float tx, float ty, float scale, NSVGcachedPaint* cache)
+ float tx, float ty, float sx, float sy, NSVGcachedPaint* cache)
{
if (cache->type == NSVG_PAINT_COLOR) {
@@ -1028,9 +1044,9 @@ static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* co
int i, cr, cg, cb, ca;
unsigned int c;
- fx = ((float)x - tx) / scale;
- fy = ((float)y - ty) / scale;
- dx = 1.0f / scale;
+ fx = ((float)x - tx) / sx;
+ fy = ((float)y - ty) / sy;
+ dx = 1.0f / sx;
for (i = 0; i < count; i++) {
int r,g,b,a,ia;
@@ -1073,9 +1089,9 @@ static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* co
int i, cr, cg, cb, ca;
unsigned int c;
- fx = ((float)x - tx) / scale;
- fy = ((float)y - ty) / scale;
- dx = 1.0f / scale;
+ fx = ((float)x - tx) / sx;
+ fy = ((float)y - ty) / sy;
+ dx = 1.0f / sx;
for (i = 0; i < count; i++) {
int r,g,b,a,ia;
@@ -1114,7 +1130,7 @@ static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* co
}
}
-static void nsvg__rasterizeSortedEdges(NSVGrasterizer *r, float tx, float ty, float scale, NSVGcachedPaint* cache, char fillRule)
+static void nsvg__rasterizeSortedEdges(NSVGrasterizer *r, float tx, float ty, float sx, float sy, NSVGcachedPaint* cache, char fillRule)
{
NSVGactiveEdge *active = NULL;
int y, s;
@@ -1196,7 +1212,7 @@ static void nsvg__rasterizeSortedEdges(NSVGrasterizer *r, float tx, float ty, fl
if (xmin < 0) xmin = 0;
if (xmax > r->width-1) xmax = r->width-1;
if (xmin <= xmax) {
- nsvg__scanlineSolid(&r->bitmap[y * r->stride] + xmin*4, xmax-xmin+1, &r->scanline[xmin], xmin, y, tx,ty, scale, cache);
+ nsvg__scanlineSolid(&r->bitmap[y * r->stride] + xmin*4, xmax-xmin+1, &r->scanline[xmin], xmin, y, tx,ty, sx, sy, cache);
}
}
@@ -1364,8 +1380,9 @@ static void dumpEdges(NSVGrasterizer* r, const char* name)
}
*/
-void nsvgRasterize(NSVGrasterizer* r,
- NSVGimage* image, float tx, float ty, float scale,
+void nsvgRasterizeXY(NSVGrasterizer* r,
+ NSVGimage* image, float tx, float ty,
+ float sx, float sy,
unsigned char* dst, int w, int h, int stride)
{
NSVGshape *shape = NULL;
@@ -1396,7 +1413,7 @@ void nsvgRasterize(NSVGrasterizer* r,
r->freelist = NULL;
r->nedges = 0;
- nsvg__flattenShape(r, shape, scale);
+ nsvg__flattenShape(r, shape, sx, sy);
// Scale and translate edges
for (i = 0; i < r->nedges; i++) {
@@ -1414,14 +1431,14 @@ void nsvgRasterize(NSVGrasterizer* r,
// now, traverse the scanlines and find the intersections on each scanline, use non-zero rule
nsvg__initPaint(&cache, &shape->fill, shape->opacity);
- nsvg__rasterizeSortedEdges(r, tx,ty,scale, &cache, shape->fillRule);
+ nsvg__rasterizeSortedEdges(r, tx,ty, sx, sy, &cache, shape->fillRule);
}
- if (shape->stroke.type != NSVG_PAINT_NONE && (shape->strokeWidth * scale) > 0.01f) {
+ if (shape->stroke.type != NSVG_PAINT_NONE && (shape->strokeWidth * sx) > 0.01f) {
nsvg__resetPool(r);
r->freelist = NULL;
r->nedges = 0;
- nsvg__flattenShapeStroke(r, shape, scale);
+ nsvg__flattenShapeStroke(r, shape, sx, sy);
// dumpEdges(r, "edge.svg");
@@ -1441,7 +1458,7 @@ void nsvgRasterize(NSVGrasterizer* r,
// now, traverse the scanlines and find the intersections on each scanline, use non-zero rule
nsvg__initPaint(&cache, &shape->stroke, shape->opacity);
- nsvg__rasterizeSortedEdges(r, tx,ty,scale, &cache, NSVG_FILLRULE_NONZERO);
+ nsvg__rasterizeSortedEdges(r, tx,ty,sx, sy, &cache, NSVG_FILLRULE_NONZERO);
}
}
@@ -1453,6 +1470,13 @@ void nsvgRasterize(NSVGrasterizer* r,
r->stride = 0;
}
+void nsvgRasterize(NSVGrasterizer* r,
+ NSVGimage* image, float tx, float ty, float scale,
+ unsigned char* dst, int w, int h, int stride)
+{
+ nsvgRasterizeXY(r,image, tx, ty, scale, scale, dst, w, h, stride);
+}
+
#endif // NANOSVGRAST_IMPLEMENTATION
#endif // NANOSVGRAST_H

42
gnu/packages/patches/python-pyflakes-test-location.patch
View file

@ -1,42 +0,0 @@
This patch fixes test failure related to reported source code locations.
It is a backport of this patch:
commit 6a5f38b5ab12260fde8a0463acd433bc2d34dbcf
Author: Louis Sautier <sautier.louis@gmail.com>
Date: Sat Oct 3 02:37:53 2020 +0200
Fix tests with Python 3.9, closes #549 (#586)
Stop allowing failures on Python nightly.
diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
index 128aa69..b728e65 100644
--- a/pyflakes/test/test_api.py
+++ b/pyflakes/test/test_api.py
@@ -515,6 +515,8 @@ def foo(bar=baz, bax):
if ERROR_HAS_LAST_LINE:
if PYPY and sys.version_info >= (3,):
column = 7
+ elif sys.version_info >= (3, 9):
+ column = 21
elif sys.version_info >= (3, 8):
column = 9
else:
@@ -543,6 +545,8 @@ foo(bar=baz, bax)
if ERROR_HAS_LAST_LINE:
if PYPY and sys.version_info >= (3,):
column = 12
+ elif sys.version_info >= (3, 9):
+ column = 17
elif sys.version_info >= (3, 8):
column = 14
else:
@@ -577,6 +581,8 @@ foo(bar=baz, bax)
position_end = 1
if PYPY:
column = 6
+ elif ver >= (3, 9):
+ column = 13
else:
column = 7
# Column has been "fixed" since 3.2.4 and 3.3.1

130
gnu/packages/patches/racket-backport-8.10-rktboot.patch Normal file
View file

@ -0,0 +1,130 @@
From 5446e36e0685ec5c7b4f812dec5bf7959db4f906 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 15:56:21 +0300
Subject: [PATCH 1/2] rktboot: Add support for riscv64.
(cherry picked from commit f80c5d001d5235556ae9cde617b1e3a1322d0505)
---
racket/src/rktboot/machine-def.rkt | 1 +
1 file changed, 1 insertion(+)
diff --git a/racket/src/rktboot/machine-def.rkt b/racket/src/rktboot/machine-def.rkt
index 8ff0688652..59ebfc88d8 100644
--- a/racket/src/rktboot/machine-def.rkt
+++ b/racket/src/rktboot/machine-def.rkt
@@ -25,6 +25,7 @@
[(regexp-match? #rx"^t?arm32" target-machine) "arm32"]
[(regexp-match? #rx"^t?arm64" target-machine) "arm64"]
[(regexp-match? #rx"^t?ppc32" target-machine) "ppc32"]
+ [(regexp-match? #rx"^t?rv64" target-machine) "rv64"]
[(regexp-match? #rx"^t?pb" target-machine) "pb"]
[else (error "machine.def: cannot infer architecture")]))]
[s (regexp-replace* #rx"[$][(]Mend[)]" s
base-commit: b10ecfb8311fca2d42636eea2ca12aff0b76b208
--
2.41.0
From 6261c3582c386e770d654ca6a36f112834f35aef Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Sun, 16 Jul 2023 15:47:14 -0400
Subject: [PATCH 2/2] rktboot: improve machene type inference
Related to https://issues.guix.gnu.org/62231
Related to https://github.com/racket/racket/issues/3948
(cherry picked from commit 005488491cee89e7db38109de4c9dcf2d8d5aef0)
---
racket/src/rktboot/config.rkt | 73 +++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 12 deletions(-)
diff --git a/racket/src/rktboot/config.rkt b/racket/src/rktboot/config.rkt
index 7a969017ed..2b411e002c 100644
--- a/racket/src/rktboot/config.rkt
+++ b/racket/src/rktboot/config.rkt
@@ -15,20 +15,69 @@
(path->complete-path scheme-dir))))))
(hash-set! ht 'make-boot-scheme-dir scheme-dir)
+(define (infer-target-machine)
+ ;; Compute a native or pbarch machine string for the current platform.
+ ;; Some caveats:
+ ;; 1. A pbarch Racket will always infer a pbarch machine,
+ ;; even if a native machine exists. Hopefully this is an
+ ;; unlikely scenario: if you're running Racket CS, you've
+ ;; bootstrapped Chez somehow, so you could use `re.boot`.
+ ;; 2. A `tpb` or `pb` Racket on a 32-bit platform would still return
+ ;; 64 from `(system-type 'word)`, but, in addition to the above,
+ ;; it is not currently possible or desired to build Racket as
+ ;; `tpb` or `pb` (as opposed to pbarch variants):
+ ;; see <https://github.com/racket/racket/issues/4692>.
+ ;; 3. On a hypothetical platform where Chez supported both the
+ ;; architecture and the OS, but not the combination of the two,
+ ;; (e.g. riscv64 Windows) this code would currently return a
+ ;; non-existent native machine (e.g. trv64nt) instead of a
+ ;; working pbarch machine. Presumably this could be fixed if
+ ;; such a platform came into existence.
+ (define s (path->string (system-library-subpath #f)))
+ (define arch+os
+ (cond
+ [(regexp-match #rx"^([^\\]+)\\\\([^\\]+)$" s)
+ => (λ (m)
+ (reverse (cdr m)))]
+ [(regexp-match #rx"^([^-]+)-(.+)$" s)
+ => cdr]
+ [else
+ (error 'infer-target-machine "unknown format for system library subpath"
+ "produced" (system-library-subpath #f))]))
+ (define arch
+ (case (car arch+os)
+ [("x86_64" "amd64") "a6"] ; https://github.com/racket/racket/issues/4691
+ [("i386") "i3"]
+ [("aarch64") "arm64"]
+ [("arm") "arm32"]
+ [("ppc") "ppc32"]
+ [("riscv64") "rv64"]
+ [("unknown") #f] ; pb machine types
+ [else #f]))
+ (define os
+ (case (cadr arch+os)
+ [("macosx" "darwin" "ios") "osx"]
+ [("win32" "cygwin") "nt"]
+ [("linux" "android") "le"]
+ [("gnu-hurd") "gnu"]
+ [("freebsd") "fb"]
+ [("openbsd") "ob"]
+ [("netbsd") "nb"]
+ [("solaris") "s2"] ; NOT "sunos4" (I think)
+ [("qnx") "qnx"]
+ [("unknown") #f] ; pb machine types
+ [else #f]))
+ (if (and arch os)
+ (string-append "t" arch os)
+ (format "tpb~a~a"
+ (system-type 'word)
+ (if (system-big-endian?)
+ "b"
+ "l"))))
+
(define target-machine (or (hash-ref ht 'make-boot-targate-machine #f)
(getenv "MACH")
- (case (system-type)
- [(macosx) (if (eqv? 64 (system-type 'word))
- "ta6osx"
- "ti3osx")]
- [(windows) (if (eqv? 64 (system-type 'word))
- "ta6nt"
- "ti3nt")]
- [else
- (case (path->string (system-library-subpath #f))
- [("x86_64-linux") "ta6le"]
- [("i386-linux") "ti3le"]
- [else #f])])))
+ (infer-target-machine)))
(hash-set! ht 'make-boot-targate-machine target-machine)
(define optimize-level-init 3)
--
2.41.0

15
gnu/packages/patches/racket-rktboot-riscv64-support.patch
View file

@ -1,15 +0,0 @@
Submitted upstream:
https://github.com/racket/racket/pull/4703
diff --git a/racket/src/rktboot/machine-def.rkt b/racket/src/rktboot/machine-def.rkt
index 8ff0688..59ebfc8 100644
--- a/racket/src/rktboot/machine-def.rkt
+++ b/racket/src/rktboot/machine-def.rkt
@@ -25,6 +25,7 @@
[(regexp-match? #rx"^t?arm32" target-machine) "arm32"]
[(regexp-match? #rx"^t?arm64" target-machine) "arm64"]
[(regexp-match? #rx"^t?ppc32" target-machine) "ppc32"]
+ [(regexp-match? #rx"^t?rv64" target-machine) "rv64"]
[(regexp-match? #rx"^t?pb" target-machine) "pb"]
[else (error "machine.def: cannot infer architecture")]))]
[s (regexp-replace* #rx"[$][(]Mend[)]" s

28
gnu/packages/patches/tor-remove-defensive-assert.patch Normal file
View file

@ -0,0 +1,28 @@
This patch removes a call to `tor_assert_nonfatal_unreached()` in
`relay_key_is_unavailable_()` that is only called when Tor is compiled
without relay support.
Unfortunately, the non-fatal assertion causes a BUG log
message to appear for clients when they start up without relay support
for each CPU worker we spawn. This makes it spotting issues during
bootstrap harder particularly for our iOS developers.
Since the call sites to `get_master_identity_key()` handles `NULL`
values already, we do not think this will be an issue later on.
Reported by Benjamin Erhart (@tla) from Guardian Project.
Fixes tpo/core/tor#40848.
diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h
index 7b6d80773c..b97615a9c9 100644
--- a/src/feature/relay/routerkeys.h
+++ b/src/feature/relay/routerkeys.h
@@ -53,7 +53,6 @@ void routerkeys_free_all(void);
static inline void *
relay_key_is_unavailable_(void)
{
- tor_assert_nonfatal_unreached();
return NULL;
}
#define relay_key_is_unavailable(type) \

10
gnu/packages/pdf.scm
View file

@ -117,7 +117,7 @@
(define-public capypdf (define-public capypdf
(package (package
(name "capypdf") (name "capypdf")
(version "0.4.0") (version "0.5.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -125,18 +125,14 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1kn46n3j5fygivmd6ldnv8vdwfv48ffaizq61yy4z9w2jm6fgxim")))) (base32 "1mb3i0jq04gg5cm1l07mn9kal5s748miql97j6fpaf1x1j2lcrsx"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:meson meson/newer (list #:meson meson/newer
#:configure-flags #~(list "-Dcpp_std=c++23")
#:test-options '(list "plainc") #:test-options '(list "plainc")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'add-missing-header
(lambda _
(substitute* "src/pdfgen.cpp"
(("#include <cassert>" all)
(string-append all "\n#include <unistd.h>")))))
(add-after 'unpack 'fix-glib-application-flags (add-after 'unpack 'fix-glib-application-flags
(lambda _ (lambda _
;; XXX: remove when bumping glib ;; XXX: remove when bumping glib

1
gnu/packages/perl.scm
View file

@ -76,7 +76,6 @@
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages hurd)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages language) #:use-module (gnu packages language)
#:use-module (gnu packages less) #:use-module (gnu packages less)

21
gnu/packages/piet.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com> ;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,6 +21,7 @@
(define-module (gnu packages piet) (define-module (gnu packages piet)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -43,14 +45,17 @@
"0nl59fhdqqr7nslxdirdn8nvlq5wws67c7jyx2ckbmxbc9h8bv9d")))) "0nl59fhdqqr7nslxdirdn8nvlq5wws67c7jyx2ckbmxbc9h8bv9d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'wrap-binaries (add-after 'install 'wrap-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/npietedit") (wrap-program (string-append out
`("PATH" ":" prefix (,(dirname (which "wish"))))) "/bin/npietedit")
#t)))))) `("PATH" ":" prefix
(,(dirname
(search-input-file
inputs "bin/wish")))))))))))
(inputs (inputs
(list gd giflib libpng tk)) (list gd giflib libpng tk))
(native-inputs (list groff)) (native-inputs (list groff))

6
gnu/packages/pulseaudio.scm
View file

@ -385,16 +385,16 @@ volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).")
(define-public pasystray (define-public pasystray
(package (package
(name "pasystray") (name "pasystray")
(version "0.7.1") (version "0.8.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/christophgysin/pasystray") (url "https://github.com/christophgysin/pasystray")
(commit (string-append name "-" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk")))) (base32 "1zf79pfmm7wa1l9yyab2g6lf0j81v1mrp406262rd21g4prx1921"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

23
gnu/packages/python-check.scm
View file

@ -1834,24 +1834,14 @@ supported by the MyPy typechecker.")
(define-public python-mypy (define-public python-mypy
(package (package
(name "python-mypy") (name "python-mypy")
(version "0.971") (version "1.4.1")
(source (source
(origin (origin
;; Because of https://github.com/python/mypy/issues/9584, the (method url-fetch)
;; mypyc/analysis directory is missing in the PyPI archive, leading to (uri (pypi-uri "mypy" version))
;; test failures.
(method git-fetch)
(uri (git-reference
(url "https://github.com/python/mypy")
(commit (string-append "v" version))
;; Fetch git submodules otherwise typeshed is not fetched.
;; Typeshed is a collection of Python sources type annotation
;; (data) files.
(recursive? #t)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0i8swdynms1wpiprgqn24za6mx8rlgxr2jash3cb5xi8jyf58n97")))) "06svfmqbnb45pydy8lcrr12wqhhla5dl888w0g4f3wm1ismxkg4v"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1859,10 +1849,7 @@ supported by the MyPy typechecker.")
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "pytest" "-vv" "mypyc" (invoke "pytest" "mypyc")))))))
;; XXX: This test gets an unexpected DeprecationWarning
;; from recent versions of setuptools. Ignore for now.
"-k" "not testImports")))))))
(native-inputs (native-inputs
(list python-attrs (list python-attrs
python-lxml python-lxml

6
gnu/packages/python-web.scm
View file

@ -3215,17 +3215,17 @@ HTTP via a UNIX domain socket.")
(define-public python-requests_ntlm (define-public python-requests_ntlm
(package (package
(name "python-requests_ntlm") (name "python-requests_ntlm")
(version "1.1.0") (version "1.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "requests_ntlm" version)) (uri (pypi-uri "requests_ntlm" version))
(sha256 (sha256
(base32 (base32
"0wgbqzaq9w7bas16b7brdb75f91bh3275fb459093bk1ihpck2ci")))) "1a0np7lk8ma1plv1s4aw5q9h2z3aljprkl9qsfypqcaf0zsqbhik"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-cryptography python-ntlm-auth python-requests)) (list python-cryptography python-pyspnego python-requests))
(home-page "https://github.com/requests/requests-ntlm") (home-page "https://github.com/requests/requests-ntlm")
(synopsis (synopsis
"NTLM authentication support for Requests") "NTLM authentication support for Requests")

148
gnu/packages/python-xyz.scm
View file

@ -141,6 +141,8 @@
;;; Copyright © 2023 Ontje Lünsdorf <ontje.luensdorf@dlr.de> ;;; Copyright © 2023 Ontje Lünsdorf <ontje.luensdorf@dlr.de>
;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com> ;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © c4droid <c4droid@foxmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2039,13 +2041,13 @@ and a list of words that are easier to remember for humans (the
(define-public python-bitarray (define-public python-bitarray
(package (package
(name "python-bitarray") (name "python-bitarray")
(version "2.6.1") (version "2.8.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "bitarray" version)) (uri (pypi-uri "bitarray" version))
(sha256 (sha256
(base32 (base32
"0c4jli872nzix81n1xirnrghlq2fdsxb570d9rnfvxi1694sah44")))) "1wy80bmhg33bpzn28g1n7s8r8f4drj7pcl4m2qb5sql8bbryx376"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list #:phases (list #:phases
@ -3485,17 +3487,17 @@ standard.")
(define-public python-eventlet (define-public python-eventlet
(package (package
(name "python-eventlet") (name "python-eventlet")
(version "0.33.0") (version "0.33.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "eventlet" version)) (uri (pypi-uri "eventlet" version))
(sha256 (sha256
(base32 (base32
"07qlyhcm0f28sxdizawvdf3d50m3hnbzz5kg3fjp7chvki44y540")))) "1nngffz21afhfi266smf4s5mn5dfd0ykdnirfls9bwnzxbkh6a3j"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-dnspython python-greenlet python-monotonic python-six)) (list python-dnspython python-greenlet python-six))
(native-inputs (native-inputs
(list python-nose)) (list python-nose))
(arguments (arguments
@ -3520,7 +3522,9 @@ standard.")
;; <https://github.com/eventlet/eventlet/issues/730>. ;; <https://github.com/eventlet/eventlet/issues/730>.
"-e" "test_patcher_existing_locks_locked" "-e" "test_patcher_existing_locks_locked"
;; And see <https://github.com/eventlet/eventlet/issues/739>. ;; And see <https://github.com/eventlet/eventlet/issues/739>.
"-e" "test_017_ssl_zeroreturnerror"))))))) "-e" "test_017_ssl_zeroreturnerror"
;; This test is failing on some architectures
"-e" "test_fork_after_monkey_patch")))))))
(home-page "https://eventlet.net") (home-page "https://eventlet.net")
(synopsis "Concurrent networking library for Python") (synopsis "Concurrent networking library for Python")
(description (description
@ -7126,6 +7130,11 @@ provides additional functionality on the produced Mallard documents.")
,@(if (not (target-64bit?)) ,@(if (not (target-64bit?))
'("-x" "run.parallel") '("-x" "run.parallel")
'()) '())
,@(if (system-hurd?)
'("-x" "test_class_ref"
"-x" "test_compiler_directives"
"-x" "test_lang_version")
'())
;; This test fails when running on 24 cores. ;; This test fails when running on 24 cores.
"-x" "cpp_stl_conversion"))))))) "-x" "cpp_stl_conversion")))))))
(home-page "https://cython.org/") (home-page "https://cython.org/")
@ -7474,24 +7483,14 @@ color scales, and color space conversion easy. It has support for:
(define-public python-pyspnego (define-public python-pyspnego
(package (package
(name "python-pyspnego") (name "python-pyspnego")
(version "0.1.6") (version "0.8.0")
(source (source (origin
(origin (method url-fetch)
(method git-fetch) ;no tests in PyPI release (uri (pypi-uri "pyspnego" version))
(uri (git-reference (sha256
(url "https://github.com/jborean93/pyspnego") (base32
(commit (string-append "v" version)))) "1ps34laa0kvvp33az173hp5l0hnk8cr0bfqmlgw64ry5cv09qjg0"))))
(file-name (git-file-name name version)) (build-system pyproject-build-system)
(sha256
(base32
"0pfh2x0539f0k2qi2pbjm64b2fqp64c63xxpinvg1yfaw915kgpb"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
(native-inputs (native-inputs
(list python-pytest python-pytest-mock)) (list python-pytest python-pytest-mock))
(propagated-inputs (propagated-inputs
@ -8365,17 +8364,6 @@ Python code against some of the style conventions in
@url{http://www.python.org/dev/peps/pep-0008/,PEP 8}.") @url{http://www.python.org/dev/peps/pep-0008/,PEP 8}.")
(license license:expat))) (license license:expat)))
(define-public python-pycodestyle-2.6
(package
(inherit python-pycodestyle)
(version "2.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pycodestyle" version))
(sha256
(base32
"0bhr6ia0hmgx3nhgibc9pmkzhlh1zcqk707i5fbxgs702ll7v2n5"))))))
(define-public python-multidict (define-public python-multidict
(package (package
(name "python-multidict") (name "python-multidict")
@ -12511,19 +12499,6 @@ file (e.g. @file{PKG-INFO}).")
"Pyflakes statically checks Python source code for common errors.") "Pyflakes statically checks Python source code for common errors.")
(license license:expat))) (license license:expat)))
(define-public python-pyflakes-2.2
(package
(inherit python-pyflakes)
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pyflakes" version))
(sha256
(base32
"1j3zqbiwkyicvww499bblq33x0bjpzdrxajhaysr7sk7x5gdgcim"))
(patches
(search-patches "python-pyflakes-test-location.patch"))))))
(define-public python-mccabe (define-public python-mccabe
(package (package
(name "python-mccabe") (name "python-mccabe")
@ -12599,20 +12574,6 @@ cyclomatic complexity of Python source code.")
"Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.")
(license license:expat))) (license license:expat)))
(define-public python-flake8-3.8
(package
(inherit python-flake8)
(version "3.8.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "flake8" version))
(sha256
(base32
"0fvcrsbyzjpcli8ldbpsdbpmf238nkvwc1dy4hy82lf63rvfinma"))))
(propagated-inputs
(list python-pycodestyle-2.6 python-entrypoints python-pyflakes-2.2
python-mccabe))))
(define-public python-flake8-blind-except (define-public python-flake8-blind-except
(package (package
(name "python-flake8-blind-except") (name "python-flake8-blind-except")
@ -14359,7 +14320,7 @@ specification.")
(define-public python-libsass (define-public python-libsass
(package (package
(name "python-libsass") (name "python-libsass")
(version "0.20.1") (version "0.22.0")
(source (source
(origin (origin
;; PyPI tarball is missing some test files. ;; PyPI tarball is missing some test files.
@ -14369,7 +14330,7 @@ specification.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh")))) (base32 "0j6c7jb1bnpmz76gs5za41qwgrs7v1yd1jkgvsy5ql6dg2ph9vp4"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -14377,6 +14338,17 @@ specification.")
;; Use Guix package of libsass instead of compiling from a checkout. ;; Use Guix package of libsass instead of compiling from a checkout.
(add-before 'build 'set-libsass (add-before 'build 'set-libsass
(lambda _ (setenv "SYSTEM_SASS" "indeed"))) (lambda _ (setenv "SYSTEM_SASS" "indeed")))
;; XXX: Silent 2 failing tests, reported to upstream (closed), see
;; https://github.com/sass/libsass-python/issues/440. It passed with
;; libsass@3.6.5 which requires rebuild the world (1200+ packages),
;; remove when v3.6.5 is available.
(add-before 'check 'silent-failing-tests
(lambda _
(substitute* "sasstests.py"
(("def test_build_one")
"def __off_test_build_one")
(("def test_stack_trace_formatting")
"def __off_test_stack_trace_formatting"))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
@ -24808,19 +24780,25 @@ and corruption checks.")
(define-public python-fasteners (define-public python-fasteners
(package (package
(name "python-fasteners") (name "python-fasteners")
(version "0.15") (version "0.17.3")
(source (source (origin
(origin ;; No tests in the pypi tarball
(method url-fetch) (method git-fetch)
(uri (pypi-uri "fasteners" version)) (uri (git-reference
(sha256 (url "https://github.com/harlowja/fasteners")
(base32 (commit version)))
"1vzmz1xh38b84dv0f4hlp7arwmx8wjlih6lf964bpy8dnyk6s5rs")))) (file-name (git-file-name name version))
(build-system python-build-system) (sha256
(propagated-inputs (base32
(list python-monotonic python-six)) "0m0dxv8ljpkq99s3d1mib1zfb0ppx3h74h5yr8809zsrq2klfn0m"))))
(native-inputs (build-system pyproject-build-system)
(list python-testtools)) (arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
(native-inputs (list python-diskcache python-more-itertools python-pytest))
(home-page "https://github.com/harlowja/fasteners") (home-page "https://github.com/harlowja/fasteners")
(synopsis "Python package that provides useful locks") (synopsis "Python package that provides useful locks")
(description (description
@ -25188,8 +25166,16 @@ tool).")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Only add CFLAGS on architectures where they are supported
(substitute* "setup.py"
(("import sys")
"import sys\nimport platform")
(("os\\.name == 'posix'")
(string-append "os.name + platform.machine() == 'posixx86_64' or"
" os.name + platform.machine() == 'posixx86'")))
(delete-file-recursively "c-blosc") (delete-file-recursively "c-blosc")
(for-each delete-file '("numcodecs/blosc.c" (for-each delete-file '("numcodecs/_shuffle.c"
"numcodecs/blosc.c"
"numcodecs/compat_ext.c" "numcodecs/compat_ext.c"
"numcodecs/lz4.c" "numcodecs/lz4.c"
"numcodecs/vlen.c" "numcodecs/vlen.c"
@ -29998,7 +29984,7 @@ applications and daemons.")
(define-public python-qtsass (define-public python-qtsass
(package (package
(name "python-qtsass") (name "python-qtsass")
(version "0.3.0") (version "0.4.0")
(source (source
(origin (origin
;; There are no tests in the PyPI tarball. ;; There are no tests in the PyPI tarball.
@ -30008,7 +29994,7 @@ applications and daemons.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "09s04aa14d8jqbh71clrb5y7vcmkxlp94mwmvzrkxahry3bk03cb")))) (base32 "1skdihfby2f41zxgwa5zv44vdxjrw301rh88rjmzj4xbdlix6cig"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:test-target "pytest" `(#:test-target "pytest"
@ -30020,7 +30006,7 @@ applications and daemons.")
(for-each make-file-writable (find-files ".")) (for-each make-file-writable (find-files "."))
#t))))) #t)))))
(native-inputs (native-inputs
(list python-pytest python-pytest-cov python-pytest-runner)) (list python-flaky python-pytest python-pytest-cov python-pytest-runner))
(propagated-inputs (propagated-inputs
(list python-libsass)) (list python-libsass))
(home-page "https://github.com/spyder-ide/qtsass") (home-page "https://github.com/spyder-ide/qtsass")

44
gnu/packages/racket.scm
View file

@ -29,6 +29,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
@ -190,7 +191,7 @@
;; ;;
;; CODE: ;; CODE:
(define %racket-version "8.9") ; Remember to update chez-scheme-for-racket! (define %racket-version "8.10") ; Remember to update chez-scheme-for-racket!
(define %zuo-version "1.6") ; defined in racket/src/zuo/zuo.c (define %zuo-version "1.6") ; defined in racket/src/zuo/zuo.c
(define %racket-commit (define %racket-commit
(string-append "v" %racket-version)) (string-append "v" %racket-version))
@ -201,10 +202,10 @@
(url "https://github.com/racket/racket") (url "https://github.com/racket/racket")
(commit %racket-commit))) (commit %racket-commit)))
(sha256 (sha256
(base32 "120djvscm2x1nv46is0kzwahd22rcc8gc0ssf12jnj7w290dpmra")) (base32 "0xhra47lnz5aq2shvsil4vcravai4n86r4v1lza7r07n6s1pb9s5"))
(file-name (git-file-name "racket" %racket-version)) (file-name (git-file-name "racket" %racket-version))
(patches (search-patches "racket-chez-scheme-bin-sh.patch" (patches (search-patches "racket-chez-scheme-bin-sh.patch"
"racket-rktboot-riscv64-support.patch" "racket-backport-8.10-rktboot.patch"
"racket-rktio-bin-sh.patch" "racket-rktio-bin-sh.patch"
"racket-zuo-bin-sh.patch")) "racket-zuo-bin-sh.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
@ -553,6 +554,7 @@ used to build the name of the resulting store item."
"base" %racket-origin "base" %racket-origin
'(("base" "pkgs/base") '(("base" "pkgs/base")
("racket-lib" "pkgs/racket-lib"))))) ("racket-lib" "pkgs/racket-lib")))))
(native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Here and for the `racket` package, we're using #:configure-flags ;; Here and for the `racket` package, we're using #:configure-flags
@ -699,7 +701,7 @@ DrRacket IDE, are not included.")
"contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3")
'(("contract-profile" "."))) '(("contract-profile" ".")))
(simple-racket-origin (simple-racket-origin
"data" (base32 "08sj4m0g0cp7gwb0nq90m770f0c21b7ydif7nljc8rxmcdprfisc") "data" (base32 "1pml8g3zgvnaiqb659psh99m70v96m6nh9zash2vfgir46j4rjnh")
'("data" "data-doc" "data-enumerate-lib" "data-lib")) '("data" "data-doc" "data-enumerate-lib" "data-lib"))
(simple-racket-origin (simple-racket-origin
"datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s")
@ -708,7 +710,7 @@ DrRacket IDE, are not included.")
"db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5")
'("db" "db-doc" "db-lib")) '("db" "db-doc" "db-lib"))
(simple-racket-origin (simple-racket-origin
"deinprogramm" (base32 "0iv14kig8w6kwxxmcfsxskk6x7a4kgzppzgyznzgy1mk6p5rxbjg") "deinprogramm" (base32 "0889154ssw56aq6iqxnzgjram9x6c64sscjzrhr4077vnv4h1c93")
'("deinprogramm" "deinprogramm-signature")) '("deinprogramm" "deinprogramm-signature"))
(simple-racket-origin (simple-racket-origin
"distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0")
@ -717,7 +719,7 @@ DrRacket IDE, are not included.")
"draw" (base32 "0vf40hp6h14zgs0gx40jzdzxm4ai1vxwpmg65y00lwmdxc97b2ji") "draw" (base32 "0vf40hp6h14zgs0gx40jzdzxm4ai1vxwpmg65y00lwmdxc97b2ji")
'("draw" "draw-doc" "draw-lib")) '("draw" "draw-doc" "draw-lib"))
(simple-racket-origin (simple-racket-origin
"drracket" (base32 "1b2fammrkb01kglf0n1rzdq2ngay4adnjh3gdmnza7mxz09y35m2") "drracket" (base32 "0haban4fysr8i2w071nra9s97zkrrx5f5c874r9pr2k9bhqcp4jq")
'("drracket" '("drracket"
"drracket-plugin-lib" "drracket-plugin-lib"
"drracket-tool" "drracket-tool"
@ -751,13 +753,13 @@ DrRacket IDE, are not included.")
"games" (base32 "0kpn3izlx1ccd0pj0dnvmnrhny51b85xy418a7psj70lz8j8415d") "games" (base32 "0kpn3izlx1ccd0pj0dnvmnrhny51b85xy418a7psj70lz8j8415d")
'(("games" "."))) '(("games" ".")))
(simple-racket-origin (simple-racket-origin
"gui" (base32 "01ydlr10gkdm66x1gx3im5lwiap0ssiph8nmaisv0xrnrirbnp51") "gui" (base32 "1s2a8qgm7dqpxyi9plshdbaxzd8klc80i8ppjpc5i5xyhcfmzyvf")
'("gui" "gui-doc" "gui-lib" "tex-table")) '("gui" "gui-doc" "gui-lib" "tex-table"))
(simple-racket-origin (simple-racket-origin
"gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5")
'("gui-pkg-manager-lib")) '("gui-pkg-manager-lib"))
(simple-racket-origin (simple-racket-origin
"htdp" (base32 "1qnnnh9d9kjzlaasql7gi0h8z893bzb9kffay00mwg2j0bfzsf2s") "htdp" (base32 "0kd92rg8m8my11pq1dxvv6dyban77j6kvs368xsl6fr52jd7zbkl")
'("htdp" "htdp-doc" "htdp-lib")) '("htdp" "htdp-doc" "htdp-lib"))
(simple-racket-origin (simple-racket-origin
"html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x")
@ -781,7 +783,7 @@ DrRacket IDE, are not included.")
"make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa")
'(("make" "."))) '(("make" ".")))
(simple-racket-origin (simple-racket-origin
"math" (base32 "1qz4k6iwbrf9l7dhivrznghrpbqhxx14yczkgqpkz6yqawi642x9") "math" (base32 "1l0r4xpbbjz0b2s6v3kn490zgs2q1dnj3ga95y1505jmcwgb2hl9")
'("math" "math-doc" "math-lib")) '("math" "math-doc" "math-lib"))
(simple-racket-origin (simple-racket-origin
"mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48")
@ -799,7 +801,7 @@ DrRacket IDE, are not included.")
(url "https://github.com/RenaissanceBug/racket-cookies") (url "https://github.com/RenaissanceBug/racket-cookies")
(commit %racket-commit))) (commit %racket-commit)))
(sha256 (base32 (sha256 (base32
"0k0hifxhywl5c3hjcaiizc098dpyk001d981p572gly116yvjxc1")) "05lnml9nszcq72k8bi4iwdyplp2iv23ywb2gmrs2hr8837fqi65y"))
(file-name (file-name
(git-file-name "RenaissanceBug-racket-cookies" %racket-version))) (git-file-name "RenaissanceBug-racket-cookies" %racket-version)))
'("net-cookies" "net-cookies-doc" "net-cookies-lib")) '("net-cookies" "net-cookies-doc" "net-cookies-lib"))
@ -825,7 +827,7 @@ DrRacket IDE, are not included.")
"pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1")
'("pconvert-lib")) '("pconvert-lib"))
(simple-racket-origin (simple-racket-origin
"pict" (base32 "0j6m95pq523pz526d7my8b3cg8a3jssag2mafxcq531prlnzq9sq") "pict" (base32 "1vsn91r167wssaflzz080nsrcf0jfhl2a48zcj9hvdb77arbj8kc")
'("pict" "pict-doc" "pict-lib")) '("pict" "pict-doc" "pict-lib"))
(simple-racket-origin (simple-racket-origin
"pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x")
@ -840,7 +842,7 @@ DrRacket IDE, are not included.")
"planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9")
'("planet" "planet-doc" "planet-lib")) '("planet" "planet-doc" "planet-lib"))
(simple-racket-origin (simple-racket-origin
"plot" (base32 "13i6cwkscb4j6zmdc122iidmykwpxfk8xjmq09c6gv77slfynivl") "plot" (base32 "1p0jxrwdwkb7z6ppp2ccpdzmizjimfpkdgilvbgv8x6mmqf0bf6q")
'("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib"))
(simple-racket-origin (simple-racket-origin
"preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg")
@ -876,7 +878,7 @@ DrRacket IDE, are not included.")
(git-file-name "jeapostrophe-racket-cheat" %racket-version))) (git-file-name "jeapostrophe-racket-cheat" %racket-version)))
'(("racket-cheat" "."))) '(("racket-cheat" ".")))
(simple-racket-origin (simple-racket-origin
"racklog" (base32 "0fbq0fpfb3l6h7h772dvkmlzlk2dnq5f8296xx1qxhhwypibqzr9") "racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032")
'(("racklog" "."))) '(("racklog" ".")))
(simple-racket-origin (simple-racket-origin
"rackunit" (base32 "03v1yvqgk3f65caqiwnadq00sjbg813ic949hys29f4c8mxz6gic") "rackunit" (base32 "03v1yvqgk3f65caqiwnadq00sjbg813ic949hys29f4c8mxz6gic")
@ -895,7 +897,7 @@ DrRacket IDE, are not included.")
"realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g")
'(("realm" "."))) '(("realm" ".")))
(simple-racket-origin (simple-racket-origin
"redex" (base32 "16kyi4nxxi4a05gjarb9dayysg032vsad5mmwn1j6d6yxxhbw9jr") "redex" (base32 "00pm0pj3h19a9dar4pzdn8q5l7bvl92q9gkh04k1ddlcx4af1m10")
'("redex" '("redex"
"redex-benchmark" "redex-benchmark"
"redex-doc" "redex-doc"
@ -910,7 +912,7 @@ DrRacket IDE, are not included.")
"scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x")
'(("scheme-lib" "."))) '(("scheme-lib" ".")))
(simple-racket-origin (simple-racket-origin
"scribble" (base32 "06q5jhfblps47ly9fv5pkcz3nk8akfgad9ank32dh1svagq9plzf") "scribble" (base32 "1jnbvl98yn8dhblcx411jybd879g4aj6d136xi23i4zwwrbsiy6m")
'("scribble" '("scribble"
"scribble-doc" "scribble-doc"
"scribble-html-lib" "scribble-html-lib"
@ -936,13 +938,13 @@ DrRacket IDE, are not included.")
"slatex" (base32 "0pkm2isbbdk63slrbsxcql7rr0wdrw5kapw1xq4ps5k8dhlzv8x0") "slatex" (base32 "0pkm2isbbdk63slrbsxcql7rr0wdrw5kapw1xq4ps5k8dhlzv8x0")
'(("slatex" "."))) '(("slatex" ".")))
(simple-racket-origin (simple-racket-origin
"slideshow" (base32 "0phq0mvy0dh8hhbhxhmsini286dyggy6cgxq7mcwj4n2sbw38sas") "slideshow" (base32 "0hmg5184cpxjb0ni6v2zkf4l29j8yyzm9pzv1gvmw2fm1rlrry4f")
'("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin"))
(simple-racket-origin (simple-racket-origin
"snip" (base32 "1j7sk364w2cggr4i5my1p2ibyvslrnj45xwxhihx6zypkbk59c3m") "snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d")
'("snip" "snip-lib")) '("snip" "snip-lib"))
(simple-racket-origin (simple-racket-origin
"typed-racket" (base32 "0iz62xy2grkwyi4krz0chi3fswg74zd5s5jpdqyhxhdqq3gcscp0") "typed-racket" (base32 "1721qgk1fplzwcgidg342anvykr88prvl1jag4vg8qxz8m28wi08")
'("source-syntax" '("source-syntax"
"typed-racket" "typed-racket"
"typed-racket-compatibility" "typed-racket-compatibility"
@ -953,13 +955,13 @@ DrRacket IDE, are not included.")
"srfi" (base32 "0rvx49ni1v8ikbx1a6qg97pprpkxmy7cgl918f52hq7jlx91b71x") "srfi" (base32 "0rvx49ni1v8ikbx1a6qg97pprpkxmy7cgl918f52hq7jlx91b71x")
'("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib"))
(simple-racket-origin (simple-racket-origin
"string-constants" (base32 "1lxab9323xmxqs4mxbgr504xgcgsf9dvx2xsb4p92fjzsif0d64y") "string-constants" (base32 "1jxbh91x1r65lahjlix61rmkjikcam2k5w97xj8r7p7z05240dih")
'("string-constants" "string-constants-doc" "string-constants-lib")) '("string-constants" "string-constants-doc" "string-constants-lib"))
(simple-racket-origin (simple-racket-origin
"swindle" (base32 "1q8vdxpzczzwdw2mys2caab45yvadmqkixsr29k8pl03n8dsg8j9") "swindle" (base32 "1q8vdxpzczzwdw2mys2caab45yvadmqkixsr29k8pl03n8dsg8j9")
'(("swindle" "."))) '(("swindle" ".")))
(simple-racket-origin (simple-racket-origin
"syntax-color" (base32 "03fjmpww2958sryicrrcrpqwq6ibslfxd86ckl1mgafm3kr02qhp") "syntax-color" (base32 "0lcv6glhsx27lkz7wwalzgfr0nb0hdqjic54z3rcfxhag4p6sg8i")
'("syntax-color" "syntax-color-doc" "syntax-color-lib")) '("syntax-color" "syntax-color-doc" "syntax-color-lib"))
(simple-racket-origin (simple-racket-origin
"trace" (base32 "070ihla5j796hdarn5wxdwn4xj0xnkm50shgh49jy994mribvhia") "trace" (base32 "070ihla5j796hdarn5wxdwn4xj0xnkm50shgh49jy994mribvhia")
@ -968,7 +970,7 @@ DrRacket IDE, are not included.")
"unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y") "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y")
'("unix-socket" "unix-socket-doc" "unix-socket-lib")) '("unix-socket" "unix-socket-doc" "unix-socket-lib"))
(simple-racket-origin (simple-racket-origin
"web-server" (base32 "0xfg0n0rg1g5rbqq4mm0qjgqkkrgm3ilzkffga2bjx253jrrrcai") "web-server" (base32 "0sizb50rbnqmdx8igpqshj0hzsqyg30faf7wb9fs08sjs0lqkgsf")
'("web-server" "web-server-doc" "web-server-lib")) '("web-server" "web-server-doc" "web-server-lib"))
(simple-racket-origin (simple-racket-origin
"wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b") "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b")

34
gnu/packages/rust-apps.scm
View file

@ -1780,9 +1780,10 @@ background agent taking care of maintaining the necessary state.")
"1ci85bp8xwqrk8nqr8sh6yj8njgd98nhgnhaks2g00c77wwyra41")))) "1ci85bp8xwqrk8nqr8sh6yj8njgd98nhgnhaks2g00c77wwyra41"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:install-source? #f ; virtual manifest `(#:rust ,rust-1.64
#:install-source? #f ; virtual manifest
#:cargo-test-flags #:cargo-test-flags
'("--release" "--" '("--release" "--lib" "--tests" "--"
"--skip=tests::test_version_check" ;it need rustc's version "--skip=tests::test_version_check" ;it need rustc's version
;; FIXME: Guix's rust does not install source in ;; FIXME: Guix's rust does not install source in
;; %out/lib/rustlib/src/rust so "can't load standard library from ;; %out/lib/rustlib/src/rust so "can't load standard library from
@ -1793,18 +1794,25 @@ background agent taking care of maintaining the necessary state.")
"--skip=tests::sourcegen::sourcegen_assists_docs" ;need rustfmt "--skip=tests::sourcegen::sourcegen_assists_docs" ;need rustfmt
"--skip=tests::sourcegen_ast::sourcegen_ast" ;same "--skip=tests::sourcegen_ast::sourcegen_ast" ;same
"--skip=tidy::cargo_files_are_tidy" ;not needed
"--skip=tidy::check_licenses" ;it runs cargo metadata "--skip=tidy::check_licenses" ;it runs cargo metadata
"--skip=tidy::check_merge_commits" ;it runs git rev-list "--skip=tidy::check_merge_commits" ;it runs git rev-list
"--skip=tidy::check_code_formatting" ;need rustfmt as cargo fmt "--skip=tidy::check_code_formatting" ;need rustfmt as cargo fmt
"--skip=tidy::generate_grammar" ;same
"--skip=tidy::generate_assists_tests") ;same ;; These tests require rust <= 1.60 and too many packages
;; has as dependency rust-serde-json-1 that use indexmap2
;; and it need rust >= 1.64
"--skip=tests::list_test_macros"
"--skip=tests::test_derive_empty"
"--skip=tests::test_attr_macro"
"--skip=tests::test_fn_like_macro"
"--skip=tests::test_fn_like_macro2"
"--skip=tests::test_derive_error")
#:cargo-development-inputs #:cargo-development-inputs
(("rust-arbitrary" ,rust-arbitrary-1) (("rust-arbitrary" ,rust-arbitrary-1)
("rust-derive-arbitrary" ,rust-derive-arbitrary-1) ("rust-derive-arbitrary" ,rust-derive-arbitrary-1)
("rust-expect-test" ,rust-expect-test-1) ("rust-expect-test" ,rust-expect-test-1)
("rust-oorandom" ,rust-oorandom-11.1) ("rust-oorandom" ,rust-oorandom-11.1)
("rust-quote" ,rust-quote-1) ("rust-quote" ,rust-quote-1.0.10)
("rust-rayon" ,rust-rayon-1) ("rust-rayon" ,rust-rayon-1)
("rust-tracing" ,rust-tracing-0.1) ("rust-tracing" ,rust-tracing-0.1)
("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
@ -1815,7 +1823,6 @@ background agent taking care of maintaining the necessary state.")
("rust-anyhow" ,rust-anyhow-1) ("rust-anyhow" ,rust-anyhow-1)
("rust-anymap" ,rust-anymap-0.12) ("rust-anymap" ,rust-anymap-0.12)
("rust-arrayvec" ,rust-arrayvec-0.7) ("rust-arrayvec" ,rust-arrayvec-0.7)
("rust-backtrace" ,rust-backtrace-0.3)
("rust-cargo-metadata" ,rust-cargo-metadata-0.14) ("rust-cargo-metadata" ,rust-cargo-metadata-0.14)
("rust-cfg-if" ,rust-cfg-if-1) ("rust-cfg-if" ,rust-cfg-if-1)
("rust-chalk-ir" ,rust-chalk-ir-0.75) ("rust-chalk-ir" ,rust-chalk-ir-0.75)
@ -1824,17 +1831,16 @@ background agent taking care of maintaining the necessary state.")
("rust-countme" ,rust-countme-3) ("rust-countme" ,rust-countme-3)
("rust-cov-mark" ,rust-cov-mark-2) ("rust-cov-mark" ,rust-cov-mark-2)
("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
("rust-dashmap" ,rust-dashmap-4)
("rust-dissimilar" ,rust-dissimilar-1) ("rust-dissimilar" ,rust-dissimilar-1)
("rust-dot" ,rust-dot-0.1) ("rust-dot" ,rust-dot-0.1)
("rust-drop-bomb" ,rust-drop-bomb-0.1) ("rust-drop-bomb" ,rust-drop-bomb-0.1)
("rust-either" ,rust-either-1) ("rust-either" ,rust-either-1.6.0)
("rust-ena" ,rust-ena-0.14) ("rust-ena" ,rust-ena-0.14)
("rust-env-logger" ,rust-env-logger-0.8) ("rust-env-logger" ,rust-env-logger-0.8)
("rust-flate2" ,rust-flate2-1) ("rust-flate2" ,rust-flate2-1)
("rust-fst" ,rust-fst-0.4) ("rust-fst" ,rust-fst-0.4)
("rust-home" ,rust-home-0.5) ("rust-home" ,rust-home-0.5)
("rust-indexmap" ,rust-indexmap-1) ("rust-indexmap" ,rust-indexmap-1.7)
("rust-itertools" ,rust-itertools-0.10) ("rust-itertools" ,rust-itertools-0.10)
("rust-jod-thread" ,rust-jod-thread-0.1) ("rust-jod-thread" ,rust-jod-thread-0.1)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
@ -1845,12 +1851,12 @@ background agent taking care of maintaining the necessary state.")
("rust-memmap2" ,rust-memmap2-0.5) ("rust-memmap2" ,rust-memmap2-0.5)
("rust-mimalloc" ,rust-mimalloc-0.1) ("rust-mimalloc" ,rust-mimalloc-0.1)
("rust-miow" ,rust-miow-0.4) ("rust-miow" ,rust-miow-0.4)
("rust-notify" ,rust-notify-5) ("rust-notify" ,rust-notify-5-pre.13)
("rust-object" ,rust-object-0.28) ("rust-object" ,rust-object-0.28)
("rust-once-cell" ,rust-once-cell-1) ("rust-once-cell" ,rust-once-cell-1)
("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-parking-lot" ,rust-parking-lot-0.11)
("rust-perf-event" ,rust-perf-event-0.4) ("rust-perf-event" ,rust-perf-event-0.4)
("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-proc-macro2" ,rust-proc-macro2-1.0.34)
("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8) ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8)
("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-7) ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-7)
("rust-rowan" ,rust-rowan-0.15) ("rust-rowan" ,rust-rowan-0.15)
@ -1859,7 +1865,7 @@ background agent taking care of maintaining the necessary state.")
("rust-salsa" ,rust-salsa-0.17) ("rust-salsa" ,rust-salsa-0.17)
("rust-scoped-tls" ,rust-scoped-tls-1) ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1.0.73)
("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1) ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1)
("rust-typed-arena" ,rust-typed-arena-2) ("rust-typed-arena" ,rust-typed-arena-2)
("rust-smallvec" ,rust-smallvec-1) ("rust-smallvec" ,rust-smallvec-1)
@ -1927,7 +1933,7 @@ exec -a \"$0\" \"~a\" \"$@\""
(chdir "../..") (chdir "../..")
(install-file "LICENSE-MIT" doc) (install-file "LICENSE-MIT" doc)
(install-file "LICENSE-APACHE" doc))))))) (install-file "LICENSE-APACHE" doc)))))))
(native-inputs (list rust-src)) (native-inputs (list rust-src-1.64))
(home-page "https://rust-analyzer.github.io/") (home-page "https://rust-analyzer.github.io/")
(synopsis "Experimental Rust compiler front-end for IDEs") (synopsis "Experimental Rust compiler front-end for IDEs")
(description "Rust-analyzer is a modular compiler frontend for the Rust (description "Rust-analyzer is a modular compiler frontend for the Rust

6
gnu/packages/rust.scm
View file

@ -652,7 +652,7 @@ safety and thread safety guarantees.")
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z")) rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z"))
(define rust-1.64 (define-public rust-1.64
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk"))) rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk")))
@ -891,10 +891,10 @@ safety and thread safety guarantees.")
`("procps" ,procps) `("procps" ,procps)
(package-native-inputs base-rust)))))) (package-native-inputs base-rust))))))
(define-public rust-src (define-public rust-src-1.64
(hidden-package (hidden-package
(package (package
(inherit rust) (inherit rust-1.64)
(name "rust-src") (name "rust-src")
(build-system copy-build-system) (build-system copy-build-system)
(native-inputs '()) (native-inputs '())

45
gnu/packages/scheme.scm
View file

@ -42,8 +42,8 @@
(define-module (gnu packages scheme) (define-module (gnu packages scheme)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:select (gpl2+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ asl2.0 bsd-3 #:select (gpl2 gpl2+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ asl2.0
cc-by-sa4.0 non-copyleft expat public-domain)) bsd-3 cc-by-sa4.0 non-copyleft expat public-domain))
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -1235,3 +1235,44 @@ time compilation and compiled macros.")
(description (description
"Gerbil mode provides font-lock, indentation, navigation, and REPL for "Gerbil mode provides font-lock, indentation, navigation, and REPL for
Gerbil code within Emacs."))) Gerbil code within Emacs.")))
(define-public stklos
(package
(name "stklos")
(version "1.70")
(source (origin
(method url-fetch)
;; TODO: Unbundle pcre, libgc, and libffi.
(uri (string-append "https://stklos.net/download/stklos-"
version ".tar.gz"))
(sha256
(base32
"1iw3pgycjz3kz3jd1855v2ngf8ib2almpf8v058n1mkj1qd2b88m"))))
(build-system gnu-build-system)
(arguments
(list
#:modules `((ice-9 ftw)
,@%gnu-build-system-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-sh-references
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (which "bash")))
(substitute* "configure"
(("/bin/sh") bash)))))
(add-after 'configure 'patch-rm-references
(lambda _
(let ((rm (which "rm")))
(substitute* (find-files "." "^Makefile$")
(("/bin/rm") rm))))))))
(properties
'((release-monitoring-url . "https://stklos.net/download.html")))
(home-page "https://stklos.net")
(synopsis "R7RS Scheme with CLOS-like object system")
(description
"STklos is a free Scheme system mostly compliant with the languages
features defined in R7RS small. The aim of this implementation is to be fast
as well as light. The implementation is based on an ad-hoc Virtual
Machine. STklos can also be compiled as a library and embedded in an
application.")
(license gpl2+)))

11
gnu/packages/serialization.scm
View file

@ -811,6 +811,17 @@ game development and other performance-critical applications.")
(base32 (base32
"1z3a6l8g2y53i5xzraswfs2i0i3kk52zv7nzc2q3fgisbyiri3pz")))))) "1z3a6l8g2y53i5xzraswfs2i0i3kk52zv7nzc2q3fgisbyiri3pz"))))))
(define-public flatbuffers-next-shared
(package
(inherit flatbuffers-next)
(name "flatbuffers-shared")
(version "23.1.21")
(arguments
(substitute-keyword-arguments (package-arguments flatbuffers-next)
((#:configure-flags flags)
;; Compile with -fPIC, needed for shared lib.
#~(cons "-DFLATBUFFERS_CXX_FLAGS=-fPIC" #$flags))))))
(define-public python-feather-format (define-public python-feather-format
(package (package
(name "python-feather-format") (name "python-feather-format")

1
gnu/packages/skarnet.scm
View file

@ -49,6 +49,7 @@
(substitute* "Makefile" (substitute* "Makefile"
(("\\$\\(wildcard src/lib\\*/\\*.c\\)") (("\\$\\(wildcard src/lib\\*/\\*.c\\)")
"$(sort $(wildcard src/lib*/*.c))"))))))) "$(sort $(wildcard src/lib*/*.c))")))))))
(supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://skarnet.org/software/skalibs/") (home-page "https://skarnet.org/software/skalibs/")
(synopsis "Platform abstraction libraries for skarnet.org software") (synopsis "Platform abstraction libraries for skarnet.org software")
(description (description

4
gnu/packages/sqlite.scm
View file

@ -115,10 +115,10 @@ is in the public domain.")
(define-public sqlite-next (define-public sqlite-next
(package (package
(inherit sqlite) (inherit sqlite)
(version "3.40.0") (version "3.42.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (sqlite-uri version 2022)) (uri (sqlite-uri version 2022))
(sha256 (sha256
(base32 (base32
"1rw0i63822pdkb3a16sqj4jdcp5zg0ffjmi26mshqw6jfqh5acq3")))))) "19lc11fwl7jfv94hnjih0gr41jakz38ra23cbk5449vf3hbgvg3s"))))))

59
gnu/packages/statistics.scm
View file

@ -603,14 +603,14 @@ code for possible problems.")
(define-public r-foreign (define-public r-foreign
(package (package
(name "r-foreign") (name "r-foreign")
(version "0.8-84") (version "0.8-85")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "foreign" version)) (uri (cran-uri "foreign" version))
(sha256 (sha256
(base32 (base32
"0jc5r5wiqqbkni2xjdd24hic1xvfi151m9lnqhni52jnqw1g7v8p")))) "1azca97fhwb1pzgrjw2xscfh2k7bfryp6wjsdcx2y4h7305d4ych"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/foreign") (home-page "https://cran.r-project.org/web/packages/foreign")
(synopsis "Read data stored by other statistics software") (synopsis "Read data stored by other statistics software")
@ -1005,13 +1005,13 @@ non-estimable cases correctly.")
(define-public r-labeling (define-public r-labeling
(package (package
(name "r-labeling") (name "r-labeling")
(version "0.4.2") (version "0.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "labeling" version)) (uri (cran-uri "labeling" version))
(sha256 (sha256
(base32 "0rfikd9gy70b8qz87q9axcwv8nmn9mbxfdwypxi0sghpfs9df8p0")))) (base32 "1wk4wa1s8f17b5lf8vs5hxsmyadp2ccmyg4hamq7sdvlrk14yby6"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/labeling") (home-page "https://cran.r-project.org/web/packages/labeling")
(synopsis "Axis labeling algorithms") (synopsis "Axis labeling algorithms")
@ -1576,13 +1576,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.")
(define-public r-knitr (define-public r-knitr
(package (package
(name "r-knitr") (name "r-knitr")
(version "1.43") (version "1.44")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "knitr" version)) (uri (cran-uri "knitr" version))
(sha256 (sha256
(base32 (base32
"0g6m9s53qyf34ba4db97k31sxg2ikndfp747229sm6ilikmbla9x")))) "015ylljvx0q2himch4k813021nvh0l7p5x3aqdkj3w0ax8x8k3ki"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-evaluate r-highr r-xfun r-yaml)) (list r-evaluate r-highr r-xfun r-yaml))
@ -1827,13 +1827,13 @@ and printing capabilities than traditional data frames.")
(define-public r-dplyr (define-public r-dplyr
(package (package
(name "r-dplyr") (name "r-dplyr")
(version "1.1.2") (version "1.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "dplyr" version)) (uri (cran-uri "dplyr" version))
(sha256 (sha256
(base32 (base32
"1qwn00ai7k6km0z9kl6aa1qjkfz8j3prlgdfxr1pr5s47a5c6862")))) "0hhpzv66rqz7z8vdryzjdkp4flmjvzxrx1pwpxnbmjqgvd3s4hv8"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-cli (list r-cli
@ -2963,13 +2963,13 @@ well as additional utilities such as panel and axis annotation functions.")
(define-public r-rcpparmadillo (define-public r-rcpparmadillo
(package (package
(name "r-rcpparmadillo") (name "r-rcpparmadillo")
(version "0.12.6.1.0") (version "0.12.6.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "RcppArmadillo" version)) (uri (cran-uri "RcppArmadillo" version))
(sha256 (sha256
(base32 (base32
"0saga8anaahyrvvynggg168756rv8d9gyq8sryjgnx5pp4jbz6ck")))) "1k7xq2yl4pkc7krz1bcdnx5kfj6n4zjmnm40nly2da2ji87agv49"))))
(properties `((upstream-name . "RcppArmadillo"))) (properties `((upstream-name . "RcppArmadillo")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3837,13 +3837,13 @@ using the multicore functionality of the parallel package.")
extensions))))) extensions)))))
(package (package
(name "r-dt") (name "r-dt")
(version "0.28") (version "0.29")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "DT" version)) (uri (cran-uri "DT" version))
(sha256 (sha256
(base32 (base32
"0khdl21kvgi9k7dlpfshk1xz9bkly5lq6p41plfh4g2jv1yxaxfr")) "1b9qshrjv9xaak92rvg65vkak4pyci9js4j7nkfcg0p19ghnvlm8"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 match))) (ice-9 match)))
(snippet (snippet
@ -3917,6 +3917,7 @@ using the multicore functionality of the parallel package.")
(list r-crosstalk (list r-crosstalk
r-htmltools r-htmltools
r-htmlwidgets r-htmlwidgets
r-httpuv
r-jquerylib r-jquerylib
r-jsonlite r-jsonlite
r-magrittr r-magrittr
@ -4716,14 +4717,14 @@ distribution).")
(define-public r-rematch (define-public r-rematch
(package (package
(name "r-rematch") (name "r-rematch")
(version "1.0.1") (version "2.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rematch" version)) (uri (cran-uri "rematch" version))
(sha256 (sha256
(base32 (base32
"0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4")))) "09jwg3glp32q4ml4khhzi8j7bzg9zhqqdg1m6r8gibh756zzgnhm"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/MangoTheCat/rematch") (home-page "https://github.com/MangoTheCat/rematch")
(synopsis "Match regular expressions with a nicer API") (synopsis "Match regular expressions with a nicer API")
@ -4875,13 +4876,13 @@ package instead.")
(define-public r-hmisc (define-public r-hmisc
(package (package
(name "r-hmisc") (name "r-hmisc")
(version "5.1-0") (version "5.1-1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Hmisc" version)) (uri (cran-uri "Hmisc" version))
(sha256 (sha256
(base32 "0y10hnglid78gnaapmdy3ihjih4i2kvaycn2c60r2wr43nv7wl0q")))) (base32 "0laan26ja6m9k3spkk1ymalwb181ramzjq6ii3b0404xv2kfywa9"))))
(properties `((upstream-name . "Hmisc"))) (properties `((upstream-name . "Hmisc")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
@ -4896,9 +4897,9 @@ package instead.")
r-ggplot2 r-ggplot2
r-gridextra r-gridextra
r-gtable r-gtable
r-knitr
r-htmltable r-htmltable
r-htmltools r-htmltools
r-knitr
r-nnet r-nnet
r-rmarkdown r-rmarkdown
r-rpart r-rpart
@ -5585,14 +5586,14 @@ data for species delimitation, nearest neighbor based noise detection.")
(define-public r-deoptimr (define-public r-deoptimr
(package (package
(name "r-deoptimr") (name "r-deoptimr")
(version "1.1-1") (version "1.1-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "DEoptimR" version)) (uri (cran-uri "DEoptimR" version))
(sha256 (sha256
(base32 (base32
"1appp5xgayafda6f5pcdsxaskqs831rb21znx44r8nyb9gvg0f6z")))) "0swycypiyxkvhn1438q0wysz2c4ky6zjw89w62dggbciqwk8xdbq"))))
(properties `((upstream-name . "DEoptimR"))) (properties `((upstream-name . "DEoptimR")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/DEoptimR") (home-page "https://cran.r-project.org/web/packages/DEoptimR")
@ -5825,18 +5826,18 @@ showing the progress is useful e.g. bootstrap.")
(define-public r-minqa (define-public r-minqa
(package (package
(name "r-minqa") (name "r-minqa")
(version "1.2.5") (version "1.2.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "minqa" version)) (uri (cran-uri "minqa" version))
(sha256 (sha256
(base32 (base32
"1gpli7f3piz3jqjj63a6bk9v1jlygjdaqqqvqsr083crj0imd0wv")))) "0421b4ysslaqmdgwlz080abis8m4xkcvjq7lx1wywbsz1s2vi9si"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-rcpp)) (list r-rcpp))
(inputs (native-inputs
(list gfortran)) (list gfortran))
(home-page "https://optimizer.r-forge.r-project.org") (home-page "https://optimizer.r-forge.r-project.org")
(synopsis "Derivative-free optimization algorithms by quadratic approximation") (synopsis "Derivative-free optimization algorithms by quadratic approximation")
@ -7231,13 +7232,13 @@ Annealing\" @url{doi:10.1145/3025453.3025912}.")
(define-public r-lmom (define-public r-lmom
(package (package
(name "r-lmom") (name "r-lmom")
(version "2.9") (version "3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lmom" version)) (uri (cran-uri "lmom" version))
(sha256 (sha256
(base32 "145va4dhl767mywk36xcmqilm21sfkqhcqi0s07qgq3k39sn4gin")))) (base32 "1482kbb4cm65m2d1xlxml93yjd3d43iiap6nvzg5vd33i9iyh2jb"))))
(properties `((upstream-name . "lmom"))) (properties `((upstream-name . "lmom")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (list gfortran)) (native-inputs (list gfortran))
@ -7315,13 +7316,13 @@ Calculates confidence intervals for the difference in proportion.")
(define-public r-desctools (define-public r-desctools
(package (package
(name "r-desctools") (name "r-desctools")
(version "0.99.49") (version "0.99.50")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "DescTools" version)) (uri (cran-uri "DescTools" version))
(sha256 (sha256
(base32 "0s2zh8xz06c45rbwcypgsa8shby66nm6sj90cb9d1bwb60mws8j5")))) (base32 "1awfhbv7klvkwxki4lvxj086yiwqyys95jnss8q5qqn7wyfz170v"))))
(properties `((upstream-name . "DescTools"))) (properties `((upstream-name . "DescTools")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -7552,16 +7553,16 @@ generating and manipulating colors in R.")
(define-public r-reghelper (define-public r-reghelper
(package (package
(name "r-reghelper") (name "r-reghelper")
(version "1.1.1") (version "1.1.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "reghelper" version)) (uri (cran-uri "reghelper" version))
(sha256 (sha256
(base32 (base32
"0v1987rs6kcpizfhrp3hxsyx9arn5vsbapjfgj9478j73mm844ji")))) "1vd8kd719kyjp65zym6zx3vax1q2kbhpl6la71d5aa59s54ylri3"))))
(properties `((upstream-name . "reghelper"))) (properties `((upstream-name . "reghelper")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-ggplot2 r-lme4 r-mass r-nlme)) (propagated-inputs (list r-ggplot2 r-lme4 r-mass r-nlme r-rlang))
(home-page "https://github.com/jeff-hughes/reghelper") (home-page "https://github.com/jeff-hughes/reghelper")
(synopsis "Helper Functions for Regression Analysis") (synopsis "Helper Functions for Regression Analysis")
(description (description

8
gnu/packages/syncthing.scm
View file

@ -46,7 +46,7 @@
(define-public syncthing (define-public syncthing
(package (package
(name "syncthing") (name "syncthing")
(version "1.23.6") (version "1.23.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/syncthing/syncthing" (uri (string-append "https://github.com/syncthing/syncthing"
@ -54,7 +54,7 @@
"/syncthing-source-v" version ".tar.gz")) "/syncthing-source-v" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03myinspq61aiis29mq0xjigj5rh5jd8m0d9xakf43vi7pqgwjbc")))) "1891dqcsg5r034bw19qjm6qg0zi1g0djcllp2c550zq7v1sdvn0q"))))
(build-system go-build-system) (build-system go-build-system)
;; The primary Syncthing executable goes to "out", while the auxiliary ;; The primary Syncthing executable goes to "out", while the auxiliary
;; server programs and utility tools go to "utils". This reduces the size ;; server programs and utility tools go to "utils". This reduces the size
@ -64,7 +64,7 @@
(list #:modules '((srfi srfi-26) ; for cut (list #:modules '((srfi srfi-26) ; for cut
(guix build utils) (guix build utils)
(guix build go-build-system)) (guix build go-build-system))
#:go go-1.19 #:go go-1.20
#:import-path "github.com/syncthing/syncthing" #:import-path "github.com/syncthing/syncthing"
;; We don't need to install the source code for end-user applications. ;; We don't need to install the source code for end-user applications.
#:install-source? #f #:install-source? #f
@ -101,7 +101,7 @@
"stdisco" "stdiscosrv" "stevents" "stfileinfo" "stdisco" "stdiscosrv" "stevents" "stfileinfo"
"stfinddevice" "stfindignored" "stgenfiles" "stfinddevice" "stfindignored" "stgenfiles"
"strelaypoolsrv" "strelaysrv" "stsigtool" "strelaypoolsrv" "strelaysrv" "stsigtool"
"stvanity" "stwatchfile" "uraggregate" "ursrv"))))) "stvanity" "stwatchfile" "ursrv")))))
(add-after 'install 'install-docs (add-after 'install 'install-docs
(lambda _ (lambda _

29
gnu/packages/terminals.scm
View file

@ -35,6 +35,7 @@
;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org> ;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -629,23 +630,29 @@ should be thread-safe.")
(define-public libvterm (define-public libvterm
(package (package
(name "libvterm") (name "libvterm")
(version "0.3.1") (version "0.3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.leonerd.org.uk/code/libvterm/" (uri (string-append
"libvterm-" version ".tar.gz")) "https://launchpad.net/libvterm/trunk/v"
(version-major+minor version)
"/+download/libvterm-" version ".tar.gz"))
(sha256 (sha256
(base32 "15y3y23kfpcda7n79ym3gp1abzn8mshxrad8s3gnhls82nfava15")))) (base32 "1q16fbznm54p24hqvw8c9v3347apk86ybsxyghsbsa11vm1ny589"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list #:make-flags
(list "CC=gcc" #~(list
(string-append "PREFIX=" (assoc-ref %outputs "out"))) ;; FIXME: cross build fails.
#:test-target "test" ;; ld: src/.libs/encoding.o: error adding symbols: file in wrong format
#:phases ;; collect2: error: ld returned 1 exit status
(modify-phases %standard-phases (string-append "CC=" #$(cc-for-target))
(delete 'configure)))) (string-append "PREFIX=" #$output))
#:test-target "test"
#:phases
#~(modify-phases %standard-phases
(delete 'configure))))
(native-inputs (native-inputs
(list libtool perl)) (list libtool perl))
(home-page "https://www.leonerd.org.uk/code/libvterm/") (home-page "https://www.leonerd.org.uk/code/libvterm/")

8
gnu/packages/tor.scm
View file

@ -63,18 +63,20 @@
(define-public tor (define-public tor
(package (package
(name "tor") (name "tor")
(version "0.4.7.14") (version "0.4.8.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dist.torproject.org/tor-" (uri (string-append "https://dist.torproject.org/tor-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1y2xwrji1rvk6h0k15705yra5s74h72h2g84x02zr0338vv6gb55")))) "06g1awb4piqvgxa97pyswxgjzkpj8rx3iy2jbiaygvi99b8wymv9"))
(patches (search-patches "tor-remove-defensive-assert.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:configure-flags (list #:configure-flags
#~(list "--enable-lzma" #~(list "--enable-gpl"
"--enable-lzma"
"--enable-zstd") "--enable-zstd")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases

4
gnu/packages/upnp.scm
View file

@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.")
(define-public libupnp (define-public libupnp
(package (package
(name "libupnp") (name "libupnp")
(version "1.14.17") (version "1.14.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/pupnp/pupnp/releases/download" (uri (string-append "https://github.com/pupnp/pupnp/releases/download"
"/release-" version "/libupnp-" version".tar.bz2")) "/release-" version "/libupnp-" version".tar.bz2"))
(sha256 (sha256
(base32 "1yvgrfdhvsz6br3i7k37pigcw25rnzkxdx4sjizqqhm0xd1751wv")))) (base32 "1sywi1l0sc9s55hryfwqb5y5fhyyqx6ida5i7bk8m1p27klwx9qn"))))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(build-system gnu-build-system) (build-system gnu-build-system)

4
gnu/packages/video.scm
View file

@ -5255,7 +5255,7 @@ transcode or reformat the videos in any way, producing perfect backups.")
(define-public svt-av1 (define-public svt-av1
(package (package
(name "svt-av1") (name "svt-av1")
(version "1.3.0") (version "1.7.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -5264,7 +5264,7 @@ transcode or reformat the videos in any way, producing perfect backups.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0blnla32yz665bx0xyx8lrjs2wqd2xhpbqwwpz72mq7zf341j8vv")))) (base32 "1308g0nqxq65h76a7h91999cbglkwihgrpid64kdn0r9vh6399sq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; The test suite tries to download test data and git clone a 3rd-party ;; The test suite tries to download test data and git clone a 3rd-party

56
gnu/packages/vim.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr> ;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022, 2023 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> ;;; Copyright © 2022, 2023 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;; Copyright © 2023 Charles Jackson <charles.b.jackson@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,7 +31,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages vim) (define-module (gnu packages vim)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
@ -60,6 +61,7 @@
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -1113,6 +1115,58 @@ getting some of these features into Vim. It works with any REPL and isn't tied
to Lisp.") to Lisp.")
(license license:expat)))) (license license:expat))))
(define-public vim-vlime
;; The last tag is very outdated.
(let ((commit "c1ac16c1a50bec4c30da87cd4ce2af12e26fb022")
(revision "1"))
(package
(name "vim-vlime")
(version (git-version "0.4.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/vlime/vlime")
(commit commit)))
(sha256
(base32 "1dfc1wyjsgkckrklkzvk4whaz3ahaka59rvm7rc724mabmk83pmp"))
(file-name (git-file-name name version))))
(build-system copy-build-system)
(arguments
'(#:install-plan
'(("vim/autoload" "share/vim/vimfiles/")
("vim/doc" "share/vim/vimfiles/")
("vim/ftplugin" "share/vim/vimfiles/")
("vim/syntax" "share/vim/vimfiles/")
("vim/test" "share/vim/vimfiles/")
;; This is so the Vimscript part of Vlime can find the lisp files.
("lisp" "share/vim/")
;; This is so lisp can load Vlime without the Vim part.
("lisp" "share/common-lisp/source/vlime"))
#:phases
(modify-phases %standard-phases
;; Create a symbolic link to the .asd file so that
;; (asdf:load-system "vlime") finds the system.
(add-after 'install 'link-asd
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/common-lisp/systems/"))
(symlink (string-append out "/share/common-lisp/source/vlime/vlime.asd")
(string-append out "/share/common-lisp/systems/vlime.asd"))))))))
(propagated-inputs
(list cl-alexandria
cl-slime-swank
cl-usocket
cl-vom
cl-yason))
(home-page "https://github.com/vlime/vlime")
(synopsis "Common Lisp dev environment for Vim (and Neovim)")
(description "Vlime is similar to SLIME for Emacs and SLIMV for Vim. It
provides REPL integration, as well as omni-completions, cross reference
utilities, a nice inspector, debugger support, and many other great facilities
to aid you in your glorious Common Lisp hacking quest.")
(license license:expat))))
(define-public vim-paredit (define-public vim-paredit
;; The last tagged version is from August 2013. ;; The last tagged version is from August 2013.
(let ((commit "97d51d099523b37bb35cbcf3564cbfb46e66e4ec") (let ((commit "97d51d099523b37bb35cbcf3564cbfb46e66e4ec")

25
gnu/packages/virtualization.scm
View file

@ -385,6 +385,14 @@
(cut string-suffix? (cut string-suffix?
"-linux-user" <>)))))))) "-linux-user" <>))))))))
(add-before 'check 'set-SOCK_DIR
(lambda _
;; The default value for SOCK_DIR is TMPDIR, which can be long
;; in the build chroot (e.g.:
;; /tmp/guix-build-qemu-minimal-drv-0); set it to SOCK_DIR to
;; avoid using more than 109 characters for socket files (the
;; limit when using the kernel Linux).
(setenv "SOCK_DIR" "/tmp")))
(add-after 'install 'delete-firmwares (add-after 'install 'delete-firmwares
(lambda _ (lambda _
;; Delete firmares that are accessible on --firmwarepath. ;; Delete firmares that are accessible on --firmwarepath.
@ -542,14 +550,7 @@ server and embedded PowerPC, and S390 guests.")
#~(modify-phases #$phases #~(modify-phases #$phases
(delete 'configure-user-static) (delete 'configure-user-static)
(delete 'build-user-static) (delete 'build-user-static)
(delete 'install-user-static) (delete 'install-user-static)))))
(add-after 'disable-unusable-tests 'disable-extra-tests
(lambda _
;; Interesting, the iothreads-commit-active test only fails in
;; qemu-minimal, not the complete variant (see:
;; https://gitlab.com/qemu-project/qemu/-/issues/1855).
(delete-file
"tests/qemu-iotests/tests/iothreads-commit-active")))))))
;; Remove dependencies on optional libraries, notably GUI libraries. ;; Remove dependencies on optional libraries, notably GUI libraries.
(native-inputs (filter (lambda (input) (native-inputs (filter (lambda (input)
@ -668,7 +669,13 @@ firmware blobs. You can
"ganeti-shepherd-master-failover.patch" "ganeti-shepherd-master-failover.patch"
"ganeti-haskell-pythondir.patch" "ganeti-haskell-pythondir.patch"
"ganeti-pyyaml-compat.patch" "ganeti-pyyaml-compat.patch"
"ganeti-disable-version-symlinks.patch")))) "ganeti-procps-compat.patch"
"ganeti-disable-version-symlinks.patch"
"ganeti-lens-compat.patch"
"ganeti-template-haskell-2.17.patch"
"ganeti-template-haskell-2.18.patch"
"ganeti-reorder-arbitrary-definitions.patch"
"ganeti-relax-dependencies.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%gnu-build-system-modules

4
gnu/packages/web-browsers.scm
View file

@ -586,7 +586,7 @@ driven and does not detract you from your daily work.")
(define-public nyxt (define-public nyxt
(package (package
(name "nyxt") (name "nyxt")
(version "3.6.1") (version "3.7.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -595,7 +595,7 @@ driven and does not detract you from your daily work.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0gf4akrkp15c3z3v3i5c94ga282ygqxb0rqxwm9ivchby0xv9lmd")) "0mar3y69b62jby4kfdsm2xsnb830v1d468zspa3frpnphwxv4a5y"))
(file-name (git-file-name "nyxt" version)) (file-name (git-file-name "nyxt" version))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet

4
gnu/packages/web.scm
View file

@ -6110,13 +6110,13 @@ deployments.")
(package (package
(name "varnish") (name "varnish")
(home-page "https://varnish-cache.org/") (home-page "https://varnish-cache.org/")
(version "7.2.1") (version "7.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append home-page "_downloads/varnish-" version ".tgz")) (uri (string-append home-page "_downloads/varnish-" version ".tgz"))
(sha256 (sha256
(base32 (base32
"0h590kr7rhp57a4kfx6apyvqk60w78qdjwpr6g2ikv5840bpv4sd")))) "1rsay4vrg0dvf8d7bpj8dvaax4v949p6x1l6qd3hdabhq87bpnz2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")

4
gnu/packages/wm.scm
View file

@ -789,7 +789,7 @@ desktop environment.")
(define-public icewm (define-public icewm
(package (package
(name "icewm") (name "icewm")
(version "3.3.4") (version "3.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -797,7 +797,7 @@ desktop environment.")
version "/icewm-" version ".tar.lz")) version "/icewm-" version ".tar.lz"))
(sha256 (sha256
(base32 (base32
"124w00yq35mj859nf321bpy36ij7a0kblcg95axxahz4l6fhxfxf")))) "0fr79i6r2sjr27lv4wik8lvcnrrapd28lzhy4gnqffzds0sqx64r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list fontconfig (inputs (list fontconfig

4
gnu/packages/xfce.scm
View file

@ -1082,7 +1082,7 @@ features playback of local media files, DVD/CD and live streams.")
(define-public xfce4-terminal (define-public xfce4-terminal
(package (package
(name "xfce4-terminal") (name "xfce4-terminal")
(version "1.0.4") (version "1.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/" name "/" (uri (string-append "https://archive.xfce.org/src/apps/" name "/"
@ -1090,7 +1090,7 @@ features playback of local media files, DVD/CD and live streams.")
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1x5saijxykxmn2hksf4qvaj965b6i0wy62z9hgrc2vvwmxbmkrbq")))) "18yl792x617qa90g6caw4cy1arfl847majjxkxs0k6rb4ivk70j0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

2
gnu/services/cgit.scm
View file

@ -581,7 +581,7 @@ removed for the URL and name.")
(string "a fast webinterface for the git dscm") (string "a fast webinterface for the git dscm")
"Text printed below the heading on the repository index page.") "Text printed below the heading on the repository index page.")
(root-readme (root-readme
(string "") (file-object "")
"The content of the file specified with this option will be included "The content of the file specified with this option will be included
verbatim below the \"about\" link on the repository index page.") verbatim below the \"about\" link on the repository index page.")
(root-title (root-title

127
gnu/services/guix.scm
View file

@ -140,7 +140,17 @@
nar-herder-cached-compression-configuration-type nar-herder-cached-compression-configuration-type
nar-herder-cached-compression-configuration-level nar-herder-cached-compression-configuration-level
nar-herder-cached-compression-configuration-directory nar-herder-cached-compression-configuration-directory
nar-herder-cached-compression-configuration-directory-max-size)) nar-herder-cached-compression-configuration-directory-max-size
bffe-configuration
bffe-configuration?
bffe-configuration-package
bffe-configuration-user
bffe-configuration-group
bffe-configuration-arguments
bffe-configuration-extra-environment-variables
bffe-service-type))
;;;; Commentary: ;;;; Commentary:
;;; ;;;
@ -1030,3 +1040,118 @@ ca-certificates.crt file in the system profile."
nar-herder-account))) nar-herder-account)))
(description (description
"Run a Nar Herder server."))) "Run a Nar Herder server.")))
;;;
;;; Build Farm Front-end (BFFE)
;;;
(define-record-type* <bffe-configuration>
bffe-configuration make-bffe-configuration
bffe-configuration?
(package bffe-configuration-package
(default bffe))
(user bffe-configuration-user
(default "bffe"))
(group bffe-configuration-group
(default "bffe"))
(arguments bffe-configuration-arguments)
(extra-environment-variables
bffe-configuration-extra-environment-variables
(default '())))
(define (bffe-shepherd-services config)
(define bffe-package
(bffe-configuration-package config))
(define start-script
(program-file
"run-bffe"
(with-extensions (cons
bffe-package
;; This is a poorly constructed Guile load path,
;; since it contains things that aren't Guile
;; libraries, but it means that the Guile
;; libraries needed for BFFE don't need to be
;; individually specified here.
(map second (package-transitive-propagated-inputs
bffe-package)))
#~(begin
(use-modules (bffe)
(bffe manage-builds))
(setvbuf (current-output-port) 'line)
(setvbuf (current-error-port) 'line)
(simple-format #t "starting the bffe:\n ~A\n"
(current-filename))
(apply run-bffe-service
(append
(list #:pid-file "/var/run/bffe/pid")
#$(bffe-configuration-arguments config)))))
#:guile (lookup-package-native-input bffe-package "guile-next")))
(match-record config <bffe-configuration>
(package user group arguments extra-environment-variables)
(list
(shepherd-service
(documentation "Build Farm Front-end")
(provision '(bffe))
(requirement '(networking))
(start #~(make-forkexec-constructor
(list #$start-script)
#:user #$user
#:group #$group
#:pid-file "/var/run/bffe/pid"
#:directory "/var/lib/bffe"
#:environment-variables
`(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8"
#$@extra-environment-variables)
#:log-file "/var/log/bffe/server.log"))
(stop #~(make-kill-destructor))))))
(define (bffe-activation config)
#~(begin
(use-modules (guix build utils))
(define %user
(getpw #$(bffe-configuration-user config)))
(chmod "/var/lib/bffe" #o755)
(mkdir-p "/var/log/bffe")
;; Allow writing the PID file
(mkdir-p "/var/run/bffe")
(chown "/var/run/bffe" (passwd:uid %user) (passwd:gid %user))))
(define (bffe-account config)
(match-record config <bffe-configuration>
(user group)
(list (user-group
(name group)
(system? #t))
(user-account
(name user)
(group group)
(system? #t)
(comment "BFFE user")
(home-directory "/var/lib/bffe")
(shell (file-append shadow "/sbin/nologin"))))))
(define bffe-service-type
(service-type
(name 'bffe)
(extensions
(list (service-extension shepherd-root-service-type
bffe-shepherd-services)
(service-extension activation-service-type
bffe-activation)
(service-extension account-service-type
bffe-account)))
(description
"Run the Build Farm Front-end.")))

1
gnu/services/networking.scm
View file

@ -1709,6 +1709,7 @@ simulation."
(ovs-vswitchd (file-append package "/sbin/ovs-vswitchd"))) (ovs-vswitchd (file-append package "/sbin/ovs-vswitchd")))
(list (shepherd-service (list (shepherd-service
(provision '(ovsdb)) (provision '(ovsdb))
(requirement '(user-processes))
(documentation "Run the Open vSwitch database server.") (documentation "Run the Open vSwitch database server.")
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$ovsdb-server "--pidfile" (list #$ovsdb-server "--pidfile"

2
gnu/services/vpn.scm
View file

@ -820,7 +820,7 @@ strongSwan.")))
(format #f "~@[ListenPort = ~a~]" #$port) (format #f "~@[ListenPort = ~a~]" #$port)
#$@(if (null? dns) #$@(if (null? dns)
'() '()
(list (format #f "~{DNS = ~{~a~^, ~}" dns))))) (list (format #f "DNS = ~{~a~^, ~}" dns)))))
(mkdir #$output) (mkdir #$output)
(chdir #$output) (chdir #$output)

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