amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into gnome-team

Browse source
This commit is contained in:
Liliana Marie Prikler 2024-02-25 10:28:03 +01:00
commit 7bf4ce4582
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
105 changed files with 11027 additions and 5082 deletions
Download patch file Download diff file Expand all files Collapse all files

87
doc/guix.texi
View file

@ -124,6 +124,7 @@ Copyright @copyright{} 2023 Thomas Ieong@*
Copyright @copyright{} 2023 Saku Laesvuori@* Copyright @copyright{} 2023 Saku Laesvuori@*
Copyright @copyright{} 2023 Graham James Addis@* Copyright @copyright{} 2023 Graham James Addis@*
Copyright @copyright{} 2023 Tomas Volf@* Copyright @copyright{} 2023 Tomas Volf@*
Copyright @copyright{} 2024 Herman Rimm@*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -732,14 +733,17 @@ ready to use it.
@cindex installing Guix from binaries @cindex installing Guix from binaries
@cindex installer script @cindex installer script
This section describes how to install Guix on an arbitrary system from a This section describes how to install Guix from a self-contained tarball
self-contained tarball providing binaries for Guix and for all its providing binaries for Guix and for all its dependencies. This is often
dependencies. This is often quicker than installing from source, which quicker than installing from source, which is described in the next
is described in the next sections. The only requirement is to have sections. Binary installation requires a system using a Hurd or Linux
GNU@tie{}tar and Xz. kernel; the GNU@tie{}tar and Xz commands must also be available.
@quotation Important
This section only applies to systems without Guix. Following it for
existing Guix installations will overwrite important system files.
@c Note duplicated from the ``Installation'' node. @c Note duplicated from the ``Installation'' node.
@quotation Note
We recommend the use of this We recommend the use of this
@uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh,
shell installer script}. The script automates the download, installation, and shell installer script}. The script automates the download, installation, and
@ -14183,12 +14187,21 @@ is a package definition, or a template thereof, in the format we know
The general syntax is: The general syntax is:
@example @example
guix import @var{importer} @var{options}@dots{} guix import [@var{global-options}@dots{}] @var{importer} @var{package} [@var{options}@dots{}]
@end example @end example
@var{importer} specifies the source from which to import package @var{importer} specifies the source from which to import package
metadata, and @var{options} specifies a package identifier and other metadata, and @var{options} specifies a package identifier and other
options specific to @var{importer}. options specific to @var{importer}. @command{guix import} itself has the
following @var{global-options}:
@table @code
@item --insert=@var{file}
@itemx -i @var{file}
Insert the package definition(s) that the @var{importer} generated into the
specified @var{file}, either in alphabetical order among existing package
definitions, or at the end of the file otherwise.
@end table
Some of the importers rely on the ability to run the @command{gpgv} command. Some of the importers rely on the ability to run the @command{gpgv} command.
For these, GnuPG must be installed and in @code{$PATH}; run @code{guix install For these, GnuPG must be installed and in @code{$PATH}; run @code{guix install
@ -14339,7 +14352,7 @@ statistical and graphical environment}.
Information is extracted from the @file{DESCRIPTION} file of the package. Information is extracted from the @file{DESCRIPTION} file of the package.
The command command below imports metadata for the Cairo R package: The command below imports metadata for the Cairo R package:
@example @example
guix import cran Cairo guix import cran Cairo
@ -14399,10 +14412,10 @@ Information about the package is obtained from the TeX Live package
database, a plain text file that is included in the database, a plain text file that is included in the
@code{texlive-scripts} package. The source code is downloaded from @code{texlive-scripts} package. The source code is downloaded from
possibly multiple locations in the SVN repository of the Tex Live possibly multiple locations in the SVN repository of the Tex Live
project. project. Note that therefore SVN must be installed and in @code{$PATH};
run @code{guix install subversion} if needed.
The command command below imports metadata for the @code{fontspec} The command below imports metadata for the @code{fontspec} TeX package:
TeX package:
@example @example
guix import texlive fontspec guix import texlive fontspec
@ -31898,6 +31911,50 @@ Additional arguments to pass to the @command{varnishd} process.
@end table @end table
@end deftp @end deftp
@subheading Whoogle Search
@cindex Whoogle Search
@uref{https://github.com/benbusby/whoogle-search, Whoogle Search} is a
self-hosted, ad-free, privacy-respecting meta search engine that collects
and displays Google search results. By default, you can configure it by
adding this line to the @code{services} field of your operating system
declaration:
@lisp
(service whoogle-service-type)
@end lisp
As a result, Whoogle Search runs as local Web server, which you can
access by opening @indicateurl{http://localhost:5000} in your browser.
The configuration reference is given below.
@defvar whoogle-service-type
Service type for Whoogle Search. Its value must be a
@code{whoogle-configuration} record---see below.
@end defvar
@deftp {Data Type} whoogle-configuration
Data type representing Whoogle Search service configuration.
@table @asis
@item @code{package} (default: @code{whoogle-search})
The Whoogle Search package to use.
@item @code{host} (default: @code{"127.0.0.1"})
The host address to run Whoogle on.
@item @code{port} (default: @code{5000})
The port where Whoogle will be exposed.
@item @code{environment-variables} (default: @code{'()})
A list of strings with the environment variables to configure Whoogle.
You can consult
@uref{https://github.com/benbusby/whoogle-search/blob/main/whoogle.template.env,
its environment variables template} for the list of available options.
@end table
@end deftp
@subsubheading Patchwork @subsubheading Patchwork
@cindex Patchwork @cindex Patchwork
Patchwork is a patch tracking system. It can collect patches sent to a Patchwork is a patch tracking system. It can collect patches sent to a
@ -36431,7 +36488,11 @@ set to a date several years in the past, and on a CPU model that
corresponds to that date---a model possibly older than that of your corresponds to that date---a model possibly older than that of your
machine. This lets you rebuild today software from the past that would machine. This lets you rebuild today software from the past that would
otherwise fail to build due to a time trap or other issues in its build otherwise fail to build due to a time trap or other issues in its build
process. process. You can view the VM's config like this:
@example
herd configuration build-vm
@end example
You can configure the build VM, as in this example: You can configure the build VM, as in this example:

6
doc/package-hello.json
View file

@ -6,7 +6,7 @@
"build-system": "gnu", "build-system": "gnu",
"arguments": { "arguments": {
"tests?": false "tests?": false
} },
"home-page": "https://www.gnu.org/software/hello/", "home-page": "https://www.gnu.org/software/hello/",
"synopsis": "Hello, GNU world: An example GNU package", "synopsis": "Hello, GNU world: An example GNU package",
"description": "GNU Hello prints a greeting.", "description": "GNU Hello prints a greeting.",
@ -16,11 +16,11 @@
{ {
"name": "greeter", "name": "greeter",
"version": "1.0", "version": "1.0",
"source": "https://example.com/greeter-1.0.tar.gz", "source": "mirror://gnu/hello/hello-2.10.tar.gz",
"build-system": "gnu", "build-system": "gnu",
"arguments": { "arguments": {
"test-target": "foo", "test-target": "foo",
"parallel-build?": false, "parallel-build?": false
}, },
"home-page": "https://example.com/", "home-page": "https://example.com/",
"synopsis": "Greeter using GNU Hello", "synopsis": "Greeter using GNU Hello",

11
etc/teams.scm
View file

@ -8,7 +8,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
!# !#
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2022-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
@ -176,6 +176,13 @@ and the r-build-system."
"guix/scripts/import/cran.scm" "guix/scripts/import/cran.scm"
"tests/cran.scm"))) "tests/cran.scm")))
(define-team sugar
(team 'sugar
#:name "Sugar team"
#:description
"Everything related to the Sugar Desktop and learning environment."
#:scope (list "gnu/packages/sugar.scm")))
(define-team telephony (define-team telephony
(team 'telephony (team 'telephony
#:name "Telephony team" #:name "Telephony team"
@ -627,7 +634,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
(define-member (person "Ricardo Wurmus" (define-member (person "Ricardo Wurmus"
"rekado@elephly.net") "rekado@elephly.net")
r core mentors tex) core mentors r sugar tex)
(define-member (person "Christopher Baines" (define-member (person "Christopher Baines"
"guix@cbaines.net") "guix@cbaines.net")

2
gnu/build/activation.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -408,6 +409,7 @@ improvement."
(format #t "making '~a' the current system...~%" system) (format #t "making '~a' the current system...~%" system)
(mkdir-p "/run")
;; Atomically make SYSTEM current. ;; Atomically make SYSTEM current.
(let ((new (string-append %current-system ".new"))) (let ((new (string-append %current-system ".new")))
(symlink system new) (symlink system new)

9
gnu/build/file-systems.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net> ;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1021,8 +1022,8 @@ were found."
(define (canonicalize-device-spec spec) (define (canonicalize-device-spec spec)
"Return the device name corresponding to SPEC, which can be a <uuid>, a "Return the device name corresponding to SPEC, which can be a <uuid>, a
<file-system-label>, or a string (typically a /dev file name or an nfs-root <file-system-label>, the string 'none' or another string (typically a /dev
containing ':/')." file name or an nfs-root containing ':/')."
(define max-trials (define max-trials
;; Number of times we retry partition label resolution, 1 second per ;; Number of times we retry partition label resolution, 1 second per
;; trial. Note: somebody reported a delay of 16 seconds (!) before their ;; trial. Note: somebody reported a delay of 16 seconds (!) before their
@ -1046,8 +1047,8 @@ containing ':/')."
(match spec (match spec
((? string?) ((? string?)
(if (string-contains spec ":/") (if (or (string-contains spec ":/") (string=? spec "none"))
spec ; do not resolve NFS devices spec ; do not resolve NFS / tmpfs devices
;; Nothing to do, but wait until SPEC shows up. ;; Nothing to do, but wait until SPEC shows up.
(resolve identity spec identity))) (resolve identity spec identity)))
((? file-system-label?) ((? file-system-label?)

3
gnu/build/install.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2013-2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -134,8 +135,6 @@ STORE."
(directory "/var/guix/gcroots") (directory "/var/guix/gcroots")
(directory "/var/empty") ; for no-login accounts (directory "/var/empty") ; for no-login accounts
(directory "/var/db") ; for dhclient, etc. (directory "/var/db") ; for dhclient, etc.
(directory "/var/run")
(directory "/run")
(directory "/mnt") (directory "/mnt")
(directory "/var/guix/profiles/per-user/root" 0 0) (directory "/var/guix/profiles/per-user/root" 0 0)

7
gnu/home/services/symlink-manager.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -157,6 +158,12 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
#t #t
(G_ "Skipping ~a (not an empty directory)... done\n") (G_ "Skipping ~a (not an empty directory)... done\n")
directory)) directory))
;; This happens when the directory is a mounted device.
((= EBUSY errno)
(format
#t
(G_ "Skipping ~a (underlying device is busy)... done\n")
directory))
((= ENOENT errno) #t) ((= ENOENT errno) #t)
((= ENOTDIR errno) #t) ((= ENOTDIR errno) #t)
(else (else

5
gnu/local.mk
View file

@ -937,7 +937,6 @@ dist_patch_DATA = \
%D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aria2-unbundle-wslay.patch \ %D%/packages/patches/aria2-unbundle-wslay.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/asli-use-system-libs.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 \
@ -1313,6 +1312,7 @@ dist_patch_DATA = \
%D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/git-filter-repo-generate-doc.patch \
%D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/gklib-suitesparse.patch \
%D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-appinfo-watch.patch \
%D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glib-skip-failing-test.patch \
@ -1981,6 +1981,7 @@ dist_patch_DATA = \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch \ %D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch \
%D%/packages/patches/r-sapa-lapack.patch \ %D%/packages/patches/r-sapa-lapack.patch \
%D%/packages/patches/r-sgloptim.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \
%D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \
@ -1990,6 +1991,7 @@ dist_patch_DATA = \
%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 \
%D%/packages/patches/restartd-update-robust.patch \
%D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
%D%/packages/patches/rng-tools-revert-build-randstat.patch \ %D%/packages/patches/rng-tools-revert-build-randstat.patch \
%D%/packages/patches/rocclr-5.6.0-enable-gfx800.patch \ %D%/packages/patches/rocclr-5.6.0-enable-gfx800.patch \
@ -2183,6 +2185,7 @@ dist_patch_DATA = \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \
%D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
%D%/packages/patches/wlroots-hwdata-fallback.patch \
%D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmctrl-64-fix.patch \
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
%D%/packages/patches/wordnet-CVE-2008-2149.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \

5
gnu/machine/ssh.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2024 Ricardo <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -537,6 +538,8 @@ failed to switch systems while deploying '~a':~%~{~s ~}")
host host
(inferior-exception-arguments c)))) (inferior-exception-arguments c))))
os)) os))
(parameterize ((%current-system system)
(%current-target-system #f))
(with-roll-back #t (with-roll-back #t
(mbegin %store-monad (mbegin %store-monad
(upgrade-shepherd-services (eval/error-handling c (upgrade-shepherd-services (eval/error-handling c
@ -552,7 +555,7 @@ an error occurred while upgrading services on '~a':~%~{~s ~}~%")
failed to install bootloader on '~a':~%~{~s ~}~%") failed to install bootloader on '~a':~%~{~s ~}~%")
host host
(inferior-exception-arguments c)))) (inferior-exception-arguments c))))
bootloader-configuration bootcfg)))))))) bootloader-configuration bootcfg)))))))))
;;; ;;;

85
gnu/packages/admin.scm
View file

@ -62,6 +62,8 @@
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Tobias Kortkamp <tobias.kortkamp@gmail.com> ;;; Copyright © 2023 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -151,6 +153,7 @@
#:use-module (gnu packages mcrypt) #:use-module (gnu packages mcrypt)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages nettle)
#: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 package-management)
@ -5843,6 +5846,57 @@ up services to use only two factor, or public/private authentication
mechanisms if you really want to protect services.") mechanisms if you really want to protect services.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public restartd
(let* ((commit "7044125ac55056f2663536f7137170edf92ebd75")
;; Version is 0.2.4 in the version file in the repo
;; but not in github tags.
;; It is released as 0.2.3-1.1 for other distributions.
;; Probably because of the lack of activity upstream.
(revision "1"))
(package
(name "restartd")
(version (git-version "0.2.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ajraymond/restartd")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1m1np00b4zvvwx63gzysbi38i5vj1jsjvh2s0p9czl6dzyz582z0"))
(patches (search-patches "restartd-update-robust.patch"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f ; no tests
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda _
(install-file "restartd.conf" (string-append #$output "/etc"))
(install-file "restartd" (string-append #$output "/sbin"))
(install-file "restartd.8"
(string-append #$output "/share/man/man8"))
(mkdir-p (string-append #$output "/share/man/fr/man8"))
(copy-file
"restartd.fr.8"
(string-append #$output "/share/man/fr/man8/restartd.8")))))))
(home-page "https://launchpad.net/debian/+source/restartd")
(synopsis "Daemon for restarting processes")
(description "This package provides a daemon for checking running and
not running processes. It reads the @file{/proc} directory every @var{n}
seconds and does a POSIX regexp on the process names. The daemon runs a
user-provided script when it detects a program in the running processes, or an
alternate script if it doesn't detect the program. The daemon can only be
called by the root user, but can use @command{sudo -u user} in the process
called if needed.")
(license license:gpl2+))))
(define-public rex (define-public rex
(package (package
(name "rex") (name "rex")
@ -6067,3 +6121,34 @@ breadth-first rather than depth-first. It is otherwise compatible with many
versions of @command{find}, including POSIX, GNU, and *BSD find.") versions of @command{find}, including POSIX, GNU, and *BSD find.")
(home-page "https://tavianator.com/projects/bfs.html") (home-page "https://tavianator.com/projects/bfs.html")
(license license:bsd-0))) (license license:bsd-0)))
(define-public rdfind
(package
(name "rdfind")
(version "1.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://rdfind.pauldreik.se/" name "-" version
".tar.gz"))
(sha256
(base32 "0y9j1w3nbgjks0k4kgm6qq92yrwgv66n212ncmlmhsl8y676wh3s"))))
(build-system gnu-build-system)
(native-inputs (list which))
(inputs (list nettle))
(arguments
(list
#:phases #~(modify-phases %standard-phases
(add-before 'check 'patch-tests
(lambda _
(display (which "echo"))
(substitute* "testcases/common_funcs.sh"
(("/bin/echo")
(which "echo"))))))))
(home-page "https://rdfind.pauldreik.se")
(synopsis "Find duplicate files")
(description
"Rdfind is a command line tool that finds duplicate files based on
their content instead of their file names. It is useful for compressing
backup directories or just finding duplicate files.")
(license license:gpl2+)))

35
gnu/packages/android.scm
View file

@ -36,6 +36,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system android-ndk) #:use-module (guix build-system android-ndk)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -1224,6 +1225,36 @@ connected devices via ADB.")
(home-page "https://github.com/mvdan/fdroidcl") (home-page "https://github.com/mvdan/fdroidcl")
(license license:bsd-3))) (license license:bsd-3)))
(define-public emacs-fdroid
(package
(name "emacs-fdroid")
(version "0.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/migalmoreno/fdroid.el")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1gv4kfir12bbi17cm5hpx197m8dbw1xwqp0z6qb3vc0fdnyis35j"))))
(build-system emacs-build-system)
(arguments
(list
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-file-name
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "fdroid.el"
("fdroid-program"
(search-input-file inputs "/bin/fdroidcl"))))))))
(inputs (list fdroidcl))
(home-page "https://github.com/migalmoreno/fdroid.el")
(synopsis "Manage F-Droid packages from Emacs")
(description "This package is an Emacs interface to F-Droid. Its purpose
is to aid in the management of F-Droid packages for an Android device or an
emulator inside the comfort of Emacs.")
(license license:gpl3+)))
(define-public enjarify (define-public enjarify
(package (package
(name "enjarify") (name "enjarify")
@ -1277,7 +1308,7 @@ Java bytecode, which simplifies the analysis of Android applications.")
(define-public android-file-transfer (define-public android-file-transfer
(package (package
(name "android-file-transfer") (name "android-file-transfer")
(version "4.2") (version "4.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1287,7 +1318,7 @@ Java bytecode, which simplifies the analysis of Android applications.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b")))) "1ianph8ivj0fxg1l7llid7gv4pbfb5j23b33j9gan6x7scr13q2h"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f)) ;there are no tests (list #:tests? #f)) ;there are no tests

3433
gnu/packages/aux-files/linux-libre/6.7-arm.conf
View file

File diff suppressed because it is too large Load diff

2930
gnu/packages/aux-files/linux-libre/6.7-arm64.conf
View file

File diff suppressed because it is too large Load diff

22
gnu/packages/aux-files/renpy/renpy.in
View file

@ -37,7 +37,27 @@ def path_to_saves(gamedir, save_directory=None):
if not save_directory: if not save_directory:
return gamedir + "/saves" return gamedir + "/saves"
return os.path.join(os.path.expanduser("~/.renpy"), save_directory) prefix = os.environ.get("RENPY_PATH_TO_SAVES",
os.path.expanduser("~/.renpy"))
return os.path.join(prefix, save_directory)
def path_to_logdir(basedir):
return basedir
def predefined_searchpath(commondir):
import renpy
# The default gamedir, in private.
searchpath = [ renpy.config.gamedir ]
if env_searchpath := os.environ.get("RENPY_SEARCHPATH"):
searchpath.extend(env_searchpath.split("::"))
if commondir and os.path.isdir(commondir):
searchpath.append(commondir)
return searchpath
def main(): def main():
try: try:

3
gnu/packages/backup.scm
View file

@ -74,6 +74,7 @@
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web) #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
@ -1347,7 +1348,7 @@ compression parameters used by Gzip.")
(invoke "pytest"))))))) (invoke "pytest")))))))
(inputs (inputs
(list borg python-colorama python-jsonschema python-requests (list borg python-colorama python-jsonschema python-requests
python-ruamel.yaml)) python-ruamel.yaml-0.16))
(native-inputs (native-inputs
(list python-flexmock python-pytest python-pytest-cov)) (list python-flexmock python-pytest python-pytest-cov))
(home-page "https://torsion.org/borgmatic/") (home-page "https://torsion.org/borgmatic/")

24
gnu/packages/bioconductor.scm
View file

@ -3413,13 +3413,13 @@ to understand their data better and discover new insights.")
(define-public r-annotationhubdata (define-public r-annotationhubdata
(package (package
(name "r-annotationhubdata") (name "r-annotationhubdata")
(version "1.32.0") (version "1.32.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "AnnotationHubData" version)) (uri (bioconductor-uri "AnnotationHubData" version))
(sha256 (sha256
(base32 "0jkz65z7l9vaxid6vpsr4rdavarkayfrgkybzhwf9va82jsnkd3z")))) (base32 "09x2njf32lvj2irpjffjn2bsh42zkchirb7779xfyh745iis57mm"))))
(properties `((upstream-name . "AnnotationHubData"))) (properties `((upstream-name . "AnnotationHubData")))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
@ -7563,13 +7563,13 @@ global-scaling and full-quantile normalization.")
(define-public r-edger (define-public r-edger
(package (package
(name "r-edger") (name "r-edger")
(version "4.0.14") (version "4.0.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "edgeR" version)) (uri (bioconductor-uri "edgeR" version))
(sha256 (sha256
(base32 (base32
"1a0icqi1im4vw2r6wjc5ibjsci7yqcdhk8bn8kyvsp1ld1ri538n")))) "08fsb0h4kqm31ynrhxinmnwjyij1350v352411q11iv8v9sk4z48"))))
(properties `((upstream-name . "edgeR"))) (properties `((upstream-name . "edgeR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -9981,13 +9981,13 @@ analysis of TCR repertoire libraries based on theoretical model fits.")
(define-public r-pscbs (define-public r-pscbs
(package (package
(name "r-pscbs") (name "r-pscbs")
(version "0.66.0") (version "0.67.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "PSCBS" version)) (uri (cran-uri "PSCBS" version))
(sha256 (sha256
(base32 "14rs2wywipbkia3dbzfhpnkmfgdvm2bf586lggsx63sywlv5d02q")))) (base32 "1gnd2nkh587dqpnbk5fsai7hx261vm405550rhlxffvs366x3596"))))
(properties `((upstream-name . "PSCBS"))) (properties `((upstream-name . "PSCBS")))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
@ -13532,13 +13532,13 @@ information.")
(define-public r-glmgampoi (define-public r-glmgampoi
(package (package
(name "r-glmgampoi") (name "r-glmgampoi")
(version "1.14.2") (version "1.14.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "glmGamPoi" version)) (uri (bioconductor-uri "glmGamPoi" version))
(sha256 (sha256
(base32 (base32
"1swbp560ss5sksf1m10c6md4b81yc9qwa6in64j4zzksmrn9jn2d")))) "0lbsavr9mhka8s7i056h4jjb1v36v3sshrhdz74n8qadm7fy59l5"))))
(properties `((upstream-name . "glmGamPoi"))) (properties `((upstream-name . "glmGamPoi")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -19507,14 +19507,14 @@ populations, splice site strength, conservation, etc.")
(define-public r-variancepartition (define-public r-variancepartition
(package (package
(name "r-variancepartition") (name "r-variancepartition")
(version "1.32.2") (version "1.32.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "variancePartition" version)) (uri (bioconductor-uri "variancePartition" version))
(sha256 (sha256
(base32 (base32
"0cmcg39a5939y517vhvwanqh1fwzyx6pbq47nc5cpswf7pn9cv5x")))) "1mbjh1n13y08mc8vdm10lsd3i7mc4vm3855lvm08fm9685siz909"))))
(properties (properties
`((upstream-name . "variancePartition"))) `((upstream-name . "variancePartition")))
(build-system r-build-system) (build-system r-build-system)
@ -22129,13 +22129,13 @@ variable and significantly correlated genes.")
(define-public r-sparsearray (define-public r-sparsearray
(package (package
(name "r-sparsearray") (name "r-sparsearray")
(version "1.2.3") (version "1.2.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "SparseArray" version)) (uri (bioconductor-uri "SparseArray" version))
(sha256 (sha256
(base32 "19cy1nmmi65fxh012ymgp1kg112yl1m0khcs4y034p5iwlfv7fp6")))) (base32 "0gz1j8g020bp88i5idrhj9qrixgar3wvxxna46ds60q6d8lsn4vi"))))
(properties `((upstream-name . "SparseArray"))) (properties `((upstream-name . "SparseArray")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-biocgenerics (propagated-inputs (list r-biocgenerics

276
gnu/packages/bioinformatics.scm
View file

@ -2525,6 +2525,70 @@ Python.")
;; licensed lgpl2.1+ ;; licensed lgpl2.1+
(license (list license:expat license:lgpl2.1+)))) (license (list license:expat license:lgpl2.1+))))
(define-public python-ega-download-client
(package
(name "python-ega-download-client")
(version "5.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/EGA-archive/ega-download-client")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0k9rfq2yyvfxs5sq9lsm8krp9ddx4s18hv85ikf3b37zv24kpwjk"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list
;; These tests fail because they require internet access.
"--ignore=tests/functional/test_download.py"
"--ignore=tests/functional/test_htsget.py"
"-k"
(string-append "not test_error_5xx"
" and not test_error_too_many_requests"
;; Something's wrong here. On some powerful machines
;; (but not on my laptop) these fail, and tests like
;; test_file_is_saved_into_an_existing_directory_which_was_specified_by_the_user
;; take a *very* long time to complete.
;;
;; It looks like "dataset_in_fire.download" takes an
;; unusually long time on those machines. We disable
;; tests that fail under these conditions.
" and not test_download_file"
" and not test_output_file_is_removed_if_md5_was_invalid"
" and not test_post_stats_if_download_succeeded"))
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
(("==") ">=")))))))
(propagated-inputs (list python-htsget python-psutil python-requests
python-tqdm python-urllib3))
(native-inputs (list python-coverage python-pytest python-pyfakefs
python-responses python-mock))
(home-page "https://github.com/EGA-archive/ega-download-client")
(synopsis "EGA download client")
(description "PyEGA3 is a tool for viewing and downloading files from
authorized EGA datasets. It uses the EGA data API and has several key
features:
@itemize
@item Files are transferred over secure https connections and received
unencrypted, so no need for decryption after download.
@item Downloads resume from where they left off in the event that the
connection is interrupted.
@item Supports file segmenting and parallelized download of segments,
improving overall performance.
@item After download completes, file integrity is verified using checksums.
@item Implements the GA4GH-compliant htsget protocol for download of genomic
ranges for data files with accompanying index files.
@end itemize\n")
(license license:asl2.0)))
(define-public python-scdamandtools (define-public python-scdamandtools
(package (package
(name "python-scdamandtools") (name "python-scdamandtools")
@ -4041,39 +4105,7 @@ omics data.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-pyega3 (define-public python-pyega3
(package (deprecated-package "python-pyega3" python-ega-download-client))
(name "python-pyega3")
(version "3.4.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "pyega3" version))
(sha256
(base32
"1k736in8g27rarx65ym9xk50x53zjg75h37bb8ljynxv04rypx2q"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; The tests require network access.
(native-inputs
(list python-psutil python-htsget))
(propagated-inputs
(list python-requests python-tqdm python-urllib3 python-responses))
(home-page "https://github.com/EGA-archive/ega-download-client")
(synopsis "Python client for EGA")
(description "This package is a python-based tool for viewing and
downloading files from authorized EGA datasets. It uses the EGA data API and
has several key features:
@itemize
@item Files are transferred over secure https connections and received
unencrypted, so no need for decryption after download.
@item Downloads resume from where they left off in the event that the
connection is interrupted.
@item Supports file segmenting and parallelized download of segments,
improving overall performance.
@item After download completes, file integrity is verified using checksums.
@item Implements the GA4GH-compliant htsget protocol for download of genomic
ranges for data files with accompanying index files.
@end itemize\n")
(license license:asl2.0)))
(define-public python-pysam (define-public python-pysam
(package (package
@ -4962,37 +4994,52 @@ Note that this package has been deprecated in favor of @code{pyfaidx}.")
(define-public python-schema-salad (define-public python-schema-salad
(package (package
(name "python-schema-salad") (name "python-schema-salad")
(version "8.2.20211116214159") (version "8.5.20240102191335")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "schema-salad" version)) (uri (pypi-uri "schema-salad" version))
(sha256 (sha256
(base32 (base32
"005dh2y45x92zl8sf2sqjmfvcqr4hrz8dfckgkckv87003v7lwqc")))) "035202p696i3jylb8b3nm9qcxsqby15hhqn1dl4nrz73a17p0ckx"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-version
(lambda _
;; Set exact version.
(substitute* "setup.py"
(("use_scm_version=True")
(string-append "version=\"" #$version "\"")))))
(add-before 'check 'skip-failing-tests (add-before 'check 'skip-failing-tests
(lambda _ (lambda _
;; Skip tests that require network access. ;; Skip tests that require network access.
(substitute* "schema_salad/tests/test_cwl11.py" (let ((skip-test
(("^def test_(secondaryFiles|outputBinding)" all) (lambda (test-pattern)
(string-append "@pytest.mark.skip(reason=" (string-append "@pytest.mark.skip(reason="
"\"test requires network access\")\n" "\"test requires network access\")\n"
all)))))))) test-pattern))))
(substitute* "schema_salad/tests/test_cg.py"
(("^def test_(load(_by_yaml_metaschema|_metaschema|_cwlschema|)|include|idmap|idmap2)\\(" all)
(skip-test all)))
(substitute* "schema_salad/tests/test_cwl11.py"
(("^def test_(secondaryFiles|outputBinding|yaml_tab_error)\\(" all)
(skip-test all)))
(substitute* "schema_salad/tests/test_examples.py"
(("^def test_bad_schemas\\(" all)
(skip-test all)))))))))
(propagated-inputs (propagated-inputs
(list python-cachecontrol (list python-cachecontrol
python-lockfile python-importlib-resources
python-mistune python-mistune-next
python-mypy-extensions
python-rdflib python-rdflib
python-rdflib-jsonld
python-requests python-requests
python-ruamel.yaml python-ruamel.yaml))
python-typing-extensions))
(native-inputs (native-inputs
(list python-black python-pytest python-pytest-runner)) (list python-black python-pytest python-pytest-runner python-pytest-xdist))
(home-page "https://github.com/common-workflow-language/schema_salad") (home-page "https://github.com/common-workflow-language/schema_salad")
(synopsis "Schema Annotations for Linked Avro Data (SALAD)") (synopsis "Schema Annotations for Linked Avro Data (SALAD)")
(description (description
@ -5084,10 +5131,104 @@ resources for bioinformatics.")
doublets in single-cell RNA-seq data.") doublets in single-cell RNA-seq data.")
(license license:expat))) (license license:expat)))
(define-public python-cwlformat
(package
(name "python-cwlformat")
(version "2022.02.18")
(source
;; The PyPI tarball is missing Readme.md. Readme.md is required for the
;; build.
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rabix/cwl-format")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0agkz2w86k91rc9m5vx5hsqi5nm6fcmzkng6j99hjapz0r9233ql"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-importlib-resources
python-ruamel.yaml))
(home-page "https://github.com/rabix/cwl-format")
(synopsis "Prettifier for CWL code")
(description "@code{python-cwlformat} is a specification and a reference
implementation for a very opinionated @acronym{CWL, Common Workflow Language}
code formatter. It outputs CWL in a standardized YAML format.")
(license license:asl2.0)))
(define-public python-cwl-upgrader
(package
(name "python-cwl-upgrader")
(version "1.2.11")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cwl-upgrader" version))
(sha256
(base32
"12j6z8nvwnzjjyypz59hwj5hmrcri2r6aknw52n9dbj6lbzbdd2p"))))
(build-system pyproject-build-system)
(native-inputs
(list python-pytest))
(propagated-inputs
(list python-ruamel.yaml
python-schema-salad))
(home-page "https://github.com/common-workflow-language/cwl-upgrader")
(synopsis "CWL document upgrader")
(description "@code{python-cwl-upgrader} is a standalone upgrader for
@acronym{CWL, Common Workflow Language} documents from version draft-3, v1.0,
and v1.1 to v1.2.")
(license license:asl2.0)))
(define-public python-cwl-utils
(package
(name "python-cwl-utils")
(version "0.32")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cwl-utils" version))
(sha256
(base32
"06wkw8d8cqm3hnz8xwnysz874gwaym36c358cr7frw5iglhvsj98"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
#~(list "-k"
(string-append "not test_graph_split"
" and not test_load_document_with_remote_uri"
" and not test_remote_packing"
" and not test_remote_packing_github_soft_links"
" and not test_value_from_two_concatenated_expressions"))))
(inputs
(list node))
(native-inputs
(list python-mypy-extensions
python-pytest
python-pytest-mock
python-pytest-runner))
(propagated-inputs
(list python-cwl-upgrader
python-cwlformat
python-packaging
python-rdflib
python-requests
python-ruamel.yaml
python-schema-salad))
(home-page "https://github.com/common-workflow-language/cwl-utils")
(synopsis "Python utilities for CWL")
(description "@code{python-cwl-utils} provides python utilities and
autogenerated classes for loading and parsing CWL v1.0, CWL v1.1, and CWL v1.2
documents.")
(license license:asl2.0)))
(define-public cwltool (define-public cwltool
(package (package
(name "cwltool") (name "cwltool")
(version "3.1.20220119140128") (version "3.1.20240112164112")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -5096,21 +5237,22 @@ doublets in single-cell RNA-seq data.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1jmrm0qrqgka79avc1kq63fgh20gx6g07fc8p3iih4k85vhdyl3f")))) "1fpc5kqgpbn48g5vlvy64p297x2wm3gfz8casgpk15ap593wwh33"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'loosen-version-restrictions (add-after 'unpack 'loosen-version-restrictions
(lambda _ (lambda _
(substitute* "setup.py" (substitute* "setup.py"
(("== 1.5.1") ">=1.5.1")))) ; prov (("== 1.5.1") "> 1.5.1")))) ; prov
(add-after 'unpack 'dont-use-git (add-after 'unpack 'set-version
(lambda _ (lambda _
(substitute* "gittaggers.py" ;; Set exact version.
(("self.git_timestamp_tag\\(\\)") (substitute* "setup.py"
(string-append "time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(" (("use_scm_version=True")
(string-drop ,version 4) ")))"))))) (string-append "version=\"" #$version "\"")))))
(add-after 'unpack 'modify-tests (add-after 'unpack 'modify-tests
(lambda _ (lambda _
;; Tries to connect to the internet. ;; Tries to connect to the internet.
@ -5130,22 +5272,16 @@ doublets in single-cell RNA-seq data.")
(("def test_v1_0_arg_empty_prefix_separate_false") (("def test_v1_0_arg_empty_prefix_separate_false")
(string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
"def test_v1_0_arg_empty_prefix_separate_false"))) "def test_v1_0_arg_empty_prefix_separate_false")))
(substitute* '("tests/subgraph/env-tool2.cwl"
(substitute* '("cwltool/schemas/v1.1/tests/env-tool1.cwl"
"cwltool/schemas/v1.1/tests/env-tool2.cwl"
"cwltool/schemas/v1.1/tests/imported-hint.cwl"
"tests/subgraph/env-tool2.cwl"
"tests/subgraph/env-tool2_req.cwl" "tests/subgraph/env-tool2_req.cwl"
"tests/subgraph/env-wf2_subwf-packed.cwl" "tests/subgraph/env-wf2_subwf-packed.cwl"
"tests/subgraph/env-tool2_no_env.cwl") "tests/subgraph/env-tool2_no_env.cwl")
(("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))) (("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))))))))
;; Pytest doesn't know what to do with "-n auto"
(substitute* "tox.ini"
(("-n auto") "")))))))
(inputs (inputs
(list python-argcomplete (list python-argcomplete
python-bagit python-bagit
python-coloredlogs python-coloredlogs
python-cwl-utils
python-mypy-extensions python-mypy-extensions
python-prov python-prov
python-pydot python-pydot
@ -5155,6 +5291,7 @@ doublets in single-cell RNA-seq data.")
python-ruamel.yaml python-ruamel.yaml
python-schema-salad python-schema-salad
python-shellescape python-shellescape
python-spython
python-typing-extensions python-typing-extensions
;; Not listed as needed but still necessary: ;; Not listed as needed but still necessary:
node)) node))
@ -5165,7 +5302,8 @@ doublets in single-cell RNA-seq data.")
python-pytest python-pytest
python-pytest-cov python-pytest-cov
python-pytest-mock python-pytest-mock
python-pytest-runner)) python-pytest-runner
python-pytest-xdist))
(home-page (home-page
"https://github.com/common-workflow-language/common-workflow-language") "https://github.com/common-workflow-language/common-workflow-language")
(synopsis "Common Workflow Language reference implementation") (synopsis "Common Workflow Language reference implementation")
@ -11602,11 +11740,11 @@ single-cell data.")
(license license:gpl3)))) (license license:gpl3))))
(define-public r-archr (define-public r-archr
(let ((commit "92ab814f86be0cea75c661f9827a9549c2cf47f5") (let ((commit "c61b0645d1482f80dcc24e25fbd915128c1b2500")
(revision "1")) (revision "1"))
(package (package
(name "r-archr") (name "r-archr")
(version (git-version "1.0.1" revision commit)) (version (git-version "1.0.2" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11615,7 +11753,7 @@ single-cell data.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1m1vp3kkpvd0fcviv5vb3gcbm3w91ih6gm9ivg48swnbqny44kqb")))) (base32 "0sgdfd8iwgj8cssj2zr3gmshg8nv54q6dd8asjf99i39qkni7p9i"))))
(properties `((upstream-name . "ArchR"))) (properties `((upstream-name . "ArchR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

16
gnu/packages/browser-extensions.scm
View file

@ -58,8 +58,8 @@ supported content to the Kodi media center.")
;; Arbitrary commit of branch master, ;; Arbitrary commit of branch master,
;; Update when updating uBlockOrigin. ;; Update when updating uBlockOrigin.
(let* ((name "ublock-main-assets") (let* ((name "ublock-main-assets")
(commit "0cb71ec86524082c463d2fd2e18ecdea04fe335c") (commit "b15998fae22b2b9593794b6b46647385b9c101d4")
(revision "1") (revision "2")
(version (git-version "0" revision commit))) (version (git-version "0" revision commit)))
(origin (origin
(method git-fetch) (method git-fetch)
@ -68,14 +68,14 @@ supported content to the Kodi media center.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1rsf7sznlnv12i7jx1b492whwqpkhkqy2ny3m04fbbv5x31gqp93"))))) (base32 "1jnj3qhsqd7k28f6l2cibkpipnf7y7j97fsrwwfz4zqd8p69c3fx")))))
(define ublock-prod-assets (define ublock-prod-assets
;; Arbitrary commit of branch gh-pages, ;; Arbitrary commit of branch gh-pages,
;; Update when updating uBlockOrigin. ;; Update when updating uBlockOrigin.
(let* ((name "ublock-prod-assets") (let* ((name "ublock-prod-assets")
(commit "21c07155353d7ecca2ffdc9e786f252a8cf00935") (commit "60fa7b4b33d5d257d9d0f1ee8db65c1e663f2d31")
(revision "1") (revision "2")
(version (git-version "0" revision commit))) (version (git-version "0" revision commit)))
(origin (origin
(method git-fetch) (method git-fetch)
@ -84,12 +84,12 @@ supported content to the Kodi media center.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0lwhvpvsf5p20c678qkmj5zy7hy33hl16sqpnp5gz00hbrdx1ddk"))))) (base32 "092llpcv24xn8p3h73r0q582vwxia9rh9ss6xxbra2xmy70hg24k")))))
(define ublock-origin (define ublock-origin
(package (package
(name "ublock-origin") (name "ublock-origin")
(version "1.55.0") (version "1.56.0")
(home-page "https://github.com/gorhill/uBlock") (home-page "https://github.com/gorhill/uBlock")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -99,7 +99,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cd03l78w0xzkyv5588kac1r5k741vdr3d7ircv50l349qp4sjnm")))) "150n3g42wx8bp1dgmf360gd87g8pk6zzgkyd8k698mj6r5anfwpa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium")) (outputs '("xpi" "firefox" "chromium"))
(properties '((addon-id . "uBlock0@raymondhill.net"))) (properties '((addon-id . "uBlock0@raymondhill.net")))

24
gnu/packages/check.scm
View file

@ -48,6 +48,7 @@
;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3503,6 +3504,29 @@ tables by saving expected data in a data directory (courtesy of pytest-datadir)
that can be used to verify that future runs produce the same data.") that can be used to verify that future runs produce the same data.")
(license license:expat))) (license license:expat)))
(define-public python-pytest-tornado5
(package
(name "python-pytest-tornado5")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest-tornado5" version))
(sha256
(base32
"0qb62jw2w0xr6y942yp0qxiy755bismjfpnxaxjjm05gy2pymr8d"))))
(build-system pyproject-build-system)
(arguments
;; Tests require pytest < 6
(list #:tests? #f))
(propagated-inputs (list python-pytest python-tornado))
(home-page "https://github.com/vidartf/pytest-tornado")
(synopsis
"Fixtures and markers to simplify testing of Tornado applications")
(description
"This package provides a @code{py.test} plugin supplying fixtures and
markers to simplify testing of asynchronous tornado applications.")
(license license:asl2.0)))
(define-public guile-proba (define-public guile-proba
(package (package
(name "guile-proba") (name "guile-proba")

28
gnu/packages/ci.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2022, 2024 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2023 David Pflug <david@pflug.io> ;;; Copyright © 2023 David Pflug <david@pflug.io>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -209,14 +209,15 @@ intended as a replacement for Hydra.")
(use-modules (ice-9 popen)) (use-modules (ice-9 popen))
(mkdir-p "../build/js") (mkdir-p "../build/js")
(for-each (lambda (name) (invoke "tar" "-xf" (assoc-ref inputs "chart.js.tgz")
(let* ((file "--strip-components" "2"
(assoc-ref inputs (string-append name ".js"))) "package/dist/chart.js")
(port (for-each (lambda (file minified-file)
(let* ((port
(open-pipe* OPEN_READ "uglifyjs" file)) (open-pipe* OPEN_READ "uglifyjs" file))
(destination (destination
(string-append (string-append
"../build/js/" name ".min.js"))) "../build/js/" minified-file)))
(call-with-output-file destination (call-with-output-file destination
(lambda (output-port) (lambda (output-port)
@ -226,9 +227,12 @@ intended as a replacement for Hydra.")
(unless (zero? exit) (unless (zero? exit)
(error "uglifyjs failed" exit))))) (error "uglifyjs failed" exit)))))
'("vue" (list (assoc-ref inputs "vue.js")
"vue-router" (assoc-ref inputs "vue-router.js")
"Chart")) "chart.js")
(list "vue.min.js"
"vue-router.min.js"
"Chart.min.js"))
;; ansi_up.js isn't minified ;; ansi_up.js isn't minified
(copy-file (assoc-ref inputs "ansi_up.js") (copy-file (assoc-ref inputs "ansi_up.js")
@ -260,13 +264,13 @@ intended as a replacement for Hydra.")
(sha256 (sha256
(base32 (base32
"1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr")))) "1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr"))))
("Chart.js" ("chart.js.tgz"
,(origin (method url-fetch) ,(origin (method url-fetch)
(uri (string-append "https://github.com/chartjs/Chart.js/" (uri (string-append "https://github.com/chartjs/Chart.js/"
"releases/download/v2.7.2/Chart.js")) "releases/download/v3.9.1/chart.js-3.9.1.tgz"))
(sha256 (sha256
(base32 (base32
"05m3gk6hqjx92j20drnk7q075qpjraywqaf25lnglmsgsgpiqsr7")))))) "1ikjgspaknqlhpjad17563yph4pvrh8dkzjdx58pl23gg58hf7hi"))))))
(synopsis "Lightweight continuous integration service") (synopsis "Lightweight continuous integration service")
(description (description
"Laminar is a lightweight and modular continuous integration service. It "Laminar is a lightweight and modular continuous integration service. It

20
gnu/packages/cobol.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2021-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -23,7 +23,9 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages bison)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages flex)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -42,7 +44,17 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1qifkkrmscc5csri1l4rm9pbik74c3pc5za1rzx7jizddks8md1v")))) "1qifkkrmscc5csri1l4rm9pbik74c3pc5za1rzx7jizddks8md1v"))
(snippet
#~(begin (use-modules (guix build utils))
;; Remove some files generated by bison and flex.
(for-each delete-file
'("cobc/parser.c"
"cobc/parser.h"
"cobc/ppparse.c"
"cobc/ppparse.h"
"cobc/pplex.c"
"cobc/scanner.c"))))))
(arguments (arguments
(list (list
#:configure-flags #:configure-flags
@ -62,7 +74,9 @@
(lambda _ (setenv "TERM" "xterm-256color")))) (lambda _ (setenv "TERM" "xterm-256color"))))
#:test-target "checkall")) #:test-target "checkall"))
(native-inputs (native-inputs
`(("perl" ,perl) `(("bison" ,bison)
("flex" ,flex)
("perl" ,perl)
("newcob" ,(origin ("newcob" ,(origin
(method url-fetch) (method url-fetch)
(uri "https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z") (uri "https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z")

6
gnu/packages/code.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2015, 2018, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2018, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
@ -436,7 +436,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(define-public universal-ctags (define-public universal-ctags
(package (package
(name "universal-ctags") (name "universal-ctags")
(version "6.0.20231001.0") (version "6.1.20240218.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -446,7 +446,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qik6rsai254prydfx8k2bq7wpim3a272jiw1y37r734k4s9xbrb")) "09cjlj7mq3s98x9zsg4slq86h1myixjxxqfnc0kglf2hnr9nrkf5"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

20
gnu/packages/compton.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2019 Alexandru-Sergiu Marton <brown121407@member.fsf.org> ;;; Copyright © 2019 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -113,7 +113,7 @@ performance).
(define-public picom (define-public picom
(package (package
(name "picom") (name "picom")
(version "10.2") (version "11.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -122,23 +122,25 @@ performance).
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1vd4nhvfykwdhpyhb0jmcj333zxhm6dyikafd76fa4z4fhjrrs0b")) "0swmpw6lj0aiwypdfkzsy38jwsm9wfcn7i5klrqfn2klrwinv27f"))
(file-name (string-append "picom-" version)))) (file-name (string-append "picom-" version))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs (inputs
(list dbus (list dbus
libconfig libconfig
libepoxy
libev
libx11 libx11
libxext libxext
libev libxdg-basedir
mesa mesa
xprop pcre2
xcb-util-renderutil
xcb-util-image
pixman pixman
uthash uthash
libxdg-basedir xcb-util
pcre)) xcb-util-renderutil
xcb-util-image
xprop))
(native-inputs (native-inputs
(list asciidoc pkg-config xorgproto)) (list asciidoc pkg-config xorgproto))
(arguments (arguments

91
gnu/packages/configuration-management.scm
View file

@ -23,6 +23,7 @@
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-web) #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -32,9 +33,7 @@
(define-public chezmoi (define-public chezmoi
(package (package
(name "chezmoi") (name "chezmoi")
;; XXX: Make sure 7f238faa61e46d79b54d4d0ea8f0b5fc27db84b2 applied before (version "1.8.10")
;; version update, which should fix @code{password-store} integration.
(version "1.8.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -43,47 +42,78 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw")))) "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/twpayne/chezmoi" `(#:import-path "github.com/twpayne/chezmoi"
;; We don't need to install the source code for end-user applications. #:install-source? #f
#:install-source? #f)) #:phases
(modify-phases %standard-phases
;; Remove test script which expect additional user's programs available
;; in the PATH. The testdata directory is removed in the latest version
;; (2.46.1) of the program.
(add-after 'unpack 'remove-failing-test-scripts
(lambda* (#:key import-path #:allow-other-keys)
(for-each (lambda (f)
(delete-file (string-append "src/" import-path "/testdata/scripts/" f)))
'("bitwarden.txt"
"cd.txt"
"cd_unix.txt"
"completion.txt"
"diff.txt"
"edit.txt"
"editconfig.txt"
"git.txt"
"gopass.txt"
"keepassxc.txt"
"lastpass.txt"
"onepassword.txt"
"pass.txt"
"runscriptdir_unix.txt"
"script_unix.txt"
"secretgeneric.txt"
"secretgopass.txt"
"secretkeepassxc.txt"
"secretlastpass.txt"
"secretonepassword.txt"
"secretpass.txt")))))))
(native-inputs (native-inputs
(list go-github-com-masterminds-sprig (list go-etcd-io-bbolt
go-github-com-masterminds-goutils
go-github-com-masterminds-semver
go-github-com-google-uuid
go-github-com-huandu-xstrings
go-github-com-imdario-mergo
go-github-com-mitchellh-reflectwalk
go-github-com-mitchellh-copystructure
go-github-com-bmatcuk-doublestar
go-github-com-charmbracelet-glamour
go-github-com-alecthomas-chroma go-github-com-alecthomas-chroma
go-github-com-aymerick-douceur
go-github-com-bmatcuk-doublestar-v2
go-github-com-charmbracelet-glamour
go-github-com-chris-ramon-douceur
go-github-com-coreos-go-semver go-github-com-coreos-go-semver
go-github-com-danwakefield-fnmatch go-github-com-danwakefield-fnmatch
go-github-com-dlclark-regexp2 go-github-com-dlclark-regexp2
go-github-go-git go-github-com-godbus-dbus
go-github-com-google-go-github go-github-com-google-go-github-v33
go-github-com-google-go-querystring go-github-com-google-go-querystring
go-github-com-google-renameio
go-github-com-microcosm-cc-bluemonday
go-github-com-aymerick-douceur
go-github-com-chris-ramon-douceur
go-github-com-gorilla-css
go-github-com-muesli-reflow-ansi
go-github-com-muesli-reflow-wordwrap
go-github-com-muesli-reflow-indent
go-github-com-muesli-reflow-padding
go-github-com-muesli-termenv
go-github-com-google-goterm go-github-com-google-goterm
go-github-com-google-renameio
go-github-com-google-uuid
go-github-com-gorilla-css
go-github-com-huandu-xstrings
go-github-com-imdario-mergo
go-github-com-lucasb-eyer-go-colorful go-github-com-lucasb-eyer-go-colorful
go-github-com-masterminds-goutils
go-github-com-masterminds-semver
go-github-com-masterminds-sprig
go-github-com-mattn-go-isatty go-github-com-mattn-go-isatty
go-github-com-mattn-go-runewidth go-github-com-mattn-go-runewidth
go-github-com-microcosm-cc-bluemonday
go-github-com-mitchellh-copystructure
go-github-com-mitchellh-reflectwalk
go-github-com-muesli-reflow-ansi
go-github-com-muesli-reflow-indent
go-github-com-muesli-reflow-padding
go-github-com-muesli-reflow-wordwrap
go-github-com-muesli-termenv
go-github-com-olekukonko-tablewriter go-github-com-olekukonko-tablewriter
go-github-com-pelletier-go-toml go-github-com-pelletier-go-toml
go-github-com-pkg-diff go-github-com-pkg-diff
go-github-com-rogpeppe-go-internal
go-github-com-sergi-go-diff go-github-com-sergi-go-diff
go-github-com-spf13-cobra go-github-com-spf13-cobra
go-github-com-spf13-viper go-github-com-spf13-viper
@ -93,12 +123,11 @@
go-github-com-twpayne-go-xdg go-github-com-twpayne-go-xdg
go-github-com-yuin-goldmark go-github-com-yuin-goldmark
go-github-com-zalando-go-keyring go-github-com-zalando-go-keyring
go-github-com-godbus-dbus go-github-go-git
go-etcd-io-bbolt
go-golang-org-x-crypto go-golang-org-x-crypto
go-golang-org-x-net go-golang-org-x-net
go-golang-org-x-oauth2 go-golang-org-x-oauth2
go-github-com-rogpeppe-go-internal go-golang-org-x-term
go-gopkg-in-errgo-fmt-errors)) go-gopkg-in-errgo-fmt-errors))
(home-page "https://www.chezmoi.io/") (home-page "https://www.chezmoi.io/")
(synopsis "Personal configuration files manager") (synopsis "Personal configuration files manager")

35
gnu/packages/containers.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2023 Zongyuan Li <zongyuan.li@c0x0o.me> ;;; Copyright © 2023 Zongyuan Li <zongyuan.li@c0x0o.me>
;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,37 +54,25 @@
#:use-module (gnu packages wget)) #:use-module (gnu packages wget))
(define-public crun (define-public crun
(let ((commit "c381048530aa750495cf502ddb7181f2ded5b400"))
(package (package
(name "crun") (name "crun")
(version "1.4.5") (version "1.14.1")
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append
(url "https://github.com/containers/crun") "https://github.com/containers/crun/releases/download/"
(commit commit) version
(recursive? #t))) "/crun-" version ".tar.gz"))
(sha256 (sha256
(base32 "0x2xmr5sv9ivvcv5fl5jjk4kq9b3n97s5hsqiqfwl4rz8qcz4xk1")) (base32
(file-name (git-file-name name version)))) "02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-systemd") `(#:configure-flags '("--disable-systemd")
#:tests? #f ; XXX: needs /sys/fs/cgroup mounted #:tests? #f ; XXX: needs /sys/fs/cgroup mounted
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'do-not-depend-on-git
(lambda _
(substitute* "autogen.sh"
(("^git submodule update.*")
""))
(with-output-to-file "git-version.h"
(lambda ()
(display (string-append
"/* autogenerated. */\n#ifndef GIT_VERSION\n# define GIT_VERSION \""
,commit
"\"\n#endif\n"))))))
(add-after 'unpack 'fix-tests (add-after 'unpack 'fix-tests
(lambda _ (lambda _
(substitute* (find-files "tests" "\\.(c|py)") (substitute* (find-files "tests" "\\.(c|py)")
@ -108,7 +97,7 @@
(description (description
"crun is a fast and low-memory footprint Open Container Initiative (OCI) "crun is a fast and low-memory footprint Open Container Initiative (OCI)
Container Runtime fully written in C.") Container Runtime fully written in C.")
(license license:gpl2+)))) (license license:gpl2+)))
(define-public conmon (define-public conmon
(package (package
@ -221,7 +210,7 @@ containers or various tools.")
(define-public slirp4netns (define-public slirp4netns
(package (package
(name "slirp4netns") (name "slirp4netns")
(version "1.2.0") (version "1.2.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -229,7 +218,7 @@ containers or various tools.")
(url "https://github.com/rootless-containers/slirp4netns") (url "https://github.com/rootless-containers/slirp4netns")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1rlzwp5fx1x3q179j9s2jp02imjag5pgj333z110nrvi7azl22l8")) (base32 "0czvdsdv821fz4jd9rgrlkdhhjna6frawr8klvx3k2cfh444fbii"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

338
gnu/packages/cran.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2015, 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
@ -116,6 +116,25 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public r-abbreviate
(package
(name "r-abbreviate")
(version "0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "abbreviate" version))
(sha256
(base32 "1cvjdbi17qz8gr5898zchm5fyz4n51z66lwps25v8a9mhwab8imi"))))
(properties `((upstream-name . "abbreviate")))
(build-system r-build-system)
(home-page "https://github.com/sigbertklinke/abbreviate")
(synopsis "Readable string abbreviation")
(description
"This package abbreviates strings to a specified minimum number of
characters, such that the strings remain unique (if they originally were).")
(license license:gpl3)))
(define-public r-aer (define-public r-aer
(package (package
(name "r-aer") (name "r-aer")
@ -192,6 +211,50 @@ estimating equations} (GEE) or @dfn{generalized linear mixed effect
models} (GLMM).") models} (GLMM).")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-asioheaders
(package
(name "r-asioheaders")
(version "1.22.1-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "AsioHeaders" version))
(sha256
(base32 "192qxayrpvi02wrqq2h5cjc92aaxrsgw7z32r8qk5imqg3mc0a8n"))))
(properties `((upstream-name . "AsioHeaders")))
(build-system r-build-system)
(home-page "https://github.com/eddelbuettel/asioheaders")
(synopsis "Asio C++ header files")
(description
"Asio is a cross-platform C++ library for network and low-level I/O
programming that provides developers with a consistent asynchronous model
using a modern C++ approach. It is also included in Boost but requires
linking when used with Boost. Standalone it can be used header-only (provided
a recent compiler). Asio is written and maintained by Christopher
M. Kohlhoff, and released under the Boost Software License', Version 1.0.")
(license license:boost1.0)))
(define-public r-box
(package
(name "r-box")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "box" version))
(sha256
(base32 "00g5ik3f6260m38jl8k4s8nycmy7mzdwr7qslrl66phpg84xzmln"))))
(properties `((upstream-name . "box")))
(build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://klmr.me/box/")
(synopsis "Write reusable, composable and modular R code")
(description
"This package provides a modern module system for R. Organize code into
hierarchical, composable, reusable modules, and use it effortlessly across
projects via a flexible, declarative dependency loading syntax.")
(license license:expat)))
(define-public r-brio (define-public r-brio
(package (package
(name "r-brio") (name "r-brio")
@ -391,6 +454,27 @@ match datasets quickly. It also contains functions for various cosmological
calculations.") calculations.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-cetcolor
(package
(name "r-cetcolor")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "cetcolor" version))
(sha256
(base32 "0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"))))
(properties `((upstream-name . "cetcolor")))
(build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://github.com/coatless-rpkg/cetcolor")
(synopsis "CET perceptually uniform color maps")
(description
"This package provides a collection of perceptually uniform color maps
made by Peter Kovesi (2015) \"Good Colour Maps: How to Design Them\"
<arXiv:1509.03700> at the Centre for Exploration Targeting (CET).")
(license license:cc-by-sa4.0)))
;; The package sources include multiple non-minified JavaScript files and the ;; The package sources include multiple non-minified JavaScript files and the
;; v5.1.0 variant of d3.js. The d3.js file is not minified. ;; v5.1.0 variant of d3.js. The d3.js file is not minified.
(define-public r-chromomap (define-public r-chromomap
@ -453,13 +537,13 @@ labels on the node can also be achieved.")
(define-public r-collapse (define-public r-collapse
(package (package
(name "r-collapse") (name "r-collapse")
(version "2.0.9") (version "2.0.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "collapse" version)) (uri (cran-uri "collapse" version))
(sha256 (sha256
(base32 "0c9cz1dqrgd3gss9cr40a3rh014av0w8gfhq35lq1knyik6bhk28")))) (base32 "0xary3xlkkhb3izbwzsk5q660hi00srkv95c0r36isr5bgsirfr1"))))
(properties `((upstream-name . "collapse"))) (properties `((upstream-name . "collapse")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-rcpp)) (propagated-inputs (list r-rcpp))
@ -1898,14 +1982,14 @@ similar rank-based tests for equal probability distributions due to Neuhauser
(define-public r-v8 (define-public r-v8
(package (package
(name "r-v8") (name "r-v8")
(version "4.4.1") (version "4.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "V8" version)) (uri (cran-uri "V8" version))
(sha256 (sha256
(base32 (base32
"129spn531m9arz7v8vyfsrvc69hg0w39fdnhjxrcrww37l9xcvav")))) "0w4n794l4f7hwwjr83112zf3cjx72q6ak0fn45qm6pqg8brkbg77"))))
(properties (properties
`((upstream-name . "V8") `((upstream-name . "V8")
(updater-extra-inputs . ("libnode")))) (updater-extra-inputs . ("libnode"))))
@ -2470,14 +2554,14 @@ scale-sensitive information.")
(define-public r-ggvenndiagram (define-public r-ggvenndiagram
(package (package
(name "r-ggvenndiagram") (name "r-ggvenndiagram")
(version "1.5.0") (version "1.5.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggVennDiagram" version)) (uri (cran-uri "ggVennDiagram" version))
(sha256 (sha256
(base32 (base32
"0ngvvmz2mxh4v98wg3xqpmz1p1cpk3qsdvszcjzb1yhhway211a5")))) "0hzjbpd3f3zn169s5nvnv7b4wlrwdn3r0pk0vgkdnhchl75g0qni"))))
(properties `((upstream-name . "ggVennDiagram"))) (properties `((upstream-name . "ggVennDiagram")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3700,13 +3784,13 @@ noisy black-box functions.")
(define-public r-tgstat (define-public r-tgstat
(package (package
(name "r-tgstat") (name "r-tgstat")
(version "2.3.25") (version "2.3.27")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "tgstat" version)) (uri (cran-uri "tgstat" version))
(sha256 (sha256
(base32 "07hdw3n4l88nr0x2a2qnjich4cfihgd0fk65ar3crgdahjcv9vn4")))) (base32 "0scljimskda5hinkb4y5va9c9qlqwf6k6zrm20bjk133710qsscb"))))
(properties `((upstream-name . "tgstat"))) (properties `((upstream-name . "tgstat")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (list r-knitr)) (native-inputs (list r-knitr))
@ -3820,13 +3904,13 @@ cross-platform graphical user interface toolkit} widget.")
(define-public r-rvest (define-public r-rvest
(package (package
(name "r-rvest") (name "r-rvest")
(version "1.0.3") (version "1.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rvest" version)) (uri (cran-uri "rvest" version))
(sha256 (sha256
(base32 "07hws9infwchy19smrcd9m6c0jii0bdn335yxqk3ramgj5ryyrd4")))) (base32 "19lw0jk8d8x88z247hz761gwbx9f5n3yqnv63mn7pkwl55mpqw3x"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-cli (list r-cli
@ -3837,7 +3921,6 @@ cross-platform graphical user interface toolkit} widget.")
r-rlang r-rlang
r-selectr r-selectr
r-tibble r-tibble
r-withr
r-xml2)) r-xml2))
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
@ -3849,6 +3932,25 @@ designed to work with @code{magrittr} to make it easy to express common web
scraping tasks, inspired by libraries like @code{BeautifulSoup}.") scraping tasks, inspired by libraries like @code{BeautifulSoup}.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-secretbase
(package
(name "r-secretbase")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "secretbase" version))
(sha256
(base32 "1z0ddzdimma8rgd47fn5mma09d5c7vrl5b7gdlvfk8l047yihyb6"))))
(properties `((upstream-name . "secretbase")))
(build-system r-build-system)
(home-page "https://shikokuchuo.net/secretbase/")
(synopsis "Cryptographic Hash and Extendable-Output Functions")
(description
"This package provides implementations of the SHA-3 cryptographic hash
and SHAKE256 extendable-output functions (XOF).")
(license license:gpl3+)))
(define-public r-selectr (define-public r-selectr
(package (package
(name "r-selectr") (name "r-selectr")
@ -3988,17 +4090,17 @@ same time tries to group instances from the same class together.")
(define-public r-callr (define-public r-callr
(package (package
(name "r-callr") (name "r-callr")
(version "3.7.3") (version "3.7.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "callr" version)) (uri (cran-uri "callr" version))
(sha256 (sha256
(base32 (base32
"0knh5yxhxwjz96kbjrq524w4j8cac10k6mghhmblq79s0zgzwysn")))) "0b277fvjglnqrjmsm4ilhqrp9sjag0r9mxls2h9v1m94ff7ix88q"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-r6 r-processx)) (list r-processx r-r6))
(home-page "https://github.com/r-lib/callr#readme") (home-page "https://github.com/r-lib/callr#readme")
(synopsis "Call R from R") (synopsis "Call R from R")
(description (description
@ -6771,14 +6873,14 @@ validation and filtering on the values, making options invisible or private.")
(define-public r-circlize (define-public r-circlize
(package (package
(name "r-circlize") (name "r-circlize")
(version "0.4.15") (version "0.4.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "circlize" version)) (uri (cran-uri "circlize" version))
(sha256 (sha256
(base32 (base32
"1iswb7dy08as3pbzxvhx5qlsbnwvp79nwg8m158nfz7y2d9xa0nn")))) "0rqbcmmp4h1jjl0y59bzn6k8kywjdqwvp0ajkqxd21j9f33k5p0n"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-colorspace r-globaloptions r-shape)) (list r-colorspace r-globaloptions r-shape))
@ -7266,14 +7368,14 @@ package also provides a C++ API, that works with or without Rcpp.")
(define-public r-ggally (define-public r-ggally
(package (package
(name "r-ggally") (name "r-ggally")
(version "2.2.0") (version "2.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "GGally" version)) (uri (cran-uri "GGally" version))
(sha256 (sha256
(base32 (base32
"1pc0mcxhj3mz8ac6r1sqfxw1wkamikjal54z7pb1mairsr3hpqnw")))) "1il6yphqxcyj1039imi8pn6ygyni24daz8ljxxp3z9inb5k2dcwb"))))
(properties `((upstream-name . "GGally"))) (properties `((upstream-name . "GGally")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -8893,14 +8995,14 @@ provides a one-row summary of model-level statistics.")
(define-public r-recipes (define-public r-recipes
(package (package
(name "r-recipes") (name "r-recipes")
(version "1.0.9") (version "1.0.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "recipes" version)) (uri (cran-uri "recipes" version))
(sha256 (sha256
(base32 (base32
"146p9ij2i4rmzaa5v76lm7z8iaw5wqb47i9cqf4a0q7xsgqvf6hi")))) "1m4v9j7by0w5avqljmwck1jsgjgwc8rsby0affa5zii3xkvvvifg"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-cli (list r-cli
@ -9509,14 +9611,14 @@ acceptance regions, log-ratio plots and Q-Q plots.")
(define-public r-sm (define-public r-sm
(package (package
(name "r-sm") (name "r-sm")
(version "2.2-5.7.1") (version "2.2-6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sm" version)) (uri (cran-uri "sm" version))
(sha256 (sha256
(base32 (base32
"0mql7rlm8wkdwmx1lv7pscdk9ibvsdpfdv8bpaz1hv2gn4pc637a")))) "0q8xav1alammiyiw2p8y0qq94ag5rln910jry8q3sb2p38ly79i7"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (list gfortran)) (native-inputs (list gfortran))
(home-page "http://www.stats.gla.ac.uk/~adrian/sm/") (home-page "http://www.stats.gla.ac.uk/~adrian/sm/")
@ -10776,17 +10878,17 @@ software developed by the Statnet Project.")
(define-public r-statcheck (define-public r-statcheck
(package (package
(name "r-statcheck") (name "r-statcheck")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "statcheck" version)) (uri (cran-uri "statcheck" version))
(sha256 (sha256
(base32 (base32
"1hibrynbgsym4hma8isby8kwb8gab9d4bx7m43qj4zayrl6b8scx")))) "0gsr068if5k8124x1cbm48720l9qvnfmdg6rmh7rwh6jvxxgknd7"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-ggplot2 r-plyr r-rlang r-rmarkdown)) (list r-ggplot2 r-plyr r-rlang r-rmarkdown r-stringi))
(home-page "https://cran.r-project.org/web/packages/statcheck/") (home-page "https://cran.r-project.org/web/packages/statcheck/")
(synopsis "Extract statistics from articles and recompute p-values") (synopsis "Extract statistics from articles and recompute p-values")
(description "This package can automatically extract statistical (description "This package can automatically extract statistical
@ -11080,14 +11182,14 @@ exhaustive search.")
(define-public r-splus2r (define-public r-splus2r
(package (package
(name "r-splus2r") (name "r-splus2r")
(version "1.3-4") (version "1.3-5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "splus2R" version)) (uri (cran-uri "splus2R" version))
(sha256 (sha256
(base32 (base32
"16r13bbijq7lz3c8qn7dnb4h8fc3vbcahyah2zij888p470vqljn")))) "097bpzazw5ryb6izbmz2sdlghn3qvh7c7wsnn0j08j65f9bfmc77"))))
(properties `((upstream-name . "splus2R"))) (properties `((upstream-name . "splus2R")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/splus2R/") (home-page "https://cran.r-project.org/web/packages/splus2R/")
@ -11182,14 +11284,14 @@ Fisher's method), and Sidak correction.")
(define-public r-quantmod (define-public r-quantmod
(package (package
(name "r-quantmod") (name "r-quantmod")
(version "0.4.25") (version "0.4.26")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "quantmod" version)) (uri (cran-uri "quantmod" version))
(sha256 (sha256
(base32 (base32
"0cjvz6hd4q0fd87d54wxfaka3awi9jzj8a7x72jawkdxbza9c61z")))) "165vp2ygry8ibcpxjbyfvfrjbv98syln12kkyzci2ygp84r5sv1r"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-curl r-jsonlite r-ttr r-xts r-zoo)) (list r-curl r-jsonlite r-ttr r-xts r-zoo))
@ -14201,14 +14303,14 @@ or missing responses.")
(define-public r-acdm (define-public r-acdm
(package (package
(name "r-acdm") (name "r-acdm")
(version "1.0.4.2") (version "1.0.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ACDm" version)) (uri (cran-uri "ACDm" version))
(sha256 (sha256
(base32 (base32
"00i33b76gqllyc6ywwwrgyjvxfspqb3jf52b9sjaazlfwgn5xyjf")))) "0g89827az5mnllp6l71znbvwxzygb8nvnmsv6x052w2ajhd16v7v"))))
(properties `((upstream-name . "ACDm"))) (properties `((upstream-name . "ACDm")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -15365,14 +15467,14 @@ and coverage methods to tune the choice of threshold.")
(define-public r-ggnetwork (define-public r-ggnetwork
(package (package
(name "r-ggnetwork") (name "r-ggnetwork")
(version "0.5.12") (version "0.5.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggnetwork" version)) (uri (cran-uri "ggnetwork" version))
(sha256 (sha256
(base32 (base32
"1kg9354f39asq5baryh3zzzdl54g75mn1pxdr3pws9d2q5i8cdkl")))) "0ipxw6j36n0hfn0nsimw8jbjszvm1d0hadwg4zirvn6v36npwabc"))))
(properties `((upstream-name . "ggnetwork"))) (properties `((upstream-name . "ggnetwork")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -16320,14 +16422,14 @@ samples is large and the number of mixture components is not too large.")
(define-public r-magick (define-public r-magick
(package (package
(name "r-magick") (name "r-magick")
(version "2.8.2") (version "2.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "magick" version)) (uri (cran-uri "magick" version))
(sha256 (sha256
(base32 (base32
"15ja7f46f77a67wmzqfaxvhmvvzgb9yj92p2if5di7i61vlmnid1")))) "0yf08ns5qgqi2bzvxvawip521ji2rgvvfrhj747zb6ci5qnm4awk"))))
(properties (properties
'((updater-extra-inputs . ("imagemagick")))) '((updater-extra-inputs . ("imagemagick"))))
(build-system r-build-system) (build-system r-build-system)
@ -16468,13 +16570,13 @@ were influenced by the drake R package by Will Landau (2018)
(define-public r-targets (define-public r-targets
(package (package
(name "r-targets") (name "r-targets")
(version "1.4.1") (version "1.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "targets" version)) (uri (cran-uri "targets" version))
(sha256 (sha256
(base32 (base32
"0kax8nj66jbcp8sbv7zl68hzf4clz5m50fibrcypnzvpamhafw1q")))) "1g21cp0p5jdghr61w9q3y73jm2k248z4apn7rlxqm6m18i4x7zsb"))))
(properties `((upstream-name . "targets"))) (properties `((upstream-name . "targets")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-base64url (propagated-inputs (list r-base64url
@ -16485,8 +16587,10 @@ were influenced by the drake R package by Will Landau (2018)
r-digest r-digest
r-igraph r-igraph
r-knitr r-knitr
r-ps
r-r6 r-r6
r-rlang r-rlang
r-secretbase
r-tibble r-tibble
r-tidyselect r-tidyselect
r-vctrs r-vctrs
@ -17012,14 +17116,14 @@ correlation, censored, ordered and multivariate problems.")
(define-public r-bayesplot (define-public r-bayesplot
(package (package
(name "r-bayesplot") (name "r-bayesplot")
(version "1.11.0") (version "1.11.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "bayesplot" version)) (uri (cran-uri "bayesplot" version))
(sha256 (sha256
(base32 (base32
"0wpy1angkq513nc22fqmxsxm0y7dkvjzycy0z5s96j0z9jmb6q6n")))) "0c1q1znp9vd0w6l35xa208bgiwr5f2w8j2c97v6ml4z0j5rycwag"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
(list pandoc)) (list pandoc))
@ -17153,14 +17257,14 @@ differentiation.")
(define-public r-bayestestr (define-public r-bayestestr
(package (package
(name "r-bayestestr") (name "r-bayestestr")
(version "0.13.1") (version "0.13.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "bayestestR" version)) (uri (cran-uri "bayestestR" version))
(sha256 (sha256
(base32 (base32
"0mmnifi3j29qlsj917wbdqpgpk05x3cc7111k842gsv7y34h4ir7")))) "15xnmjay0s9kgaj25z43cxky4qcjn3gv8yd1x548jzbxzxxma07n"))))
(properties `((upstream-name . "bayestestR"))) (properties `((upstream-name . "bayestestR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -17180,14 +17284,14 @@ ROPE percentage and pd).")
(define-public r-performance (define-public r-performance
(package (package
(name "r-performance") (name "r-performance")
(version "0.10.8") (version "0.10.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "performance" version)) (uri (cran-uri "performance" version))
(sha256 (sha256
(base32 (base32
"0zvj0bzbqcy35jcg1s6b1wqbz7rbajzvjm74aks4j6iq4grh4d2j")))) "1qi08vwh08ndmjyx5vcpwf20j1dkj8998vz7zy26fhp1kf9dlkfw"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-bayestestr r-datawizard r-insight)) (list r-bayestestr r-datawizard r-insight))
@ -17542,14 +17646,14 @@ User credentials are shared with command line git through the
(define-public r-usethis (define-public r-usethis
(package (package
(name "r-usethis") (name "r-usethis")
(version "2.2.2") (version "2.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "usethis" version)) (uri (cran-uri "usethis" version))
(sha256 (sha256
(base32 (base32
"0imy9izchr9xzc5wrr91ydfr4jifv8lsqx712zkx0vxfi6kw3n6r")))) "1cyy1k5iansg63ziph4w76kzl59dgmam7m2wp6sz9d93bjcrh34d"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-cli (list r-cli
@ -19756,14 +19860,14 @@ and compatibility with @code{ape} objects.")
(define-public r-rnifti (define-public r-rnifti
(package (package
(name "r-rnifti") (name "r-rnifti")
(version "1.5.1") (version "1.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "RNifti" version)) (uri (cran-uri "RNifti" version))
(sha256 (sha256
(base32 (base32
"0rbym1svldahd4rlbcfb5s62rigws2w1fa1f1chp504gn340b555")))) "0spsdkqvlkk7xn6wz6778gc6cc7dnfcwpz91q8wdzxgcbgxdy0yv"))))
(properties `((upstream-name . "RNifti"))) (properties `((upstream-name . "RNifti")))
(build-system r-build-system) (build-system r-build-system)
(inputs (list zlib)) (inputs (list zlib))
@ -20279,7 +20383,7 @@ preparing, executing, and processing HTTP requests.")
r-rapidjsonr r-rapidjsonr
r-rlang r-rlang
r-tibble)) r-tibble))
(home-page "https://github.com/rstats-db/bigrquery") (home-page "https://github.com/r-dbi/bigrquery")
(synopsis "R interface to Google's BigQuery API") (synopsis "R interface to Google's BigQuery API")
(description (description
"This package provides an R interface to Google's BigQuery database.") "This package provides an R interface to Google's BigQuery database.")
@ -21209,13 +21313,13 @@ profiling R code.")
(define-public r-prospectr (define-public r-prospectr
(package (package
(name "r-prospectr") (name "r-prospectr")
(version "0.2.6") (version "0.2.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "prospectr" version)) (uri (cran-uri "prospectr" version))
(sha256 (sha256
(base32 (base32
"1p53hcgcs2p09zhc2n7byjzrgvcgz6w7q00mlsn4kmnz7l4p7rrm")))) "0hg2afw5aixx0xdwwr6g0wi8sksn7r21hz8diyqxg2345rwnzbg4"))))
(properties `((upstream-name . "prospectr"))) (properties `((upstream-name . "prospectr")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -21225,6 +21329,8 @@ profiling R code.")
r-mathjaxr r-mathjaxr
r-rcpp r-rcpp
r-rcpparmadillo)) r-rcpparmadillo))
(native-inputs
(list r-knitr))
(home-page "https://github.com/l-ramirez-lopez/prospectr") (home-page "https://github.com/l-ramirez-lopez/prospectr")
(synopsis "Functions for processing and sample selection of spectroscopic data") (synopsis "Functions for processing and sample selection of spectroscopic data")
(description (description
@ -21489,14 +21595,14 @@ them in distributed compute environments.")
(define-public r-parallelly (define-public r-parallelly
(package (package
(name "r-parallelly") (name "r-parallelly")
(version "1.36.0") (version "1.37.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "parallelly" version)) (uri (cran-uri "parallelly" version))
(sha256 (sha256
(base32 (base32
"123w89hmd7fn7lmdsl044npidvf7472h1ascvf7swjllan8s5h5r")))) "19zrfiakg5xg51r9va4r976b4lnnsj5nsk6i6srxsl227q45xra1"))))
(properties `((upstream-name . "parallelly"))) (properties `((upstream-name . "parallelly")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/HenrikBengtsson/parallelly") (home-page "https://github.com/HenrikBengtsson/parallelly")
@ -22851,13 +22957,13 @@ additional utilities for genomic regions processing.")
(define-public r-setrng (define-public r-setrng
(package (package
(name "r-setrng") (name "r-setrng")
(version "2022.4-1") (version "2024.2-1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "setRNG" version)) (uri (cran-uri "setRNG" version))
(sha256 (sha256
(base32 (base32
"09089vr5x8snwxh38kdhgpjl3jl7zrk056f6f9a2jg5lsrmnxh31")))) "0h2wbpsi07c48h72zjglvp9b58hq3j77289sah32qg6vnw41pcp3"))))
(properties `((upstream-name . "setRNG"))) (properties `((upstream-name . "setRNG")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://distr.r-forge.r-project.org/") (home-page "https://distr.r-forge.r-project.org/")
@ -23070,6 +23176,29 @@ visualization of biological sequence (DNA and protein) data. It also includes
utilities for sequence data management under the ACNUC system.") utilities for sequence data management under the ACNUC system.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-unigd
(package
(name "r-unigd")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "unigd" version))
(sha256
(base32 "0519v2p4jzfpilai022blvyxi56kfdidafwjpa1g6lnmwmpk4isq"))))
(properties `((upstream-name . "unigd")))
(build-system r-build-system)
(inputs (list cairo fontconfig freetype libpng zlib))
(propagated-inputs (list r-cpp11 r-systemfonts))
(native-inputs (list r-knitr pkg-config))
(home-page "https://github.com/nx10/unigd")
(synopsis "Universal graphics device")
(description
"This package provides a unified R graphics backend. Render R graphics
fast and easy to many common file formats. It provides a thread safe C
interface for asynchronous rendering of R graphics.")
(license license:gpl2+)))
(define-public r-units (define-public r-units
(package (package
(name "r-units") (name "r-units")
@ -23865,6 +23994,27 @@ releases/download/v0.10.1/mathquill-0.10.1.tgz")
authoring books and technical documents with R Markdown.") authoring books and technical documents with R Markdown.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-options
(package
(name "r-options")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "options" version))
(sha256
(base32 "0pprbp2pxvgh120f8dahswws44gpdm4f4nlq3h3nvqrlhnspwnb8"))))
(properties `((upstream-name . "options")))
(build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://dgkf.github.io/options/")
(synopsis "Simple, consistent package options")
(description
"This package provides simple mechanisms for defining and interpreting
package options. It provides helpers for interpreting environment variables,
global options, defining default values and more.")
(license license:expat)))
(define-public r-optparse (define-public r-optparse
(package (package
(name "r-optparse") (name "r-optparse")
@ -24502,14 +24652,14 @@ sets of URLs.")
(define-public r-ggforce (define-public r-ggforce
(package (package
(name "r-ggforce") (name "r-ggforce")
(version "0.4.1") (version "0.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggforce" version)) (uri (cran-uri "ggforce" version))
(sha256 (sha256
(base32 (base32
"0wqq8l7lq96k4w0vq12jcg7clvgia8s35jjbqq1s0py4cgxijhml")))) "1a2i1rl27yqh8kxjpphwcv05p19l2aw07q9gxl4x8iv8xpkb0if1"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-cli (list r-cli
@ -24539,13 +24689,13 @@ that fills this gap.")
(define-public r-eulerr (define-public r-eulerr
(package (package
(name "r-eulerr") (name "r-eulerr")
(version "7.0.0") (version "7.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "eulerr" version)) (uri (cran-uri "eulerr" version))
(sha256 (sha256
(base32 (base32
"16a84a2xgv1iqsir0hzn6qclljni4f3prpycb7qpp06vrd0yn8lw")))) "1c8yf94ga4h6rf89fyajxfsaq5z6dx1z2840371vxj7kwj9slg3c"))))
(properties `((upstream-name . "eulerr"))) (properties `((upstream-name . "eulerr")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -26913,44 +27063,32 @@ dataset-specific factors.")
(define-public r-harmony (define-public r-harmony
(package (package
(name "r-harmony") (name "r-harmony")
(version "0.1") (version "1.2.0")
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (cran-uri "harmony" version))
(url "https://github.com/immunogenomics/harmony")
(commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1df7bb9ba3m0c44fhmh8cs4hlkh4fffjwm8rz7l87lf5pdy7sg56"))))
"05r401q09rbr6fqhb9mbd95082cjdi3nag1cv6zn96xkr0f6imq9")) (properties `((upstream-name . "harmony")))
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file '("config.status" "configure"))
#t))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs (list r-cowplot
(list r-cowplot
r-dplyr r-dplyr
r-ggplot2 r-ggplot2
r-irlba
r-matrix r-matrix
r-rcpp r-rcpp
r-rcpparmadillo r-rcpparmadillo
r-rcppprogress r-rcppprogress
r-rhpcblasctl
r-rlang r-rlang
r-tibble r-tibble))
r-tidyr)) (native-inputs (list r-knitr))
(native-inputs (home-page "https://cran.r-project.org/web/packages/harmony/index.html")
(list autoconf))
(home-page "https://github.com/immunogenomics/harmony")
(synopsis "Integration of single cell sequencing data") (synopsis "Integration of single cell sequencing data")
(description (description
"This package provides an implementation of the Harmony algorithm for "This package provides an implementation of the Harmony algorithm for
single cell integration, described in Korsunsky et al single cell integration. This package includes a standalone Harmony function
@url{doi.org/10.1101/461954}. The package includes a standalone Harmony and interfaces to external frameworks.")
function and interfaces to external frameworks.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-covr (define-public r-covr
@ -28729,13 +28867,13 @@ columns, ad allows for quick addition of extra columns to a filematrix.")
(define-public r-filesstrings (define-public r-filesstrings
(package (package
(name "r-filesstrings") (name "r-filesstrings")
(version "3.3.0") (version "3.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "filesstrings" version)) (uri (cran-uri "filesstrings" version))
(sha256 (sha256
(base32 (base32
"0srmshjhj5yx5d81pmvr8rr1cqh8v0wsxn04bfm146yfq2pvy52h")))) "0p5vgrzbvipja9lgarygqphnr1z8vy9kl9n83jnfyvf0gp4ansl2"))))
(properties `((upstream-name . "filesstrings"))) (properties `((upstream-name . "filesstrings")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-checkmate (propagated-inputs (list r-checkmate
@ -29953,14 +30091,14 @@ number embedded in the file rather than the file extension.")
(define-public r-imager (define-public r-imager
(package (package
(name "r-imager") (name "r-imager")
(version "0.45.2") (version "0.45.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "imager" version)) (uri (cran-uri "imager" version))
(sha256 (sha256
(base32 (base32
"0mmzp55j1svlaa0lfmmaz8hijlkbk0wkv2craxhc6gyx0g5qp129")))) "0vrv7m9b9w8xjqa9w17xvrmpl403476zr0l9wqdp9ir6ssvnaf2f"))))
(properties `((upstream-name . "imager"))) (properties `((upstream-name . "imager")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -31317,14 +31455,14 @@ and Euclidean distance is particularly fast.")
(define-public r-isocodes (define-public r-isocodes
(package (package
(name "r-isocodes") (name "r-isocodes")
(version "2023.12.07") (version "2024.02.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ISOcodes" version)) (uri (cran-uri "ISOcodes" version))
(sha256 (sha256
(base32 (base32
"03nrcv1hh12yyqql03cr94kk3hnpynvrm4kv3plmdli2b3n1yqvk")))) "1rp2gasiggqfaqbag8wqz1rlhlajpji2klx0rgzms21lh28ppjq2"))))
(properties `((upstream-name . "ISOcodes"))) (properties `((upstream-name . "ISOcodes")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/package=ISOcodes") (home-page "https://cran.r-project.org/package=ISOcodes")
@ -32125,14 +32263,14 @@ well as Ravand and Robitzsch (2015).")
(define-public r-tam (define-public r-tam
(package (package
(name "r-tam") (name "r-tam")
(version "4.1-4") (version "4.2-21")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "TAM" version)) (uri (cran-uri "TAM" version))
(sha256 (sha256
(base32 (base32
"0b81d0g4j94yrfzj019jffxrk1aw24iscddp60kjbkrl5p7qy38g")))) "0s6mygm3sypjd393f7hsxslqwqp2s1hihb5iv8z8dhc95vj845qd"))))
(properties `((upstream-name . "TAM"))) (properties `((upstream-name . "TAM")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -33241,7 +33379,8 @@ filter.")
(uri (cran-uri "sglOptim" version)) (uri (cran-uri "sglOptim" version))
(sha256 (sha256
(base32 (base32
"15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr")))) "15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"))
(patches (search-patches "r-sgloptim.patch"))))
(properties (properties
`((upstream-name . "sglOptim"))) `((upstream-name . "sglOptim")))
(build-system r-build-system) (build-system r-build-system)
@ -35463,14 +35602,14 @@ model.")
(define-public r-igraph (define-public r-igraph
(package (package
(name "r-igraph") (name "r-igraph")
(version "2.0.1.1") (version "2.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "igraph" version)) (uri (cran-uri "igraph" version))
(sha256 (sha256
(base32 (base32
"0rl8yklm7fpyjsgvjnljp6ldyj393qizi2sd5hsvmbm78h5c9dhv")))) "0kfc9blyy54cz0m4mdzzwgvn0rkil49kdk438411mx62g2vxby9l"))))
(properties (properties
`((upstream-name . "igraph") `((upstream-name . "igraph")
(updater-extra-native-inputs . ("which")))) (updater-extra-native-inputs . ("which"))))
@ -35486,7 +35625,8 @@ model.")
r-magrittr r-magrittr
r-matrix r-matrix
r-pkgconfig r-pkgconfig
r-rlang)) r-rlang
r-vctrs))
(home-page "https://igraph.org") (home-page "https://igraph.org")
(synopsis "Network analysis and visualization") (synopsis "Network analysis and visualization")
(description (description
@ -35499,14 +35639,14 @@ more.")
(define-public r-workflows (define-public r-workflows
(package (package
(name "r-workflows") (name "r-workflows")
(version "1.1.3") (version "1.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "workflows" version)) (uri (cran-uri "workflows" version))
(sha256 (sha256
(base32 (base32
"10a1my6glvc32zxrar1ir699lwav7iz2ji4s6g9iprjndf3nm8ms")))) "120xfm12w8pfqjbmmzsyc01qnffbb1n514dgw9v9gmqdy5l70i6s"))))
(properties `((upstream-name . "workflows"))) (properties `((upstream-name . "workflows")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -36160,14 +36300,14 @@ analysis using @code{dplyr}, @code{ggplot2}, and other Tidy tools.")
(define-public r-parsnip (define-public r-parsnip
(package (package
(name "r-parsnip") (name "r-parsnip")
(version "1.1.1") (version "1.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "parsnip" version)) (uri (cran-uri "parsnip" version))
(sha256 (sha256
(base32 (base32
"1j0bkmv2m4rxmnpq3rqha5jccjxai11m5392hb4dgzni7in36h92")))) "1wggqsvfl2kg8hx9ci6g0fsm2dw9lw6fs7kfy7sdqx6qd7r8bak0"))))
(properties `((upstream-name . "parsnip"))) (properties `((upstream-name . "parsnip")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

39
gnu/packages/databases.scm
View file

@ -46,7 +46,7 @@
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021, 2024 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz> ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;; Copyright © 2021 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2021 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
@ -190,6 +190,39 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public duckdb
(package
(name "duckdb")
(version "0.9.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/duckdb/duckdb")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0dbsxyiz7c8sxflbfj87qv0b2s69zk802vsk5h00ra8w8fcbqlj0"))
(modules '((guix build utils)))
(snippet
#~(begin
;; There is no git checkout from which to read the version tag.
(substitute* "CMakeLists.txt"
(("set\\(DUCKDB_VERSION \"[^\"]*\"")
(string-append "set(DUCKDB_VERSION \"v" #$version "-dev0\"")))))))
(build-system cmake-build-system)
(home-page "https://duckdb.org")
(synopsis "In-process SQL OLAP database management system")
(description "CLI and C/C++ source libraries for DuckDB, a relational
(table-oriented) @acronym{DBMS, Database Management System} that supports
@acronym{SQL, Structured Query Language}, contains a columnar-vectorized query
execution engine, and provides transactional @acronym{ACID, Atomicity
Consistency Isolation and Durability} guarantees via bulk-optimized
@acronym{MVCC, Multi-Version Concurrency Control}. Data can be stored in
persistent, single-file databases with support for secondary indexes.")
(license license:expat)))
(define-public ephemeralpg (define-public ephemeralpg
(package (package
(name "ephemeralpg") (name "ephemeralpg")
@ -3349,6 +3382,10 @@ etc., and an SQL engine for performing simple SQL queries.")
(arguments (arguments
'(#:tests? #f ; Tests try to use a running mongodb server. '(#:tests? #f ; Tests try to use a running mongodb server.
#:import-path "gopkg.in/mgo.v2")) #:import-path "gopkg.in/mgo.v2"))
(propagated-inputs
(list go-gopkg.in-tomb.v2))
(inputs
(list cyrus-sasl))
(native-inputs (native-inputs
(list go-gopkg-in-check-v1)) (list go-gopkg-in-check-v1))
(home-page "https://gopkg.in/mgo.v2") (home-page "https://gopkg.in/mgo.v2")

34
gnu/packages/education.scm
View file

@ -1163,3 +1163,37 @@ mentored learning for programming languages.")
(description "Mazo is a learning application that helps you memorize (description "Mazo is a learning application that helps you memorize
simple concepts using multimedia flash cards and spaced reviews.") simple concepts using multimedia flash cards and spaced reviews.")
(license license:public-domain))) (license license:public-domain)))
(define-public tagainijisho
(package
(name "tagainijisho")
(version "1.2.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/Gnurou/tagainijisho/releases/download/"
version
"/tagainijisho-" version ".tar.gz"))
(sha256
(base32
"00whfcnpn42asxmafcfbcmpwfwyv40qaqdk28psa1vp0lainmyhh"))))
(build-system qt-build-system)
(arguments
(list #:tests? #f)) ;no test target
(native-inputs
(list qttools-5))
(synopsis "Japanese dictionary and learning assistant")
(description
"Tagaini Jisho is a Japanese dictionary and kanji lookup tool. It aims
at becoming your Japanese study assistant. It allows you to quickly search
for entries and mark those that you wish to study, along with tags and
personal notes. It also let you train entries you are studying and follows
your progression in remembering them. Finally, it makes it easy to review
entries you did not remember by listing them on screen or printing them on
a small booklet.
Tagaini Jisho also features complete stroke order animations for more than
6000 kanji.")
(home-page "https://www.tagaini.net")
(license license:gpl3+)))

11
gnu/packages/elixir.scm
View file

@ -108,18 +108,21 @@
;; program, for example `iex -S mix`, so we should not wrap ;; program, for example `iex -S mix`, so we should not wrap
;; mix into shell script. ;; mix into shell script.
(substitute* (string-append out "/bin/mix") (substitute* (string-append out "/bin/mix")
(("Mix.start\\(\\)") "\ (("Mix.start\\(\\)")
~w[GUIX_ELIXIR_LIBS ERL_LIBS] (format #f "\
~~w[GUIX_ELIXIR_LIBS ERL_LIBS]
|> Enum.map(&System.get_env/1) |> Enum.map(&System.get_env/1)
|> Enum.reject(&is_nil/1) |> Enum.reject(&is_nil/1)
|> Enum.join(\":\") |> Enum.join(\":\")
|> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end |> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end
Mix.start()")) System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\"))
Mix.start()"
(search-input-file inputs "/bin/rebar3"))))
(for-each (lambda (program) (for-each (lambda (program)
(wrap-program (string-append out "/bin/" program) (wrap-program (string-append out "/bin/" program)
'("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}")))) '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
programs))))))) programs)))))))
(inputs (list erlang git)) (inputs (list erlang rebar3 git))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_ELIXIR_LIBS") (variable "GUIX_ELIXIR_LIBS")

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

@ -267,6 +267,7 @@
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages wordnet) #:use-module (gnu packages wordnet)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages tor)
#:use-module (gnu packages uml) #:use-module (gnu packages uml)
#:use-module (gnu packages finance) #:use-module (gnu packages finance)
#:use-module (gnu packages ocaml) #:use-module (gnu packages ocaml)
@ -485,7 +486,7 @@ e.g. emacs-geiser-guile for Guile.")
(define-public emacs-gptel (define-public emacs-gptel
(package (package
(name "emacs-gptel") (name "emacs-gptel")
(version "0.6.0") (version "0.7.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -494,7 +495,7 @@ e.g. emacs-geiser-guile for Guile.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0x98s4r2mrbwbsam317dbdq34mcgzfzdmxz3gyq4v2v8x427b3qa")))) "0wfqwp5rz77xzsxb56g4w9h047zb0y06ajcr724b5sjykbbznhzw"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -823,7 +824,7 @@ Common Lisp or Smalltalk, but for Emacs Lisp.")
(define-public emacs-treebundel (define-public emacs-treebundel
(package (package
(name "emacs-treebundel") (name "emacs-treebundel")
(version "0.1.0") (version "0.3.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -832,7 +833,7 @@ Common Lisp or Smalltalk, but for Emacs Lisp.")
(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 "1hk2xnjsr85in48h02xbzi8lsccp36li2bp9v9j0r8qn1bis2vv9")))) (base32 "0fpmm3jb95lksamxqz9850x2vcmcvq6bx29sn0fci6ny4cvpnq5k"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-compat)) (list emacs-compat))
@ -1034,14 +1035,14 @@ uploading PlatformIO projects.")
(define-public emacs-hyperbole (define-public emacs-hyperbole
(package (package
(name "emacs-hyperbole") (name "emacs-hyperbole")
(version "8.0.0") (version "9.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"hyperbole-" version ".tar")) "hyperbole-" version ".tar"))
(sha256 (sha256
(base32 "171x7jad62xd0n3xgs32dksyhn5abxj1kna0qgm65mm0v73hrv8d")))) (base32 "07kpyp3ggf4knakn18niy819l184apx4d9vbcwv57j8zyqgn4c3l"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list #:include #~(cons* "DEMO" (list #:include #~(cons* "DEMO"
@ -2594,7 +2595,7 @@ on the Flexoki colour scheme by Steph Ango.")
(define-public emacs-flycheck (define-public emacs-flycheck
(package (package
(name "emacs-flycheck") (name "emacs-flycheck")
(version "32") (version "34.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2602,7 +2603,7 @@ on the Flexoki colour scheme by Steph Ango.")
(url "https://github.com/flycheck/flycheck/") (url "https://github.com/flycheck/flycheck/")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0dx6wqxz1yfp4shas4yn6abqc8bz21ks3glcyzznm3xspjdaq21s")) (base32 "1rhsrbbg3y50qc4drbdgwa1z0hw7w84blgr0xl6zi9mqnjnak495"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
@ -4313,14 +4314,14 @@ as a library for other Emacs packages.")
(define-public emacs-auctex (define-public emacs-auctex
(package (package
(name "emacs-auctex") (name "emacs-auctex")
(version "13.3.0") (version "14.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar")) "auctex-" version ".tar"))
(sha256 (sha256
(base32 "09yc9242xya2by8z72899li7zc9g23bb8j8m30kbvivynmdfhzkf")))) (base32 "1xk29nk3r7ilxk2vag3diacamqvlws7mbjk5a0iivz5y6fy7hmjc"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time ;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus). ;; ('emacs-minimal' does not provide dbus).
@ -4674,7 +4675,7 @@ of bibliographic references.")
(define-public emacs-corfu (define-public emacs-corfu
(package (package
(name "emacs-corfu") (name "emacs-corfu")
(version "1.1") (version "1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4683,7 +4684,7 @@ of bibliographic references.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1c900hl01vf43r6vikjy2glrac1cl2z54rahs5kb4q77cz0z1zxf")))) (base32 "0l6hpsw2srmad0mhp6x46d5dsg678lvgz5l3glp1845hkg8a0pgi"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -4768,7 +4769,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.")
(define-public emacs-cape (define-public emacs-cape
(package (package
(name "emacs-cape") (name "emacs-cape")
(version "1.1") (version "1.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4777,7 +4778,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0nx08i11s0z9kk711r7wp8sgj00n8hjk5gx0rqr9awrl9fmw1kp2")))) (base32 "1zz5sah8zdkvmbh2kdn4v5vf3sb09krdrxhzyzcg63zjya2z8prz"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -4868,7 +4869,7 @@ that the binary uses instead of the actual binary contents.")
(define-public emacs-org-fc (define-public emacs-org-fc
(package (package
(name "emacs-org-fc") (name "emacs-org-fc")
(version "0.4.0") (version "0.5.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4877,7 +4878,7 @@ that the binary uses instead of the actual binary contents.")
(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 "09s493p2ccvc1zd297kldwinhn6imnmyik98qc56ndb7dp0dwa0x")))) (base32 "0911lr5qlk7p1fg8ady5x39ai08yws70z6yg2w1qgc8zadyqp0w4"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -4903,11 +4904,13 @@ that the binary uses instead of the actual binary contents.")
(("\"find ") (string-append "\"" find " ")) (("\"find ") (string-append "\"" find " "))
(("\"gawk ") (string-append "\"" gawk " ")) (("\"gawk ") (string-append "\"" gawk " "))
(("\"xargs ") (string-append "\"" xargs " ")))))) (("\"xargs ") (string-append "\"" xargs " "))))))
(add-after 'unpack 'require-eieio (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
(substitute* "org-fc-core.el" (substitute* (find-files "tests/" "\\.el$")
(("\\(require 'cl-lib\\)" line) (("\\(ert-deftest org-fc-test-card-rate-(normal|double) .*" all)
(string-append line "\n(require 'eieio)")))))))) (string-append all "(skip-unless nil)\n"))
(("\\(ert-deftest org-fc-test-review-data-update .*" all)
(string-append all "(skip-unless nil)\n"))))))))
(native-inputs (list emacs-el-mock)) (native-inputs (list emacs-el-mock))
(inputs (list findutils gawk)) (inputs (list findutils gawk))
(propagated-inputs (list emacs-hydra)) (propagated-inputs (list emacs-hydra))
@ -5340,14 +5343,14 @@ mode buffers.")
(define-public emacs-mmm-mode (define-public emacs-mmm-mode
(package (package
(name "emacs-mmm-mode") (name "emacs-mmm-mode")
(version "0.5.10") (version "0.5.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"mmm-mode-" version ".tar")) "mmm-mode-" version ".tar"))
(sha256 (sha256
(base32 "1ny9gm87qah4qy0iphw2nlhz2pfc87hzzsv58lrxl18gr69qhndi")))) (base32 "07pda4bvvcmdwkwh8dnfqgvhkdni2wjgps1094kn1j5c9j254741"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/purcell/mmm-mode") (home-page "https://github.com/purcell/mmm-mode")
(synopsis "Allow multiple major modes in an Emacs buffer") (synopsis "Allow multiple major modes in an Emacs buffer")
@ -5485,14 +5488,14 @@ the previous session
(define-public emacs-pabbrev (define-public emacs-pabbrev
(package (package
(name "emacs-pabbrev") (name "emacs-pabbrev")
(version "4.2.2") (version "4.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"pabbrev-" version ".tar")) "pabbrev-" version ".tar"))
(sha256 (sha256
(base32 "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s")))) (base32 "0a54ld80s0r9zrc2kd861p4ii3jzqhxykzcnvi64fhxxg3x2aggx"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/pabbrev.html") (home-page "https://elpa.gnu.org/packages/pabbrev.html")
(synopsis "Predictive abbreviation expansion") (synopsis "Predictive abbreviation expansion")
@ -5581,7 +5584,7 @@ and stored in memory.")
(define-public emacs-saveplace-pdf-view (define-public emacs-saveplace-pdf-view
(package (package
(name "emacs-saveplace-pdf-view") (name "emacs-saveplace-pdf-view")
(version "1.0.4") (version "1.0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -5590,7 +5593,7 @@ and stored in memory.")
(commit (string-append "saveplace-pdf-view-" version)))) (commit (string-append "saveplace-pdf-view-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0i03qb6qc2agp9s5s7l08f1wl8anqndh6xshg1c3w357vd1whv7i")))) (base32 "00cqk1qvmdw07vmmyxc843m2qgx1n9ivwzp73r27v4jxx1i38vx2"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/nicolaisingh/saveplace-pdf-view") (home-page "https://github.com/nicolaisingh/saveplace-pdf-view")
(synopsis "Save place in pdf-view buffers for Emacs") (synopsis "Save place in pdf-view buffers for Emacs")
@ -9008,14 +9011,14 @@ by a query, so both a link can refer to several mails.")
(define-public emacs-debbugs (define-public emacs-debbugs
(package (package
(name "emacs-debbugs") (name "emacs-debbugs")
(version "0.38") (version "0.40")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/debbugs-" (uri (string-append "https://elpa.gnu.org/packages/debbugs-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 "0cl6vcnlyanrl3qzhd31pw9qvij6g88cgifl3mwgw54bbagl9hh6")))) (base32 "0yfl9gd23xnfk3iwiq26brd7fg9ikhd201lw4awng0rdh0fddxwd"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
(propagated-inputs (propagated-inputs
@ -9261,6 +9264,20 @@ commands and user options are usually not implemented here.")
(sha256 (sha256
(base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9")))) (base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
(list
#:include #~(cons* "icons/" %default-include)
#:phases
#~(modify-phases %standard-phases
(add-after 'move-doc 'install-doc-images
(lambda* (#:key outputs #:allow-other-keys)
(let ((images (find-files "./images/small/" ".*\\.png$")))
(for-each
(lambda (image)
(install-file
image
(string-append #$output "/share/info/images/small")))
images)))))))
(home-page "https://company-mode.github.io/") (home-page "https://company-mode.github.io/")
(synopsis "Modular text completion framework") (synopsis "Modular text completion framework")
(description (description
@ -10792,7 +10809,7 @@ sgml/html integration, and indentation (working with sgml).")
(define-public emacs-jinx (define-public emacs-jinx
(package (package
(name "emacs-jinx") (name "emacs-jinx")
(version "1.1") (version "1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -10802,7 +10819,7 @@ sgml/html integration, and indentation (working with sgml).")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08ajkhpds3m8dk1m2h84vcn6pg5w6hbq55xyd50593kb012a2pmz")))) (base32 "04avl356y0m0i1mqmzzz0245fxflj7i8ssicnvf4wmpjc0qdr694"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -11993,7 +12010,7 @@ style, or as multiple word prefixes.")
(define-public emacs-consult (define-public emacs-consult
(package (package
(name "emacs-consult") (name "emacs-consult")
(version "1.1") (version "1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -12001,7 +12018,7 @@ style, or as multiple word prefixes.")
(url "https://github.com/minad/consult") (url "https://github.com/minad/consult")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "11fgjgny10falyjs0dlb8cvvfqpvc538mskq4j60j68v36nnkb23")) (base32 "1466f6j9bxw9mh0ad9yv2qfkhzlz1ysgch53nlkvbry4llhdhj43"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
@ -14116,7 +14133,7 @@ an Emacs buffer.")
(define-public emacs-nodejs-repl (define-public emacs-nodejs-repl
(package (package
(name "emacs-nodejs-repl") (name "emacs-nodejs-repl")
(version "0.2.4") (version "0.2.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -14125,33 +14142,30 @@ an Emacs buffer.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx")))) "06in0nnynrj6ciwbch4x8s65n6d750ikarvrdcjypi0cb0vscwsk"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(inputs (inputs
(list node-lts)) (list node-lts))
(native-inputs (native-inputs
(list emacs-ert-expectations)) (list emacs-ert-expectations))
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-shell (add-after 'unpack 'set-shell
;; Setting the SHELL environment variable is required for the tests ;; Setting the SHELL environment variable is required for the tests
;; to find sh. ;; to find sh.
(lambda _ (lambda _
(setenv "SHELL" (which "sh")) (setenv "SHELL" (which "sh"))))
#t))
(add-after 'unpack 'configure (add-after 'unpack 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((node (assoc-ref inputs "node"))) (let ((node (search-input-file inputs "/bin/node")))
;; Specify the absolute file names of the various ;; Specify the absolute file names of the various
;; programs so that everything works out-of-the-box. ;; programs so that everything works out-of-the-box.
(make-file-writable "nodejs-repl.el") (emacs-substitute-variables "nodejs-repl.el"
(emacs-substitute-variables ("nodejs-repl-command" node))))))
"nodejs-repl.el"
("nodejs-repl-command"
(string-append node "/bin/node")))))))
#:tests? #t #:tests? #t
#:test-command '("emacs" "-Q" "--batch" #:test-command #~(list "emacs" "-Q" "--batch"
"-L" "." "-L" "."
"-l" "test/test.el" "-l" "test/test.el"
"-f" "ert-run-tests-batch-and-exit"))) "-f" "ert-run-tests-batch-and-exit")))
@ -14282,7 +14296,7 @@ in Emacs.")
(define-public emacs-edit-indirect (define-public emacs-edit-indirect
(package (package
(name "emacs-edit-indirect") (name "emacs-edit-indirect")
(version "0.1.11") (version "0.1.13")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -14291,7 +14305,7 @@ in Emacs.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0w30lc8ikrxgbxgmhdxvnzs1b12fvbrg6qf3f9ybyq8v3n7lzi9y")))) (base32 "1qjnhhf8c00hnn0b8icq71l73fa1blxfx9q0ahnvpd32wh6i0bql"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/Fanael/edit-indirect") (home-page "https://github.com/Fanael/edit-indirect")
(synopsis "Edit regions in separate buffers") (synopsis "Edit regions in separate buffers")
@ -15090,7 +15104,7 @@ generated by Org mode (or Markdown mode) is left untouched.")
(define-public emacs-visual-fill-column (define-public emacs-visual-fill-column
(package (package
(name "emacs-visual-fill-column") (name "emacs-visual-fill-column")
(version "2.5.1") (version "2.5.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -15099,7 +15113,7 @@ generated by Org mode (or Markdown mode) is left untouched.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0006x7vbwrx4w3b51aajzds0qaw3zb3b2wmj0c3j0anlrmyb37yz")))) (base32 "0mw61gc70bi64kypnag9xl3y9sd2y7mb8d2q97aq74jx7hq6cm8j"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://codeberg.org/joostkremers/visual-fill-column") (home-page "https://codeberg.org/joostkremers/visual-fill-column")
(synopsis "Fill-column for visual-line-mode") (synopsis "Fill-column for visual-line-mode")
@ -15703,7 +15717,7 @@ implementation.")
(define-public emacs-cider (define-public emacs-cider
(package (package
(name "emacs-cider") (name "emacs-cider")
(version "1.13.0") (version "1.13.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -15712,7 +15726,7 @@ implementation.")
(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 "177dkd2q5fnn1n36d2vvgp6n1hh6rgcglhz63r58nkvb0y3d4kn9")))) (base32 "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
'(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include) '(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include)
@ -16256,7 +16270,7 @@ being deleted, changed, yanked, or pasted when using evil commands")
(define-public emacs-goggles (define-public emacs-goggles
(package (package
(name "emacs-goggles") (name "emacs-goggles")
(version "0.3") (version "0.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -16265,7 +16279,7 @@ being deleted, changed, yanked, or pasted when using evil commands")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx")))) (base32 "1fczxygg1blfmlwswck49rllww77rc7qn91wqw1kvjwfz31sk8z4"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/minad/goggles") (home-page "https://github.com/minad/goggles")
(synopsis "Pulse modified region") (synopsis "Pulse modified region")
@ -16787,7 +16801,7 @@ passive voice.")
(define-public emacs-org (define-public emacs-org
(package (package
(name "emacs-org") (name "emacs-org")
(version "9.6.17") (version "9.6.19")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -16796,7 +16810,7 @@ passive voice.")
(commit (string-append "release_" version)))) (commit (string-append "release_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1szahr3cn8nkr6ncrf6k8l8fqvxg5ya594kj92grkl13qqmr97mb")))) (base32 "0yxicr9z6drsaybp8jl0jmslcqbz0np4gzzkr70j8pq3x9y69i7z"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -17363,7 +17377,7 @@ provides functions to convert hash tables from and to alists and plists.")
(define-public emacs-log4e (define-public emacs-log4e
(package (package
(name "emacs-log4e") (name "emacs-log4e")
(version "0.4.0") (version "0.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -17372,7 +17386,7 @@ provides functions to convert hash tables from and to alists and plists.")
(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 "01nq8im693w7h7pwayd9snz1nhv2k6s969hvgyqn2qh337ly8rwy")))) (base32 "1x08dz18zhifkhrwdbh57izzidaf6vy1vb865f4xrqs6blgfiwj4"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -17747,6 +17761,28 @@ a (typically) noncontiguous set of text.")
Additionally it can display the number of unread emails in the mode line.") Additionally it can display the number of unread emails in the mode line.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-mu4e-column-faces
(package
(name "emacs-mu4e-column-faces")
(version "20221213.2206")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Alexander-Miller/mu4e-column-faces.git")
(commit "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0")))
(sha256
(base32 "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7"))))
(build-system emacs-build-system)
(propagated-inputs
(list mu))
(home-page "https://github.com/Alexander-Miller/mu4e-column-faces")
(synopsis "Faces for individual mu4e columns")
(description
"This package provides a minor mode for individual column faces in mu4e's
mail overview.")
(license license:gpl3+)))
(define-public emacs-mu4e-jump-to-list (define-public emacs-mu4e-jump-to-list
(let ((commit "358bba003543b49ffa266e503e54aebd0ebe614b") (let ((commit "358bba003543b49ffa266e503e54aebd0ebe614b")
(revision "1")) (revision "1"))
@ -17874,7 +17910,7 @@ been adapted to also work with mu4e.")
(define-public emacs-tempel (define-public emacs-tempel
(package (package
(name "emacs-tempel") (name "emacs-tempel")
(version "1.0") (version "1.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -17883,7 +17919,7 @@ been adapted to also work with mu4e.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0f1z5p6vbbjsh7cn7hqhv4c6h4awczpf14sbwpzsnwqsxsfjdh34")))) "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-compat)) (list emacs-compat))
@ -19149,6 +19185,27 @@ methods from a given list.")
(description "Cyrillic input method for dvorak layout.") (description "Cyrillic input method for dvorak layout.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-mini-echo
(let ((commit "f25a2f543b3e9fa5043ef37c81c17fc15aceb534")
(revision "1"))
(package
(name "emacs-mini-echo")
(version (git-version "0.7.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/liuyinz/mini-echo.el.git")
(commit commit)))
(sha256
(base32 "1nbwwf087v1mp5vbmasxqnmbrsgzgm87yd5ajq1hnfxd412w3vhx"))))
(build-system emacs-build-system)
(home-page "https://github.com/liuyinz/mini-echo.el")
(synopsis "Echo buffer status in minibuffer window")
(description "This package lets you show buffer status in the echo area,
so you can get rid of the mode-line.")
(license license:gpl3+))))
(define-public emacs-mini-frame (define-public emacs-mini-frame
(let ((commit "60838f3cab438dcbda8eaa15ab3e5d1af88910e9") (let ((commit "60838f3cab438dcbda8eaa15ab3e5d1af88910e9")
(revision "0")) (revision "0"))
@ -19302,7 +19359,7 @@ code derived from Kelvin H's Org page.")
(define-public emacs-meow (define-public emacs-meow
(package (package
(name "emacs-meow") (name "emacs-meow")
(version "1.4.4") (version "1.4.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -19311,7 +19368,7 @@ code derived from Kelvin H's Org 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
(base32 "1xd9v2ac44kxkbd1va70v7mfccmpnchgl7ipnhikq9y8jha02brr")))) (base32 "0xv6wg4lyi5bv68h5hk5hfxdwxa2g3ybxd8z0l420az4rnhr6zhq"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/meow-edit/meow") (home-page "https://github.com/meow-edit/meow")
(synopsis "Yet another modal editing on Emacs") (synopsis "Yet another modal editing on Emacs")
@ -19752,7 +19809,7 @@ Emacs.")
(define-public emacs-eglot (define-public emacs-eglot
(package (package
(name "emacs-eglot") (name "emacs-eglot")
(version "1.16") (version "1.17")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -19760,11 +19817,11 @@ Emacs.")
".tar")) ".tar"))
(sha256 (sha256
(base32 (base32
"0zi2r8fp7acqlx8s4k2m9dc8w29bwsxyvfa6cnd1366nm3rlfybn")))) "1can988d7qdn0dj4wg8adjz1s9j5yin8bcp7ylhq1pr327d5flky"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-external-completion (list emacs-eldoc
emacs-eldoc emacs-external-completion
emacs-jsonrpc emacs-jsonrpc
emacs-project emacs-project
emacs-seq emacs-seq
@ -20685,7 +20742,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.")
(define-public emacs-ement (define-public emacs-ement
(package (package
(name "emacs-ement") (name "emacs-ement")
(version "0.13") (version "0.14")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -20694,7 +20751,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.")
(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 "0bcsg8mp1z35q6k7zwm7p2ka8gvs9kkazmyjcsk9siqz4mlarv7s")))) (base32 "0nfkxcwkyyy181y6wv64b69rq3spbb3lq634bk6j824aws7ha5rk"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list #:emacs emacs)) ;need libxml support (list #:emacs emacs)) ;need libxml support
@ -21225,7 +21282,7 @@ groups.")
(define-public emacs-taxy-magit-section (define-public emacs-taxy-magit-section
(package (package
(name "emacs-taxy-magit-section") (name "emacs-taxy-magit-section")
(version "0.12.2") (version "0.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -21233,7 +21290,7 @@ groups.")
".tar")) ".tar"))
(sha256 (sha256
(base32 (base32
"1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1")))) "1712hbcna0ph9chaq28a6fanv4sccdiphd5z0hg34ig3g6pslgn9"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (list emacs-magit emacs-taxy)) (propagated-inputs (list emacs-magit emacs-taxy))
(home-page "https://github.com/alphapapa/taxy.el") (home-page "https://github.com/alphapapa/taxy.el")
@ -21868,7 +21925,7 @@ Features:
(define-public emacs-evil-matchit (define-public emacs-evil-matchit
(package (package
(name "emacs-evil-matchit") (name "emacs-evil-matchit")
(version "3.0.2") (version "3.0.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -21877,7 +21934,7 @@ Features:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0igz4kcfb01f9h49n5x9p1idzap54nkw62i1xrql1zlj54s8rv6b")))) (base32 "1m5y5n38w0ijzx2kl9d0nnw70ykx2prmnvv4ip9siad71k7wpwjg"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-evil)) (list emacs-evil))
@ -22721,7 +22778,7 @@ match and total match information in the mode-line in various search modes.")
(define-public emacs-pg (define-public emacs-pg
(package (package
(name "emacs-pg") (name "emacs-pg")
(version "0.27") (version "0.28")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url "https://github.com/emarsden/pg-el") (uri (git-reference (url "https://github.com/emarsden/pg-el")
@ -22729,7 +22786,7 @@ match and total match information in the mode-line in various search modes.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dad9irnv3sppl3yfl5swdsf4f1z2fds7r1li3f1kphm37v6jn5g")))) "00sdvlb9ybyzncjijibw81mf3lhw5p40v7086cg18xvpa2qvzdfz"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/emarsden/pg-el") (home-page "https://github.com/emarsden/pg-el")
(synopsis "Emacs Lisp interface for PostgreSQL") (synopsis "Emacs Lisp interface for PostgreSQL")
@ -23350,7 +23407,7 @@ according to a parsing expression grammar.")
(define-public emacs-eldev (define-public emacs-eldev
(package (package
(name "emacs-eldev") (name "emacs-eldev")
(version "1.8.1") (version "1.8.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -23359,7 +23416,7 @@ according to a parsing expression grammar.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "058f2k2qhwbyr7a759wig9x6v6n2rl7zshqjbp4jnhnkcqkr70g5")))) (base32 "108px7lnf39ngvb8rcqb9qh2amcbs1h22dbwd1q7js2np2nd132y"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -23565,7 +23622,7 @@ files to be expanded upon opening them.")
(define-public emacs-ebib (define-public emacs-ebib
(package (package
(name "emacs-ebib") (name "emacs-ebib")
(version "2.40.3") (version "2.40.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -23574,7 +23631,7 @@ files to be expanded upon opening them.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "07pyb76impqpczx6hl6amfs4hfnszfwydp27az46dkqc17hy0fgy")))) (base32 "0b60k4yqmnim9hx25dhyvn6g646mq10pym8k6h176jr06br8kc2y"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-biblio emacs-compat emacs-ivy emacs-parsebib)) (list emacs-biblio emacs-compat emacs-ivy emacs-parsebib))
@ -24575,7 +24632,7 @@ expansions for debugging with Edebug as normal.")
(define-public emacs-parent-mode (define-public emacs-parent-mode
(package (package
(name "emacs-parent-mode") (name "emacs-parent-mode")
(version "2.3") (version "2.3.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -24584,12 +24641,20 @@ expansions for debugging with Edebug as normal.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni")))) (base32 "1ki22rkbyglr3wppjph6gy23lcx2nwj9w0ff9h3ryd197j4yvvgi"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
(list
#:tests? #t
#:test-command #~(list "emacs" "--batch"
"-l" "parent-mode-test.el"
"-f" "ert-run-tests-batch-and-exit")))
(home-page "https://github.com/Fanael/parent-mode") (home-page "https://github.com/Fanael/parent-mode")
(synopsis "Get major mode's parent modes") (synopsis "Get major mode's parent modes")
(description "Get major mode's parent modes") (description
(license license:gpl3+))) "This package provides a function to list all current major mode's parent
modes.")
(license license:bsd-2)))
(define-public emacs-lacarte (define-public emacs-lacarte
(let ((commit "79afc5d2406dae5aabc1c12089e8e2e1990abd85") (let ((commit "79afc5d2406dae5aabc1c12089e8e2e1990abd85")
@ -28262,7 +28327,7 @@ buffers – other modes on the TODO list).
(define-public emacs-magit-todos (define-public emacs-magit-todos
(package (package
(name "emacs-magit-todos") (name "emacs-magit-todos")
(version "1.7") (version "1.7.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -28272,7 +28337,7 @@ buffers – other modes on the TODO list).
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zjlf3bhz0a7r9sa5ic22vwr2w1zxbfk9z545pdd1fvp00c2kzd0")))) "1y5l36ig0q5dqgijw916zgaz68kphg7k6kxs560vrfwkfn0cy59d"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-async (list emacs-async
@ -28524,7 +28589,7 @@ and comments.")
(define-public emacs-yeetube (define-public emacs-yeetube
(package (package
(name "emacs-yeetube") (name "emacs-yeetube")
(version "2.0.9") (version "2.1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -28533,7 +28598,7 @@ and comments.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"17475zkvhj7yc3sxv0snmvxf84mkl30l78s28gzzm3j15p806cbd")) "0c2iq6rb179zh9qbw7prxsjbiz77j060pj75s82wbbz5xjavzgp5"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
@ -28547,10 +28612,14 @@ and comments.")
(search-input-file inputs "/bin/yt-dlp"))) (search-input-file inputs "/bin/yt-dlp")))
(emacs-substitute-variables "yeetube-mpv.el" (emacs-substitute-variables "yeetube-mpv.el"
("yeetube-mpv-path" ("yeetube-mpv-path"
(search-input-file inputs "/bin/mpv"))) (search-input-file inputs "/bin/mpv"))
("yeetube-mpv-torsocks"
(search-input-file inputs "/bin/torsocks")))))
(add-after 'unpack 'relax-check
(lambda _
(substitute* "yeetube-mpv.el" (substitute* "yeetube-mpv.el"
(("\\(yeetube-mpv-check\\)") ""))))))) (("\\(yeetube-mpv-check\\)") "")))))))
(inputs (list mpv yt-dlp)) (inputs (list mpv torsocks yt-dlp))
(propagated-inputs (list emacs-compat)) (propagated-inputs (list emacs-compat))
(home-page "https://thanosapollo.com/blog/yeetube/") (home-page "https://thanosapollo.com/blog/yeetube/")
(synopsis "Youtube and Invidious front-end for Emacs") (synopsis "Youtube and Invidious front-end for Emacs")
@ -30093,7 +30162,7 @@ interface to attach and interact with the processes.")
(define-public emacs-dtrt-indent (define-public emacs-dtrt-indent
(package (package
(name "emacs-dtrt-indent") (name "emacs-dtrt-indent")
(version "1.16") (version "1.17")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -30102,7 +30171,7 @@ interface to attach and interact with the processes.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01jrnzbqgj8pimvrb8335vjly04r0bx67gvq7dvprnf72n49r4i7")))) "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/jscheid/dtrt-indent") (home-page "https://github.com/jscheid/dtrt-indent")
(synopsis "Minor mode that guesses the indentation offset") (synopsis "Minor mode that guesses the indentation offset")
@ -32559,14 +32628,14 @@ well as an option for visually flashing evaluated s-expressions.")
(define-public emacs-tramp (define-public emacs-tramp
(package (package
(name "emacs-tramp") (name "emacs-tramp")
(version "2.6.2.0") (version "2.6.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"tramp-" version ".tar")) "tramp-" version ".tar"))
(sha256 (sha256
(base32 "06wpaqjr3qw1424k9rh5i28yxrkzh1z5dczpgp7mpv823l2x8ip3")))) (base32 "145riknpdvw7rvpz20m766yci3w012f241mw38pbbb9cb8pn2rbf"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -32581,8 +32650,6 @@ well as an option for visually flashing evaluated s-expressions.")
(emacs-substitute-variables "tramp.el" (emacs-substitute-variables "tramp.el"
("tramp-encoding-shell" ("tramp-encoding-shell"
(search-input-file inputs "/bin/sh")))))))) (search-input-file inputs "/bin/sh"))))))))
(inputs
(list bash))
(home-page "https://savannah.gnu.org/projects/tramp") (home-page "https://savannah.gnu.org/projects/tramp")
(synopsis "Remote file editing package for Emacs") (synopsis "Remote file editing package for Emacs")
(description (description
@ -32984,17 +33051,19 @@ programming in Emacs Lisp easy and fun.")
(define-public emacs-excorporate (define-public emacs-excorporate
(package (package
(name "emacs-excorporate") (name "emacs-excorporate")
(version "1.1.1") (version "1.1.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"excorporate-" version ".tar")) "excorporate-" version ".tar"))
(sha256 (sha256
(base32 "06ilfkrlx6ca0qfqq3w1w07kdwak556i1wgf1875py2d5xkg4r90")))) (base32 "11w53idm7m20jhmwnj9wiqiv6fzydjrgy2s3mp36barlj3xq0l0z"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-fsm emacs-soap-client emacs-url-http-ntlm (list emacs-fsm
emacs-soap-client
emacs-url-http-ntlm
emacs-url-http-oauth)) emacs-url-http-oauth))
(home-page "https://elpa.gnu.org/packages/excorporate.html") (home-page "https://elpa.gnu.org/packages/excorporate.html")
(synopsis "Exchange integration") (synopsis "Exchange integration")
@ -33238,7 +33307,7 @@ it forcibly
(define-public emacs-elpher (define-public emacs-elpher
(package (package
(name "emacs-elpher") (name "emacs-elpher")
(version "3.5.0") (version "3.5.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -33247,7 +33316,7 @@ it forcibly
(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 "0cxzv9nx5vshf45r7msaqnq8h7xwi4kd8pb3na3dljlrhwvgdrk6")))) (base32 "1qiqjkbqjv6gw4lyf697jsb081sy2r46i3q6gdssfrhsjjmb8jag"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -33496,7 +33565,7 @@ simple but powerful Org contents.")
(define-public emacs-ox-tufte (define-public emacs-ox-tufte
(package (package
(name "emacs-ox-tufte") (name "emacs-ox-tufte")
(version "4.0.1") (version "4.0.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -33505,10 +33574,30 @@ simple but powerful Org contents.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1v8jr1k8wfpzwry073rrgkxfpwylxmk7xqabxzp49z40rc7hp26s")))) (base32 "15jfwrdawj8flgyfqhsfhdlnam6n5gzw5minnixwxyp69q5vxnpw"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
(list
#:include #~(cons "^src/" %default-include)
#:tests? #t
;; <https://github.com/emacs-eldev/eldev/issues/99#issuecomment-1912637609>
#:test-command #~(list "eldev" "-X" "-dtTC" "test")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'configure-eldev
(lambda _
(setenv "HOME"
(string-append (getcwd) "/.eldev"))
(with-output-to-file "Eldev-local"
(lambda _
(format #t "~s"
'(dolist (d (split-string (getenv
"EMACSLOADPATH")
":" t))
(ignore-errors
(eldev-use-local-dependency d)))))))))))
(native-inputs (list emacs-buttercup emacs-eldev))
(propagated-inputs (list emacs-org)) (propagated-inputs (list emacs-org))
(arguments '(#:include (cons "^src/" %default-include)))
(home-page "https://github.com/ox-tufte/ox-tufte") (home-page "https://github.com/ox-tufte/ox-tufte")
(synopsis "Tufte HTML Org mode export backend") (synopsis "Tufte HTML Org mode export backend")
(description (description
@ -33591,7 +33680,7 @@ time.")
(define-public emacs-mastodon (define-public emacs-mastodon
(package (package
(name "emacs-mastodon") (name "emacs-mastodon")
(version "1.0.13") (version "1.0.14")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -33600,7 +33689,7 @@ time.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "143wmg9jhdi79y1gdi0y9xxpp8vyn7qbhvaysq1sf7g1h0jskxc2")))) (base32 "151190hcafm0r8pi053lm7akjli3m55q676sa3i3fy9c0pc4bhz8"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -34654,7 +34743,7 @@ contributed packages to Telega.")))
(define-public emacs-doom-modeline (define-public emacs-doom-modeline
(package (package
(name "emacs-doom-modeline") (name "emacs-doom-modeline")
(version "4.0.1") (version "4.1.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -34662,7 +34751,7 @@ contributed packages to Telega.")))
(url "https://github.com/seagle0128/doom-modeline") (url "https://github.com/seagle0128/doom-modeline")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0pwfmj01cqij84dig5qj86n7f4cva5mdjqahr0061byrlv9xrpzb")) (base32 "0l7yyn8yxyxbsjbs52bp9wh66wdj828scb1gjbi6pk1hrx5x8g9v"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
@ -37804,7 +37893,7 @@ and preferred services can easily be configured.")
(define-public emacs-vertico (define-public emacs-vertico
(package (package
(name "emacs-vertico") (name "emacs-vertico")
(version "1.6") (version "1.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -37813,7 +37902,7 @@ and preferred services can easily be configured.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "088x0xqmhicdg44xprhimay0v9hcy12g15c7lk5kvhylxmkbg8wb")))) (base32 "03m5v4r6n10ydmr1lks0d91dlirxlsh82l0qlac8qqfz09g0p76a"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -38626,7 +38715,7 @@ hacker.")
(define-public emacs-osm (define-public emacs-osm
(package (package
(name "emacs-osm") (name "emacs-osm")
(version "1.2") (version "1.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -38635,7 +38724,7 @@ hacker.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0mmq83ill1vzx1x07vxjn53di2cskid2gmj5qqa6694s1xzpywf4")))) "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list #:phases #~(modify-phases %standard-phases (list #:phases #~(modify-phases %standard-phases
@ -38954,11 +39043,9 @@ into the current buffer.")
"This package provides notification functions for Org Agenda."))) "This package provides notification functions for Org Agenda.")))
(define-public emacs-flymake-mypy (define-public emacs-flymake-mypy
(let ((commit "d79e158f9ed3065ab692cd0d4048aac985c4fecd")
(revision "0"))
(package (package
(name "emacs-flymake-mypy") (name "emacs-flymake-mypy")
(version "0.3.0") (version "0.3.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -38967,14 +39054,14 @@ into the current buffer.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zaa2kljsmm13layqmb7dwd7l2x3a5ymzzmzjjhykc67kbyjvvkk")))) "1w9bx0ay7jshwflndmf0ix5ghglw57isp2903x3jiv79lkd28xhg"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/com4/flymake-mypy") (home-page "https://github.com/com4/flymake-mypy")
(synopsis "Flymake checker for mypy") (synopsis "Flymake checker for mypy")
(description (description
"This package provides Flymake support for Python static type checking "This package provides Flymake support for Python static type checking
using mypy.") using mypy.")
(license license:bsd-2)))) (license license:bsd-2)))
(define-public emacs-mpv (define-public emacs-mpv
;; No release since Dec 28, 2021. ;; No release since Dec 28, 2021.
@ -39295,7 +39382,7 @@ in Emacs.")
(define-public emacs-vertico-posframe (define-public emacs-vertico-posframe
(package (package
(name "emacs-vertico-posframe") (name "emacs-vertico-posframe")
(version "0.7.6") (version "0.7.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -39303,7 +39390,7 @@ in Emacs.")
".tar")) ".tar"))
(sha256 (sha256
(base32 (base32
"15d7j37rmmg021mciwibcfmdwjn2694ljlh4sj03m1j4gj7igfqd")))) "0xqbbqkzd2v7kqgmiwlx9pmpck2mpfwxmvy66i7dpzysvargi70q"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (list emacs-posframe emacs-vertico)) (propagated-inputs (list emacs-posframe emacs-vertico))
(home-page "https://github.com/tumashu/vertico-posframe") (home-page "https://github.com/tumashu/vertico-posframe")
@ -39432,6 +39519,26 @@ specified in RFC 6238. It supports reading secrets in HEX and multiple base32
variations, including non-standard base32 encodings.") variations, including non-standard base32 encodings.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-back-button
(package
(name "emacs-back-button")
(version "0.6.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rolandwalker/back-button.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf"))))
(build-system emacs-build-system)
(synopsis "Visual navigation through mark rings in Emacs")
(description "This package provides a way for the user to navigate
through mark rings (in both directions, and globally or locally).")
(home-page "https://www.emacswiki.org/emacs/BackButton")
(license license:bsd-2)))
;;; ;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar ;;; of a merge conflict, place them above by existing packages with similar

18
gnu/packages/embedded.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2023, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
@ -983,14 +983,16 @@ code.")
"0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck")))) "0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests (list
#:tests? #false ;no tests
#:parallel-build? #false ;not supported
#:make-flags #:make-flags
(list "OS=linux" #~(list "OS=linux"
(string-append "TARGET=" (assoc-ref %outputs "out"))) (string-append "TARGET=" #$output))
#:phases #:phases
(modify-phases %standard-phases '(modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (chdir "loader") #t)) (lambda _ (chdir "loader")))
(delete 'configure)))) (delete 'configure))))
(native-inputs (native-inputs
(list openspin (make-propeller-toolchain))) (list openspin (make-propeller-toolchain)))
@ -1637,7 +1639,7 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
(define-public sdcc (define-public sdcc
(package (package
(name "sdcc") (name "sdcc")
(version "4.3.0") (version "4.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1645,7 +1647,7 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
"/" version "/sdcc-src-" version ".tar.bz2")) "/" version "/sdcc-src-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1kckr20jqa4rp4qcw38lwagmw3yfm3z0xb4kygd0608847qc0vra")) "0xbaj3vx5cp3na1kmyhy4jvhcqwrg648scjbykgq0xmibqb1535f"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin

12
gnu/packages/engineering.scm
View file

@ -1098,7 +1098,7 @@ Emacs).")
(define-public kicad (define-public kicad
(package (package
(name "kicad") (name "kicad")
(version "7.0.10") (version "7.0.11")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1106,7 +1106,7 @@ Emacs).")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0rmlkgzgvpd70jzspyrrb2f618fimw52qrhpsp777flmpyh91wly")) "1qn7w6pb1n5gx73z1zqbv140chh4307y8764z7xkdvric9i48qj4"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -1206,7 +1206,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lc7d6hn8ya8m51kjnf59v41pbp03l5ncxir75s21pb92l26xgnv")))) "10iwp35xywdz15a83vialzfd46rjw6mlz174dxawm2rw4ws2n7j4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DBUILD_FORMATS=html") `(#:configure-flags (list "-DBUILD_FORMATS=html")
@ -1240,7 +1240,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v")))) "057zmhf4h3p3p4y6jqxch9cj1wqf129k6kmvx2gshb9lgda0kjr8"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no tests exist `(#:tests? #f)) ; no tests exist
@ -1269,7 +1269,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy")))) "1r9v8v41n0yrgwsqaksskmdgb9vyw1sb92xh81bwrv2ag3p5vdg7"))))
(synopsis "Official KiCad footprint libraries") (synopsis "Official KiCad footprint libraries")
(description "This package contains the official KiCad footprint libraries."))) (description "This package contains the official KiCad footprint libraries.")))
@ -1286,7 +1286,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626")))) "0lcy1av7ixg1f7arflk50jllpc1749sfvf3h62hkxsz97wkr97xj"))))
(synopsis "Official KiCad 3D model libraries") (synopsis "Official KiCad 3D model libraries")
(description "This package contains the official KiCad 3D model libraries."))) (description "This package contains the official KiCad 3D model libraries.")))

68
gnu/packages/file-systems.scm
View file

@ -68,6 +68,7 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
@ -84,6 +85,8 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages m4)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages nfs) #:use-module (gnu packages nfs)
#:use-module (gnu packages onc-rpc) #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
@ -108,6 +111,7 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define-public autofs (define-public autofs
@ -1221,6 +1225,70 @@ APFS.")
(home-page "https://github.com/sgan81/apfs-fuse") (home-page "https://github.com/sgan81/apfs-fuse")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public snapper
(package
(name "snapper")
(version "0.10.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openSUSE/snapper")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0nwmyzjwid1lf29dsr6w72dr781c81xyrjpk5y3scn4r55b5df0h"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "dists")
(delete-file-recursively "zypp-plugin")
(substitute* '("configure.ac" "doc/Makefile.am")
((".*dists.*") "")
((".*zypp-plugin.*") ""))
(substitute* "Makefile.am"
(("zypp-plugin") ""))))))
(build-system gnu-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'relative-file-locations
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(substitute* (list "scripts/Makefile.am"
"data/Makefile.am")
(("/usr/share")
(string-append out "/share"))
(("/usr/lib")
(string-append out "/lib"))
(("/etc/")
(string-append out "/etc/"))))
(substitute* "client/Makefile.am"
(("/usr/lib")
"@libdir@")))))))
(home-page "https://snapper.io")
(native-inputs
(list glibc-locales autoconf automake libtool pkg-config))
(inputs
(list btrfs-progs
e2fsprogs
`(,util-linux "lib")
linux-pam
dbus
libxml2
json-c
acl
boost
ncurses/tinfo
libxslt
docbook-xsl
gettext-minimal))
(synopsis "Manage Btrfs file system snapshots and allow roll-backs")
(description "This package provides Snapper, a tool that helps with
managing snapshots of Btrfs subvolumes and thin-provisioned LVM volumes. It
can create and compare snapshots, revert differences between them, and
supports automatic snapshots timelines.")
(license license:gpl2)))
(define-public xfstests (define-public xfstests
;; The last release (1.1.0) is from 2011. ;; The last release (1.1.0) is from 2011.
(let ((revision "3") (let ((revision "3")

4
gnu/packages/finance.scm
View file

@ -2243,7 +2243,7 @@ and manipulation.")
(define-public xmrig (define-public xmrig
(package (package
(name "xmrig") (name "xmrig")
(version "6.20.0") (version "6.21.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2251,7 +2251,7 @@ and manipulation.")
(url "https://github.com/xmrig/xmrig") (url "https://github.com/xmrig/xmrig")
(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 (base32 "02clipcixn0g4sm3b5r1cxx56ddhjkm8sqnq40jy1zm66ad5zhkj")) (sha256 (base32 "1nmzgwd2r7ra7g4p0s5b77bgh099hf1kisbv4d946c9yiwbdzqgc"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; TODO: Try to use system libraries instead of bundled ones in ;; TODO: Try to use system libraries instead of bundled ones in

46
gnu/packages/fonts.scm
View file

@ -216,7 +216,7 @@ in print. With attention to detail for high resolution rendering.")
(define-public font-intel-one-mono (define-public font-intel-one-mono
(package (package
(name "font-intel-one-mono") (name "font-intel-one-mono")
(version "1.2.1") (version "1.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -225,8 +225,26 @@ in print. With attention to detail for high resolution rendering.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1md57997nzkz75ambsahawzy1x71qvkp6f87zcqibksm66yvcjdc")))) "0w9isn8az1k3a3q4m2llwnryy79i5v30dx1hfaf90x0zkj98ky5h"))))
(outputs '("out" "ttf" "woff"))
(build-system font-build-system) (build-system font-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'install 'split-outputs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out-fonts (string-append (assoc-ref outputs "out")
"/share/fonts"))
(ttf-fonts (string-append (assoc-ref outputs "ttf")
"/share/fonts"))
(woff-fonts (string-append (assoc-ref outputs "woff")
"/share/fonts")))
(mkdir-p ttf-fonts)
(mkdir-p woff-fonts)
(rename-file (string-append out-fonts "/truetype")
(string-append ttf-fonts "/truetype"))
(rename-file (string-append out-fonts "/web")
(string-append woff-fonts "/web"))))))))
(home-page "https://github.com/intel/intel-one-mono") (home-page "https://github.com/intel/intel-one-mono")
(synopsis "Expressive monospaced font family") (synopsis "Expressive monospaced font family")
(description (description
@ -587,6 +605,30 @@ The unified Libertinus family consists of:
@end enumerate\n") @end enumerate\n")
(license license:silofl1.1))) (license license:silofl1.1)))
(define-public font-libre-franklin
(let ((commit "bfc61d6e403771c2e90aa6e0bd54975633974fb2")
(revision "0"))
(package
(name "font-libre-franklin")
(version (git-version "1.015" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/impallari/Libre-Franklin")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"07rm9fkhm8ckxpaj0zixl4vgzmj6bj4xzbaqm5hngdjds1bjv1ls"))))
(build-system font-build-system)
(home-page "https://fonts.google.com/specimen/Libre+Franklin")
(synopsis "Font family based on Franklin Gothic")
(description
"The Libre Franklin font family is an open source interpretation and
expansion of Franklin Gothic, a classic font. It covers 105 Latin Languages.")
(license license:silofl1.1))))
(define-public font-terminus (define-public font-terminus
(package (package
(name "font-terminus") (name "font-terminus")

50
gnu/packages/game-development.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2017, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2019, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com> ;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
@ -58,6 +58,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system copy) #:use-module (guix build-system copy)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system scons) #:use-module (guix build-system scons)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -115,6 +116,7 @@
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages stb) #:use-module (gnu packages stb)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
@ -453,6 +455,40 @@ compiling NML files (along with their associated language, sound and graphic
files) into @file{.grf} and/or @file{.nfo} files.") files) into @file{.grf} and/or @file{.nfo} files.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public python-pybox2d
(package
(name "python-pybox2d")
(version "2.3.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pybox2d/pybox2d")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0dha28yscr1lpyzy9ygqc01a8pyf7n9vavyxikqh469wr2zcacna"))))
(build-system pyproject-build-system)
(arguments
(list
;; It is not clear how to run the tests
#:tests? #false
#:phases
'(modify-phases %standard-phases
(add-before 'build 'build-ext
(lambda _
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs (list swig))
(home-page "https://github.com/pybox2d/pybox2d")
(synopsis "2D game physics for Python")
(description
"Pybox2d is a 2D physics library for your games and simple simulations.
It's based on the Box2D library, written in C++. It supports several shape
types (circle, polygon, thin line segments), and quite a few joint
types (revolute, prismatic, wheel, etc.).")
(license license:zlib)))
(define-public python-sge (define-public python-sge
(package (package
(name "python-sge") (name "python-sge")
@ -1275,13 +1311,13 @@ interface (API).")
(define-public python-pygame (define-public python-pygame
(package (package
(name "python-pygame") (name "python-pygame")
(version "2.1.2") (version "2.5.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pygame" version)) (uri (pypi-uri "pygame" version))
(sha256 (sha256
(base32 (base32
"0g6j79naab7583kymf1bgxc5l5c9h5laq887rmvh8vw8iyifrl6n")))) "0jn2n70hmgr33yc6xzdi33cs5w7jnmgi44smyxfarrrrsnsrxf61"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -1344,7 +1380,7 @@ and multimedia programs in the Python language.")
(define-public python-pygame-sdl2 (define-public python-pygame-sdl2
(let ((real-version "2.1.0") (let ((real-version "2.1.0")
(renpy-version "8.1.3")) (renpy-version "8.2.0"))
(package (package
(inherit python-pygame) (inherit python-pygame)
(name "python-pygame-sdl2") (name "python-pygame-sdl2")
@ -1354,7 +1390,7 @@ and multimedia programs in the Python language.")
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version (uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz")) "/pygame_sdl2-" version ".tar.gz"))
(sha256 (base32 "0qlprs9n3w254ilizqzvr6s01zx72gh7an0bgwxsq4hm22qypdws")) (sha256 (base32 "17mc39c7ha83kzv2wmq61a15mn6p8wh2y33ixhf5sb4bvyr48mhy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1395,7 +1431,7 @@ developed mainly for Ren'py.")
(define-public python-renpy (define-public python-renpy
(package (package
(name "python-renpy") (name "python-renpy")
(version "8.1.3") (version "8.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1403,7 +1439,7 @@ developed mainly for Ren'py.")
"/renpy-" version "-source.tar.bz2")) "/renpy-" version "-source.tar.bz2"))
(sha256 (sha256
(base32 (base32
"1g6fz5dxp7yxhgv6q4brzf5hpfqq3l1g3dfv3fsiwwn6mj0b01z2")) "02v54qqjjigfqhdr50kzhkdvplk56bvprq65jl57kcs1qhvlf5s9"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin

1
gnu/packages/games.scm
View file

@ -7270,6 +7270,7 @@ fight against their plot and save his fellow rabbits from slavery.")
(synopsis "Data files for 0ad") (synopsis "Data files for 0ad")
(description "0ad-data provides the data files required by the game 0ad.") (description "0ad-data provides the data files required by the game 0ad.")
(home-page "https://play0ad.com") (home-page "https://play0ad.com")
(properties '((hidden? . #t)))
(license (list (license:fsdg-compatible (license (list (license:fsdg-compatible
"http://tavmjong.free.fr/FONTS/ArevCopyright.txt" "http://tavmjong.free.fr/FONTS/ArevCopyright.txt"
"Similar to the license of the Bitstream Vera fonts.") "Similar to the license of the Bitstream Vera fonts.")

81
gnu/packages/gcc.scm
View file

@ -192,13 +192,16 @@ where the OS part is overloaded to denote a specific ABI---into GCC
`(#:out-of-source? #t `(#:out-of-source? #t
#:configure-flags ,(let ((flags (configure-flags)) #:configure-flags ,(let ((flags (configure-flags))
(version (package-version this-package))) (version (package-version this-package)))
;; GCC 4.9 and 5.0 requires C++11 but GCC ;; GCC 11.3.0 defaults to C++17 which is partly
;; 11.3.0 defaults to C++17, which is partly ;; incompatible with some earlier versions.
;; incompatible. Force C++11. ;; Force an earlier C++ standard while building.
(if (or (version-prefix? "4.9" version) (cond
((version-prefix? "4.8" version)
`(cons "CXX=g++ -std=c++03" ,flags))
((or (version-prefix? "4.9" version)
(version-prefix? "5" version)) (version-prefix? "5" version))
`(cons "CXX=g++ -std=c++11" ,flags) `(cons "CXX=g++ -std=c++11" ,flags))
flags)) (else flags)))
#:make-flags #:make-flags
;; None of the flags below are needed when doing a Canadian cross. ;; None of the flags below are needed when doing a Canadian cross.
@ -419,6 +422,37 @@ Go. It also includes runtime support libraries for these languages.")
(("struct ucontext") "ucontext_t"))) (("struct ucontext") "ucontext_t")))
'("aarch64" "alpha" "bfin" "i386" "m68k" '("aarch64" "alpha" "bfin" "i386" "m68k"
"pa" "sh" "tilepro" "xtensa"))))) "pa" "sh" "tilepro" "xtensa")))))
(arguments
;; Since 'arguments' is a function of the package's version, define
;; 'parent' such that the 'arguments' thunk gets to see the right
;; version.
(let ((parent (package
(inherit gcc-4.7)
(version (package-version this-package)))))
(if (%current-target-system)
(package-arguments parent)
;; For native builds of some GCC versions the C++ include path needs to
;; be adjusted so it does not interfere with GCC's own build processes.
(substitute-keyword-arguments (package-arguments parent)
((#:modules modules %gnu-build-system-modules)
`((srfi srfi-1)
,@modules))
((#:phases phases)
`(modify-phases ,phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))
(gcc (assoc-ref inputs "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join (fold delete
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)
(list (string-append libc "/include")
(string-append gcc "/include/c++")))
":"))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))))))))
(supported-systems %supported-systems) (supported-systems %supported-systems)
(inputs (inputs
(modify-inputs (package-inputs gcc-4.7) (modify-inputs (package-inputs gcc-4.7)
@ -454,38 +488,7 @@ Go. It also includes runtime support libraries for these languages.")
"pa" "sh" "tilepro" "xtensa"))))) "pa" "sh" "tilepro" "xtensa")))))
;; Override inherited texinfo-5 with latest version. ;; Override inherited texinfo-5 with latest version.
(native-inputs (list perl ;for manpages (native-inputs (list perl ;for manpages
texinfo)) texinfo))))
(arguments
;; Since 'arguments' is a function of the package's version, define
;; 'parent' such that the 'arguments' thunk gets to see the right
;; version.
(let ((parent (package
(inherit gcc-4.8)
(version (package-version this-package)))))
(if (%current-target-system)
(package-arguments parent)
;; For native builds of GCC 4.9 and GCC 5, the C++ include path needs
;; to be adjusted so it does not interfere with GCC's own build processes.
(substitute-keyword-arguments (package-arguments parent)
((#:modules modules %gnu-build-system-modules)
`((srfi srfi-1)
,@modules))
((#:phases phases)
`(modify-phases ,phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))
(gcc (assoc-ref inputs "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join (fold delete
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)
(list (string-append libc "/include")
(string-append gcc "/include/c++")))
":"))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))))))))))
(define gcc-canadian-cross-objdump-snippet (define gcc-canadian-cross-objdump-snippet
;; Fix 'libcc1/configure' error when cross-compiling GCC. Without that, ;; Fix 'libcc1/configure' error when cross-compiling GCC. Without that,
@ -546,7 +549,7 @@ Go. It also includes runtime support libraries for these languages.")
"gcc-5.0-libvtv-runpath.patch")))) "gcc-5.0-libvtv-runpath.patch"))))
;; GCC 4.9 and 5 has a workaround that is not needed for GCC 6 and later. ;; GCC 4.9 and 5 has a workaround that is not needed for GCC 6 and later.
(arguments (package-arguments gcc-4.8)) (arguments (package-arguments gcc-4.7))
(inputs (inputs
`(("isl" ,isl) `(("isl" ,isl)

39
gnu/packages/gnuzilla.scm
View file

@ -376,31 +376,6 @@ from collections.abc import MutableSequence"))))
(list icu4c-69 readline zlib)))) (list icu4c-69 readline zlib))))
;;
;; Needed for IceCat 115.
;;
(define icu4c-73-promise
(delay
(package
(inherit icu4c)
(version "73.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/unicode-org/icu/releases/download/release-"
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
(sha256
(base32
"0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
(patches
(cons
(search-patch
"icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
(origin-patches (package-source icu4c)))))))))
;;; ;;;
;;; Localization helper procedures. ;;; Localization helper procedures.
;;; ;;;
@ -548,9 +523,9 @@ variable defined below. It requires guile-json to be installed."
;; XXXX: Workaround 'snippet' limitations. ;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method)) (define computed-origin-method (@@ (guix packages) computed-origin-method))
(define %icecat-base-version "115.7.0") (define %icecat-base-version "115.8.0")
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
(define %icecat-build-id "20240123000000") ;must be of the form YYYYMMDDhhmmss (define %icecat-build-id "20240220000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -570,12 +545,12 @@ variable defined below. It requires guile-json to be installed."
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"0ad4az0hiq7q9pnya1pyj75a732ag5bd4jp8mxg4izz97k6zzv8k")))) "1slmp2v1q3my81z8kiym9rpxw5d9n4sn07v7hv99517w7vr8d05g"))))
;; The upstream-icecat-base-version may be older than the ;; The upstream-icecat-base-version may be older than the
;; %icecat-base-version. ;; %icecat-base-version.
(upstream-icecat-base-version "115.7.0") (upstream-icecat-base-version "115.8.0")
(gnuzilla-commit "dbe6da400cf4f28e5e893d0acb5022e23cf3afcf") (gnuzilla-commit "7e2ff1ad7e03d2bfe0b2daf3f25961b06cab8848")
(gnuzilla-source (gnuzilla-source
(origin (origin
(method git-fetch) (method git-fetch)
@ -587,7 +562,7 @@ variable defined below. It requires guile-json to be installed."
(string-take gnuzilla-commit 8))) (string-take gnuzilla-commit 8)))
(sha256 (sha256
(base32 (base32
"0j7wxiyqqwn8slr4cjwqya9jh912l0xjprld5hj79an0vnb7c21h")))) "1lv3vfqv0zb634gnvzb37fs04rb1jlrd2n1k51yjsvdznpqfpi1y"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it ;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings. ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -758,7 +733,7 @@ variable defined below. It requires guile-json to be installed."
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
ffmpeg-5 ffmpeg-5
libvpx libvpx
(force icu4c-73-promise) icu4c-73
pixman pixman
pulseaudio pulseaudio
mesa mesa

2
gnu/packages/golang-build.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -252,6 +253,7 @@ loading algorithms.")
(arguments (arguments
'(#:import-path "golang.org/x/net/html" '(#:import-path "golang.org/x/net/html"
#:unpack-path "golang.org/x/net")) #:unpack-path "golang.org/x/net"))
(propagated-inputs (list go-golang-org-x-text))
(home-page "https://godoc.org/golang.org/x/net/html") (home-page "https://godoc.org/golang.org/x/net/html")
(synopsis "HTML5-compliant tokenizer and parser") (synopsis "HTML5-compliant tokenizer and parser")
(description (description

96
gnu/packages/golang-check.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -59,30 +60,26 @@
;;; Libraries: ;;; Libraries:
;;; ;;;
(define-public go-github-com-alecthomas-assert (define-public go-github-com-alecthomas-assert-v2
(let ((commit "405dbfeb8e38effee6e723317226e93fff912d06")
(revision "1"))
(package (package
(name "go-github-com-alecthomas-assert") (name "go-github-com-alecthomas-assert-v2")
(version (git-version "0.0.1" revision commit)) (version "2.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/alecthomas/assert") (url "https://github.com/alecthomas/assert")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz"))))
"1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/alecthomas/assert")) (list #:go go-1.18
(native-inputs #:import-path "github.com/alecthomas/assert/v2"))
(list go-github-com-alecthomas-colour (propagated-inputs
go-github-com-mattn-go-isatty (list go-github-com-alecthomas-repr
go-github-com-alecthomas-repr go-github-com-hexops-gotextdiff))
go-github-com-sergi-go-diff))
(home-page "https://github.com/alecthomas/assert/") (home-page "https://github.com/alecthomas/assert/")
(synopsis "Go assertion library") (synopsis "Go assertion library")
(description "Assertion library that: (description "Assertion library that:
@ -90,8 +87,8 @@
@item makes spotting differences in equality much easier @item makes spotting differences in equality much easier
@item uses repr and diffmatchpatch to display structural differences in colour @item uses repr and diffmatchpatch to display structural differences in colour
@item aborts tests on first assertion failure @item aborts tests on first assertion failure
@end itemize\n") @end itemize")
(license license:expat)))) (license license:expat)))
(define-public go-github-com-cheekybits-is (define-public go-github-com-cheekybits-is
(let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
@ -189,6 +186,30 @@ style).
tests.") tests.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-go-test-deep
(package
(name "go-github-com-go-test-deep")
(version "1.0.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-test/deep")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mmw2w3by7y24jjpjwmf2gfl08c65jihn3si9m0sswmagmdsk8q0"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/go-test/deep"))
(home-page "https://github.com/go-test/deep")
(synopsis "Human-friendly deep variable equality in Go")
(description
"The deep package provides the deep.Equal function which is like
reflect.DeepEqual but returns a list of differences. This is helpful
when comparing complex types like structures and maps.")
(license license:expat)))
(define-public go-github-com-golangplus-testing (define-public go-github-com-golangplus-testing
(package (package
(name "go-github-com-golangplus-testing") (name "go-github-com-golangplus-testing")
@ -267,6 +288,28 @@ also update a file with new \"golden\" output that is deemed correct.")
values for the purpose of fuzz testing.") values for the purpose of fuzz testing.")
(license license:asl2.0)))) (license license:asl2.0))))
(define-public go-github-com-hexops-gotextdiff
(package
(name "go-github-com-hexops-gotextdiff")
(version "1.0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hexops/gotextdiff")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1vgq6w0cfhr76qlczgm5khsj1wnjkva0vhkh3qspaa1nkfw3jny1"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/hexops/gotextdiff"))
(home-page "https://github.com/hexops/gotextdiff")
(synopsis "Unified text diffing in Go")
(description
"This package provides a library to generate unified diffs.")
(license license:bsd-3)))
(define-public go-github-com-jacobsa-oglematchers (define-public go-github-com-jacobsa-oglematchers
(let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5") (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5")
(revision "0")) (revision "0"))
@ -590,7 +633,9 @@ under test) much simpler.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs")))) "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "examples"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/DATA-DOG/go-sqlmock")) '(#:import-path "github.com/DATA-DOG/go-sqlmock"))
@ -684,6 +729,23 @@ reformat the source code, it only prints out style mistakes.")
custom assertions to be used alongside native Go testing.") custom assertions to be used alongside native Go testing.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-go-playground-assert-v2
(package
(inherit go-gopkg-in-go-playground-assert-v1)
(name "go-github-com-go-playground-assert-v2")
(version "2.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-playground/assert")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "13mb07dxhcy9ydqbracnrpfj682g6sazjpm56yrlbn2jc1yfy44c"))))
(arguments
(list #:import-path "github.com/go-playground/assert/v2"))))
(define-public go-honnef-co-go-tools (define-public go-honnef-co-go-tools
(package (package
(name "go-honnef-co-go-tools") (name "go-honnef-co-go-tools")

51
gnu/packages/golang-crypto.scm
View file

@ -19,6 +19,7 @@
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -272,7 +273,9 @@ needing to use secp256k1 elliptic curve cryptography.")
(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 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a")))) (base32 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "xxhashbench"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
@ -424,6 +427,52 @@ providing bidirectional mapping values to their names, plus enum convenience
for values.") for values.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public go-github-com-golang-jwt-jwt-v4
(package
(name "go-github-com-golang-jwt-jwt-v4")
(version "4.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/golang-jwt/jwt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1m7c9lwlmd0lnn0hyby1rb3f4nwn4xcjgca218frj0hi0krqn8kp"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/golang-jwt/jwt/v4"))
(home-page "https://github.com/golang-jwt/jwt")
(synopsis "Go implementation of JSON Web Tokens")
(description
"This package provides a Go implementation of
@url{https://datatracker.ietf.org/doc/html/rfc7519, JSON Web Tokens} and
supports the parsing and verification as well as the generation and signing of
JSON Web Tokens. The currently supported signing algorithms are HMAC SHA,
RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
(license license:expat)))
(define-public go-github-com-golang-jwt-jwt-v5
(package
(inherit go-github-com-golang-jwt-jwt-v4)
(name "go-github-com-golang-jwt-jwt-v5")
(version "5.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/golang-jwt/jwt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0px12zhdmzqjj5zlcr136rcsilpmi4chiz6arxv49q372j4nhmia"))))
(arguments
(list
#:go go-1.18
#:import-path "github.com/golang-jwt/jwt/v5"))))
(define-public go-github-com-gxed-hashland-keccakpg (define-public go-github-com-gxed-hashland-keccakpg
(let ((commit "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8") (let ((commit "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8")
(revision "0")) (revision "0"))

36
gnu/packages/golang-web.scm
View file

@ -23,6 +23,7 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr> ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -645,7 +646,7 @@ Encryption, JSON Web Signature, and JSON Web Token standards.")
(define-public go-github-com-goccy-go-json (define-public go-github-com-goccy-go-json
(package (package
(name "go-github-com-goccy-go-json") (name "go-github-com-goccy-go-json")
(version "0.9.10") (version "0.10.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -654,13 +655,16 @@ Encryption, JSON Web Signature, and JSON Web Token standards.")
(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 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) (base32 "1krid2hlvs808jl9zmv7m6zx92samc60gymhwr2mwwykicwbnks8"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "benchmarks"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/goccy/go-json")) '(#:import-path "github.com/goccy/go-json"))
(home-page "https://github.com/goccy/go-json") (home-page "https://github.com/goccy/go-json")
(synopsis "JSON encoder/decoder in Go") (synopsis "JSON encoder/decoder in Go")
(description "Fast JSON encoder/decoder compatible with encoding/json for Go.") (description
"Fast JSON encoder/decoder compatible with encoding/json for Go.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-google-go-github (define-public go-github-com-google-go-github
@ -689,6 +693,29 @@ Encryption, JSON Web Signature, and JSON Web Token standards.")
GitHub API v3.") GitHub API v3.")
(license license:bsd-3))) (license license:bsd-3)))
;; For chezmoi-1.8.10
(define-public go-github-com-google-go-github-v33
(package
(inherit go-github-com-google-go-github)
(name "go-github-com-google-go-github-v33")
(version "33.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/go-github")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1nzwgvaa9k1ky3sfynib6nhalam9dx66h5lxff334m9kk3rf5nn0"))))
(arguments
(substitute-keyword-arguments
(package-arguments go-github-com-google-go-github)
((#:unpack-path _ "github.com/google/go-github/v26")
"github.com/google/go-github/v33")
((#:import-path _ "github.com/google/go-github/v26/github")
"github.com/google/go-github/v33/github")))))
(define-public go-github-com-google-safehtml (define-public go-github-com-google-safehtml
(package (package
(name "go-github-com-google-safehtml") (name "go-github-com-google-safehtml")
@ -1399,7 +1426,8 @@ sockets.")
go-github-com-valyala-tcplisten go-github-com-valyala-tcplisten
go-golang-org-x-crypto go-golang-org-x-crypto
go-golang-org-x-net go-golang-org-x-net
go-golang-org-x-sys)) go-golang-org-x-sys
go-golang-org-x-text))
(home-page "https://github.com/valyala/fasthttp") (home-page "https://github.com/valyala/fasthttp")
(synopsis "Provides fast HTTP server and client API") (synopsis "Provides fast HTTP server and client API")
(description (description

543
gnu/packages/golang-xyz.scm
View file

@ -1,12 +1,19 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev> ;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr> ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr> ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -32,6 +39,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check) #:use-module (gnu packages golang-check)
@ -46,6 +54,114 @@
;;; ;;;
;;; Code: ;;; Code:
;;;
;;; Libraries:
;;;
(define-public go-github-com-a8m-envsubst
(package
(name "go-github-com-a8m-envsubst")
(version "1.4.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/a8m/envsubst")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mjs729g9nmalx25l4nn3p07amm4vsciqmdf0jbh2jwpy1zymz41"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/a8m/envsubst"))
(home-page "https://github.com/a8m/envsubst")
(synopsis "Environment variables substitution for Go")
(description
"This package provides a library for environment variables
substitution.")
(license license:expat)))
(define-public go-github-com-alecthomas-chroma
(package
(name "go-github-com-alecthomas-chroma")
(version "0.10.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alecthomas/chroma")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq"))
(modules '((guix build utils)))
;; Delete git submodules and generated files by Hermit.
(snippet '(delete-file-recursively "bin"))))
(build-system go-build-system)
;; TODO: Build cmd/chroma and cmd/chromad commands.
(arguments
`(#:import-path "github.com/alecthomas/chroma"))
(native-inputs
(list go-github-com-dlclark-regexp2
go-github-com-stretchr-testify))
(home-page "https://github.com/alecthomas/chroma/")
(synopsis "General purpose syntax highlighter in pure Go")
(description
"Chroma takes source code and other structured text and converts it into
syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
(define-public go-github-com-alecthomas-chroma-v2
(package
(inherit go-github-com-alecthomas-chroma)
(name "go-github-com-alecthomas-chroma-v2")
(version "2.12.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alecthomas/chroma")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1j9zz77ppi4r4ncnanzj84h7bsg0qdqrhgd5kkjiv09afm31jx83"))))
(arguments
(list #:go go-1.19
#:import-path "github.com/alecthomas/chroma/v2"))
(propagated-inputs
(list go-github-com-dlclark-regexp2))
(native-inputs
(list go-github-com-alecthomas-assert-v2
go-github-com-alecthomas-repr))))
(define-public go-github-com-alecthomas-participle-v2
(package
(name "go-github-com-alecthomas-participle-v2")
(version "2.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alecthomas/participle")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0k2vsd58rgwyylyn5zja6z6k1sg4m39g2fhd88lvja60ca51bh98"))))
(build-system go-build-system)
(arguments
(list #:go go-1.18
#:import-path "github.com/alecthomas/participle/v2"))
(native-inputs
(list go-github-com-alecthomas-assert-v2))
(home-page "https://github.com/alecthomas/participle")
(synopsis "Parser library for Go")
(description
"This package provides a parser library for Golang which constructs
parsers from definitions in struct tags and parses directly into those
structs. The approach is similar to how other marshallers work in Golang,
\"unmarshalling\" an instance of a grammar into a struct.")
(license license:expat)))
(define-public go-github-com-anmitsu-go-shlex (define-public go-github-com-anmitsu-go-shlex
(package (package
(name "go-github-com-anmitsu-go-shlex") (name "go-github-com-anmitsu-go-shlex")
@ -89,6 +205,31 @@ optimized for sparse nodes of
@url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.") @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-benbjohnson-clock
(package
(name "go-github-com-benbjohnson-clock")
(version "1.3.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/benbjohnson/clock")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1p7n09pywqra21l981fbkma9vzsyf31pbvw6xg5r4hp8h8scf955"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/benbjohnson/clock"
#:go ,go-1.21))
(home-page "https://github.com/benbjohnson/clock")
(synopsis "Small library for mocking time in Go")
(description
"@code{clock} is a small library for mocking time in Go. It provides an
interface around the standard library's @code{time} package so that the application
can use the realtime clock while tests can use the mock clock.")
(license license:expat)))
(define-public go-github-com-bitly-go-hostpool (define-public go-github-com-bitly-go-hostpool
(package (package
(name "go-github-com-bitly-go-hostpool") (name "go-github-com-bitly-go-hostpool")
@ -207,6 +348,161 @@ quantiles over an unbounded data stream within low memory and CPU bounds.")
similar to Go's standard library @code{json} and @code{xml} package.") similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-coocood-freecache
(package
(name "go-github-com-coocood-freecache")
(version "1.2.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/coocood/freecache")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0iw0s07qy8g1lncwl524c524wh56djl0vn6i3bm91cnwzav7ihjl"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/coocood/freecache"))
(propagated-inputs (list go-github-com-cespare-xxhash))
(home-page "https://github.com/coocood/freecache")
(synopsis "Caching library for Go")
(description
"This library provides caching capabilities for Go with no garbage
collection overhead and high concurrent performance. An unlimited number of
objects can be cached in memory without increased latency or degraded
throughput.")
(license license:expat)))
(define-public go-github-com-coreos-go-systemd-activation
(package
(name "go-github-com-coreos-go-systemd-activation")
(version "0.0.0-20191104093116-d3cd4ed1dbcf")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/coreos/go-systemd")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"193mgqn7n4gbb8jb5kyn6ml4lbvh4xs55qpjnisaz7j945ik3kd8"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/coreos/go-systemd/activation"
#:unpack-path "github.com/coreos/go-systemd"))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd socket activation")
(description "Go bindings to systemd socket activation; for writing and
using socket activation from Go.")
(license license:asl2.0)))
(define-public go-github-com-coreos-go-systemd-daemon
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-daemon")
(arguments
'(#:import-path "github.com/coreos/go-systemd/daemon"
#:unpack-path "github.com/coreos/go-systemd"))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd for notifications")
(description "Go bindings to systemd for notifying the daemon of service
status changes")))
(define-public go-github-com-coreos-go-systemd-dbus
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-dbus")
(arguments
'(#:tests? #f ;Tests require D-Bus daemon running.
#:import-path "github.com/coreos/go-systemd/dbus"
#:unpack-path "github.com/coreos/go-systemd"))
(native-inputs (list go-github-com-godbus-dbus))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd for managing services")
(description "Go bindings to systemd for starting/stopping/inspecting
running services and units.")))
(define-public go-github-com-coreos-go-systemd-journal
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-journal")
(arguments
'(#:tests? #f ;Tests require access to journald socket.
#:import-path "github.com/coreos/go-systemd/journal"
#:unpack-path "github.com/coreos/go-systemd"))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd for writing journald")
(description "Go bindings to systemd for writing to systemd's logging
service, journald.")))
(define-public go-github-com-coreos-go-systemd-login1
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-login1")
(arguments
'(#:tests? #f ;Tests require D-Bus daemon running.
#:import-path "github.com/coreos/go-systemd/login1"
#:unpack-path "github.com/coreos/go-systemd"))
(native-inputs (list go-github-com-godbus-dbus))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd for integration with logind API")
(description "Go bindings to systemd for integration with the systemd
logind API.")))
(define-public go-github-com-coreos-go-systemd-machine1
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-machine1")
(arguments
'(#:tests? #f ;Tests require D-Bus daemon running.
#:import-path "github.com/coreos/go-systemd/machine1"
#:unpack-path "github.com/coreos/go-systemd"))
(native-inputs (list go-github-com-godbus-dbus))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd for registering machines/containers")
(description "Go bindings to systemd for registering
machines/containers.")))
(define-public go-github-com-coreos-go-systemd-sdjournal
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-sdjournal")
(arguments
'(#:tests? #f ;Tests require D-Bus daemon running.
#:import-path "github.com/coreos/go-systemd/sdjournal"
#:unpack-path "github.com/coreos/go-systemd"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-sdjournal-header
(lambda* (#:key import-path #:allow-other-keys)
(substitute* (format #f
"src/~a/journal.go"
import-path)
(("systemd/sd-journal.h")
"elogind/sd-journal.h")
(("systemd/sd-id128.h")
"elogind/sd-id128.h")))))))
(inputs (list elogind))
(synopsis "Go bindings to systemd for journald")
(description "Go bindings to systemd for reading from journald by wrapping
its C API.")))
(define-public go-github-com-coreos-go-systemd-unit
(package
(inherit go-github-com-coreos-go-systemd-activation)
(name "go-github-com-coreos-go-systemd-unit")
(arguments
'(#:tests? #f ;Tests require D-Bus daemon running.
#:import-path "github.com/coreos/go-systemd/unit"
#:unpack-path "github.com/coreos/go-systemd"))
(native-inputs (list go-github-com-godbus-dbus))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd for working with unit files")
(description "Go bindings to systemd for (de)serialization and comparison
of unit files.")))
(define-public go-github-com-cyberdelia-go-metrics-graphite (define-public go-github-com-cyberdelia-go-metrics-graphite
(package (package
(name "go-github-com-cyberdelia-go-metrics-graphite") (name "go-github-com-cyberdelia-go-metrics-graphite")
@ -233,6 +529,29 @@ similar to Go's standard library @code{json} and @code{xml} package.")
metrics to Graphite.") metrics to Graphite.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public go-github-com-dimchansky-utfbom
(package
(name "go-github-com-dimchansky-utfbom")
(version "1.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dimchansky/utfbom")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ll3wqvifmdanfyg6wsvz31c7n4mnczg2yxb65j35qxrnak89hn3"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/dimchansky/utfbom"))
(home-page "https://github.com/dimchansky/utfbom")
(synopsis "Go Unicode byte order mark detection library")
(description
"This package provides a library for @acronym{BOM, Unicode Byte Order
Mark} detection.")
(license license:asl2.0)))
(define-public go-github-com-djherbis-atime (define-public go-github-com-djherbis-atime
(package (package
(name "go-github-com-djherbis-atime") (name "go-github-com-djherbis-atime")
@ -255,6 +574,67 @@ metrics to Graphite.")
atimes for files.") atimes for files.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-dustin-gojson
(package
(name "go-github-com-dustin-gojson")
(version "v0.0.0-20160307161227-2e71ec9dd5ad")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dustin/gojson")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "1vrmmyn7l568l1k71mxd54iqf3d54pn86cf278i374j86jn0bdxf"))
(modules '((guix build utils)))
(snippet '(begin
;; Fix the library to work with go-1.21.
(substitute* "decode.go"
(("trying to unmarshal unquoted value into")
"trying to unmarshal unquoted value %v into"))
(substitute* "decode_test.go"
(("t.Fatalf\\(\"Unmarshal: %v\"\\)")
"t.Fatalf(\"Unmarshal: %v\", data)")) ;))))
(substitute* "scanner.go"
(("s := strconv.Quote\\(string\\(c\\)\\)")
"s := strconv.QuoteRune(rune(c))"))))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/dustin/gojson"
#:go ,go-1.21))
(home-page "https://github.com/dustin/gojson")
(synopsis "Extended Golang's @code{encoding/json} module with the public scanner API")
(description
"This package provides a fork of Golang's @code{encoding/json} with the
scanner API made public.")
(license license:bsd-3)))
(define-public go-github-com-elliotchance-orderedmap
(package
(name "go-github-com-elliotchance-orderedmap")
(version "1.5.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/elliotchance/orderedmap")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "06gq5hsgfmzfr46wds366ghyn16qkygyz83vrsgargf4l7db9zg7"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/elliotchance/orderedmap"))
(native-inputs
(list go-github-com-stretchr-testify))
(home-page "https://github.com/elliotchance/orderedmap")
(synopsis "Go ordered map library")
(description
"This package provides a ordered map library that maintains amortized O(1)
for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.")
(license license:expat)))
(define-public go-github-com-gabriel-vasile-mimetype (define-public go-github-com-gabriel-vasile-mimetype
(package (package
(name "go-github-com-gabriel-vasile-mimetype") (name "go-github-com-gabriel-vasile-mimetype")
@ -306,6 +686,29 @@ Differentiation between text and binary files}.
@end itemize") @end itemize")
(license license:expat))) (license license:expat)))
(define-public go-github-com-jinzhu-copier
(package
(name "go-github-com-jinzhu-copier")
(version "0.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jinzhu/copier")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0kf29cmmbic72kfrfd1xnass7l9j85impf8mqn5f3fd3ibi9bs74"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/jinzhu/copier"))
(home-page "https://github.com/jinzhu/copier")
(synopsis "Go copier library")
(description
"This package provides a library, which supports copying value from one
struct to another.")
(license license:expat)))
(define-public go-github-com-matryer-try (define-public go-github-com-matryer-try
(package (package
(name "go-github-com-matryer-try") (name "go-github-com-matryer-try")
@ -340,6 +743,36 @@ Differentiation between text and binary files}.
(description "This package provides an idiomatic Go retry module.") (description "This package provides an idiomatic Go retry module.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-mattn-go-shellwords
(package
(name "go-github-com-mattn-go-shellwords")
(version "1.0.12")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mattn/go-shellwords")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0l0l5s4hlsrm4z6hygig2pp1qirk5ycrzn9z27ay3yvg9k7zafzx"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/mattn/go-shellwords"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-sh-path
(lambda* (#:key import-path #:allow-other-keys)
(substitute* (string-append
"src/" import-path "/util_posix.go")
(("/bin/sh") (which "sh"))))))))
(home-page "https://github.com/mattn/go-shellwords")
(synopsis "Parse lines into shell words")
(description "This package parses text into shell arguments. Based on
the @code{cpan} module @code{Parse::CommandLine}.")
(license license:expat)))
(define-public go-github-com-miekg-dns (define-public go-github-com-miekg-dns
(package (package
(name "go-github-com-miekg-dns") (name "go-github-com-miekg-dns")
@ -547,6 +980,58 @@ queue.")
NSQ protocol @url{https://nsq.io/}.") NSQ protocol @url{https://nsq.io/}.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-op-go-logging
(package
(name "go-github-com-op-go-logging")
(version "1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/op/go-logging")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn"))))
(build-system go-build-system)
(arguments
`(#:tests? #f ; ERROR: incorrect callpath: String.rec...a.b.c.Info.
#:import-path "github.com/op/go-logging"))
(home-page "https://github.com/op/go-logging")
(synopsis "Go logging library")
(description
"Go-Logging implements a logging infrastructure for Go. Its
output format is customizable and supports different logging backends like
syslog, file and memory. Multiple backends can be utilized with different log
levels per backend and logger.")
(license license:bsd-3)))
(define-public go-github-com-orisano-pixelmatch
(package
(name "go-github-com-orisano-pixelmatch")
(version "0.0.0-20230914042517-fa304d1dc785")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/orisano/pixelmatch")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32 "1lplxfif5mfqnd0jjph2vd25c3bpr3idfs2axh8z0ib0zdkwca32"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/orisano/pixelmatch"))
(home-page "https://github.com/orisano/pixelmatch")
(synopsis "Pixelmatch port to Go")
(description
"This package provides a port of Pixelmatch, a pixel-level image
comparison library, to Go. Both a library and a command-line tool are
included in this package.")
(license license:expat)))
(define-public go-github-com-prometheus-client-model (define-public go-github-com-prometheus-client-model
(let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016")
(revision "2")) (revision "2"))
@ -652,6 +1137,35 @@ efficiently works with standard packages like @code{io}, @code{bufio}, etc..
Use waterutil with it to work with TUN/TAP packets/frames.") Use waterutil with it to work with TUN/TAP packets/frames.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public go-github-com-songmu-gitconfig
(package
(name "go-github-com-songmu-gitconfig")
(version "0.1.0")
(home-page "https://github.com/songmu/gitconfig")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk"))))
(build-system go-build-system)
(arguments
(list
;; Package's tests appear to be hardcoded to the author's gitconfig
;; and require network access.
#:tests? #f
#:go go-1.21
#:import-path "github.com/Songmu/gitconfig"))
(propagated-inputs
(list go-github-com-goccy-yaml))
(synopsis "Go library to get configuration values from gitconfig")
(description
"@{gitconfig} is a package to get configuration values from gitconfig.")
(license license:expat)))
(define-public go-github-com-stathat-go (define-public go-github-com-stathat-go
(let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e")
(revision "0")) (revision "0"))
@ -700,6 +1214,33 @@ Use waterutil with it to work with TUN/TAP packets/frames.")
CPU quota.") CPU quota.")
(license license:expat))) (license license:expat)))
(define-public go-gopkg-in-op-go-logging-v1
(package
(inherit go-github-com-op-go-logging)
(name "go-gopkg-in-op-go-logging-v1")
(arguments
(substitute-keyword-arguments
(package-arguments go-github-com-op-go-logging)
((#:import-path _) "gopkg.in/op/go-logging.v1")))))
;;;
;;; Executables:
;;;
(define-public go-pixelmatch
(package
(inherit go-github-com-orisano-pixelmatch)
(name "go-pixelmatch")
(arguments
(list
#:import-path "github.com/orisano/pixelmatch/cmd/pixelmatch"
#:unpack-path "github.com/orisano/pixelmatch"
#:install-source? #f))
(synopsis "Pixel-level image comparison command")
(description
"This package provides a CLI build from the
go-github-com-orisano-pixelmatch source.")))
;;; ;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar ;;; of a merge conflict, place them above by existing packages with similar

437
gnu/packages/golang.scm
View file

@ -44,6 +44,7 @@
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Greg Hogan <code@greghogan.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1264,7 +1265,14 @@ cluster segmentation algorithm.")
(sha256 (sha256
(base32 "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba")))) (base32 "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba"))))
(build-system go-build-system) (build-system go-build-system)
(arguments `(#:import-path "github.com/avast/retry-go")) (arguments
(list
#:import-path "github.com/avast/retry-go"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-examples
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/examples")))))))
(propagated-inputs (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-stretchr-testify))
(home-page "https://github.com/avast/retry-go") (home-page "https://github.com/avast/retry-go")
(synopsis "Simple golang library for retry mechanism") (synopsis "Simple golang library for retry mechanism")
@ -1977,32 +1985,6 @@ possible, the focus of Dust is on real solutions to real attacks.")
;; Others. ;; Others.
license:expat)))) license:expat))))
(define-public go-github-com-op-go-logging
(package
(name "go-github-com-op-go-logging")
(version "1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/op/go-logging")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn"))))
(build-system go-build-system)
(arguments
`(#:tests? #f ; ERROR: incorrect callpath: String.rec...a.b.c.Info.
#:import-path "github.com/op/go-logging"))
(home-page "https://github.com/op/go-logging")
(synopsis "Go logging library")
(description "Go-Logging implements a logging infrastructure for Go. Its
output format is customizable and supports different logging backends like
syslog, file and memory. Multiple backends can be utilized with different log
levels per backend and logger.")
(license license:bsd-3)))
(define-public go-github-com-operatorfoundation-shapeshifter-ipc (define-public go-github-com-operatorfoundation-shapeshifter-ipc
(package (package
(name "go-github-com-operatorfoundation-shapeshifter-ipc") (name "go-github-com-operatorfoundation-shapeshifter-ipc")
@ -2828,7 +2810,7 @@ Under Windows, the console APIs are used. Otherwise, ANSI texts are output.")
(define-public go-github-com-leodido-go-urn (define-public go-github-com-leodido-go-urn
(package (package
(name "go-github-com-leodido-go-urn") (name "go-github-com-leodido-go-urn")
(version "1.2.0") (version "1.4.0")
(home-page "https://github.com/leodido/go-urn") (home-page "https://github.com/leodido/go-urn")
(source (source
(origin (origin
@ -2838,7 +2820,7 @@ Under Windows, the console APIs are used. Otherwise, ANSI texts are output.")
(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 "1d4g1vkhc1180l1n7q48vl84b27c7cziywml78cyijbcdz2f8vim")))) (base32 "0bn9dj6y299jdh8szfim32yxj9zip38cqgv965dj23cixgr7baxb"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/leodido/go-urn")) '(#:import-path "github.com/leodido/go-urn"))
@ -2900,6 +2882,8 @@ way of specifying command line options.")
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/go-playground/locales")) '(#:import-path "github.com/go-playground/locales"))
(propagated-inputs
(list go-golang-org-x-text))
(synopsis "Set of locales generated from the CLDR Unicode Project") (synopsis "Set of locales generated from the CLDR Unicode Project")
(description (description
"This package provides a set of locales generated from the "This package provides a set of locales generated from the
@ -2920,7 +2904,7 @@ implemented features include
(define-public go-github-com-go-playground-universal-translator (define-public go-github-com-go-playground-universal-translator
(package (package
(name "go-github-com-go-playground-universal-translator") (name "go-github-com-go-playground-universal-translator")
(version "0.17.0") (version "0.18.1")
(home-page "https://github.com/go-playground/universal-translator") (home-page "https://github.com/go-playground/universal-translator")
(source (source
(origin (origin
@ -2930,7 +2914,7 @@ implemented features include
(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 "1zdiaisb32iv4x93cpbqrgx8ll7sxh4hcd2iibpswy4bwvjbjlz6")))) (base32 "1lgz9wrkcfx6q3x6i9fprr8rfwnk0c6x61jgzacgikbmzsl7dw6v"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/go-playground/universal-translator")) '(#:import-path "github.com/go-playground/universal-translator"))
@ -3002,6 +2986,31 @@ web framework
@end itemize") @end itemize")
(license license:expat))) (license license:expat)))
(define-public go-github-com-go-playground-validator-v10
(package
(inherit go-gopkg-in-go-playground-validator-v9)
(name "go-github-com-go-playground-validator-v10")
(version "10.18.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-playground/validator")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1j8q3mlyhjirzr3fjaj0rx9z1pnaav1hjwjwf7982gdl2p9z3mgg"))))
(arguments
(list #:import-path "github.com/go-playground/validator/v10"))
(propagated-inputs
(modify-inputs (package-propagated-inputs
go-gopkg-in-go-playground-validator-v9)
(append go-github-com-gabriel-vasile-mimetype
go-golang-org-x-crypto
go-golang-org-x-text)))
(native-inputs
(list go-github-com-go-playground-assert-v2))))
(define-public go-github-com-nathan-osman-go-sunrise (define-public go-github-com-nathan-osman-go-sunrise
(let ((commit "c8f9f1eb869135f07378e7e3c5ec7a005f806c73") (let ((commit "c8f9f1eb869135f07378e7e3c5ec7a005f806c73")
(revision "0")) (revision "0"))
@ -3477,7 +3486,8 @@ editor.")
(arguments (arguments
`(#:import-path "golang.org/x/oauth2")) `(#:import-path "golang.org/x/oauth2"))
(propagated-inputs (propagated-inputs
(list go-golang-org-x-net)) (list go-cloud-google-com-go-compute-metadata
go-golang-org-x-net))
(home-page "https://go.googlesource.com/oauth2") (home-page "https://go.googlesource.com/oauth2")
(synopsis "Client implementation of the OAuth 2.0 spec") (synopsis "Client implementation of the OAuth 2.0 spec")
(description "This package contains a client implementation for OAuth 2.0 (description "This package contains a client implementation for OAuth 2.0
@ -3800,7 +3810,7 @@ containers.")
(define-public go-github-com-spf13-cobra (define-public go-github-com-spf13-cobra
(package (package
(name "go-github-com-spf13-cobra") (name "go-github-com-spf13-cobra")
(version "1.5.0") (version "1.8.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3810,12 +3820,12 @@ containers.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qavvyljh509w5xb46lfkak670szp6v4jswwar1hx13cpid8gk5d")))) "0mhnqfgcwwcknlhk7n07i02q3iqq6ihksj4dwz296zci8ry3w0d0"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/spf13/cobra")) `(#:import-path "github.com/spf13/cobra"))
(propagated-inputs (propagated-inputs
`(("github.com/spf13/pflag" ,go-github-com-spf13-pflag))) (list go-github-com-spf13-pflag))
(home-page "https://github.com/spf13/cobra") (home-page "https://github.com/spf13/cobra")
(synopsis "Go library for creating CLI applications") (synopsis "Go library for creating CLI applications")
(description "Cobra is both a library for creating powerful modern CLI (description "Cobra is both a library for creating powerful modern CLI
@ -3974,7 +3984,7 @@ updating files, like @command{tail -f}.")
(define-public go-github-com-magiconair-properties (define-public go-github-com-magiconair-properties
(package (package
(name "go-github-com-magiconair-properties") (name "go-github-com-magiconair-properties")
(version "1.8.5") (version "1.8.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3984,7 +3994,7 @@ updating files, like @command{tail -f}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0v4agnkhc30fblbmhs0gq2bikhdnnmqmpp4phrnza68m04j5hxbn")))) "0xy5nq7mwhrdcwjlgh4arjn6w5mjla0kni3cvl3z5vxcrnfrn3ax"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/magiconair/properties")) `(#:import-path "github.com/magiconair/properties"))
@ -4019,6 +4029,26 @@ updating files, like @command{tail -f}.")
(description "Go library for the TOML configuration language") (description "Go library for the TOML configuration language")
(license license:expat))) (license license:expat)))
(define-public go-github-com-pelletier-go-toml-v2
(package
(inherit go-github-com-pelletier-go-toml)
(name "go-github-com-pelletier-go-toml-v2")
(version "2.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pelletier/go-toml")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1k0rwg7870f4va7jaavnpwvdn6d76gxgyr7c978bx2h829a9sx2a"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/pelletier/go-toml/v2"))
(native-inputs
(list go-github-com-stretchr-testify))))
(define-public go-github-com-subosito-gotenv (define-public go-github-com-subosito-gotenv
(package (package
(name "go-github-com-subosito-gotenv") (name "go-github-com-subosito-gotenv")
@ -4457,7 +4487,7 @@ The yaml package supports most of YAML 1.2, but preserves some behavior from
(define-public go-github-com-mattn-go-isatty (define-public go-github-com-mattn-go-isatty
(package (package
(name "go-github-com-mattn-go-isatty") (name "go-github-com-mattn-go-isatty")
(version "0.0.11") (version "0.0.20")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4467,7 +4497,7 @@ The yaml package supports most of YAML 1.2, but preserves some behavior from
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali")))) "0g63n9wpb991qnq9mn2kvd8jk1glrp6gnd851kvwz2wmzdkggiga"))))
(build-system go-build-system) (build-system go-build-system)
(propagated-inputs (propagated-inputs
(list go-golang-org-x-sys)) (list go-golang-org-x-sys))
@ -4483,7 +4513,7 @@ terminal.")
(define-public go-github-com-mattn-go-colorable (define-public go-github-com-mattn-go-colorable
(package (package
(name "go-github-com-mattn-go-colorable") (name "go-github-com-mattn-go-colorable")
(version "0.1.8") (version "0.1.13")
(home-page "https://github.com/mattn/go-colorable") (home-page "https://github.com/mattn/go-colorable")
(source (source
(origin (origin
@ -4494,9 +4524,9 @@ terminal.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0q34zqwbnls72md8q8mhj368s7p3i4xspvs3rk8fs76s0pn7dr2l")))) "05hl2ddp67p5kj3ix4zzqqjh4fan4ban3vgw8f98simwigs3q41j"))))
(build-system go-build-system) (build-system go-build-system)
(native-inputs (propagated-inputs
(list go-github-com-mattn-go-isatty)) (list go-github-com-mattn-go-isatty))
(arguments (arguments
'(#:import-path "github.com/mattn/go-colorable")) '(#:import-path "github.com/mattn/go-colorable"))
@ -4728,6 +4758,28 @@ source files. A neutral variety of English is used by default, but a US or UK
locale can be selected.") locale can be selected.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-cli-safeexec
(package
(name "go-github-com-cli-safeexec")
(version "1.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cli/safeexec")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0j6hspjx9kyxn98nbisawx6wvbi1d6rpzr6p2rzhllm673wibwr3"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/cli/safeexec"))
(home-page "https://github.com/cli/safeexec")
(synopsis "Safe implementation of Go's exec.Command")
(description "This package provides a Go module that provides a stabler
alternative to @@code{exec.LookPath()}.")
(license license:bsd-2)))
(define-public go-github-com-client9-misspell (define-public go-github-com-client9-misspell
(package (package
(inherit misspell) (inherit misspell)
@ -6046,50 +6098,6 @@ exploration and data entry.")
"The terminfo package implements terminfo database reading for Go.") "The terminfo package implements terminfo database reading for Go.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-mattn-go-shellwords
(let ((commit "2444a32a19f450fabaa0bb3e96a703f15d9a97d2")
(version "1.0.5")
(revision "1"))
(package
(name "go-github-com-mattn-go-shellwords")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mattn/go-shellwords")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/mattn/go-shellwords"
;; TODO: can't make homeless-shelter:
;; go: disabling cache (/homeless-shelter/.cache/go-build) due to
;; initialization failure: mkdir /homeless-shelter: permission denied
;; This doesn't seem to work:
;; #:phases
;; (modify-phases %standard-phases
;; (replace 'check
;; (lambda* (#:key import-path #:allow-other-keys)
;; (setenv "HOME" "/tmp")
;; (invoke "go" "test" import-path))))
;; TODO: There are also a couple of tests that have stymied Debian in
;; the past. They seem to work when run locally.
#:tests? #f
))
(home-page "https://github.com/mattn/go-shellwords")
(synopsis "Parse lines into shell words")
(description "This package parses text into shell arguments. Based on
the @code{cpan} module @code{Parse::CommandLine}.")
(license license:expat))))
(define-public go-github-com-burntsushi-locker (define-public go-github-com-burntsushi-locker
(let ((commit "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a") (let ((commit "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a")
(revision "0")) (revision "0"))
@ -6630,7 +6638,7 @@ filters for Go.")
(define-public go-github-com-fatih-color (define-public go-github-com-fatih-color
(package (package
(name "go-github-com-fatih-color") (name "go-github-com-fatih-color")
(version "1.8.0") (version "1.16.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -6639,11 +6647,7 @@ filters for Go.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zc0zlilf03h121f9jqq3ar0hfm7706547zysxp2qxbm920pz7h0")) "15689x103gy9q7g7623rlvhwrw27p079ardapmrrag0sdwrx5bq2"))))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "vendor")))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/fatih/color")) '(#:import-path "github.com/fatih/color"))
@ -6653,7 +6657,7 @@ filters for Go.")
(synopsis "Print colored text in Go") (synopsis "Print colored text in Go")
(description "This package provides an ANSI color package to output (description "This package provides an ANSI color package to output
colorized or SGR defined output to the standard output.") colorized or SGR defined output to the standard output.")
(home-page "https://godoc.org/github.com/fatih/color") (home-page "https://pkg.go.dev/github.com/fatih/color")
(license license:expat))) (license license:expat)))
(define-public go-github-com-google-go-cmp-cmp (define-public go-github-com-google-go-cmp-cmp
@ -6875,10 +6879,11 @@ gotest-tools.")))
`(#:tests? #f ; Test failure concerning message formatting (FIXME) `(#:tests? #f ; Test failure concerning message formatting (FIXME)
#:import-path "gotest.tools/assert" #:import-path "gotest.tools/assert"
#:unpack-path "gotest.tools")) #:unpack-path "gotest.tools"))
;(propagated-inputs (propagated-inputs
; `(("go-gotest-tools-internal-format" ,go-gotest-tools-internal-format))) (list go-github-com-google-go-cmp-cmp
(native-inputs go-github-com-pkg-errors
(list go-github-com-pkg-errors go-github-com-google-go-cmp-cmp)) go-github-com-spf13-pflag
go-golang-org-x-tools))
(synopsis "Compare values and fail a test when a comparison fails") (synopsis "Compare values and fail a test when a comparison fails")
(description "This package provides a way to compare values and fail a (description "This package provides a way to compare values and fail a
test when a comparison fails.") test when a comparison fails.")
@ -6995,7 +7000,9 @@ improved and cleaner API.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0jibsg0xhsn0h1jq4g9qd4nr58w43y8majlwfri9ffk2cbfrwqdr")))) "0jibsg0xhsn0h1jq4g9qd4nr58w43y8majlwfri9ffk2cbfrwqdr"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "example"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/macronut/go-tproxy")) '(#:import-path "github.com/macronut/go-tproxy"))
@ -7532,6 +7539,27 @@ the library more lightweight.")
matching and globbing with support for \"doublestar\" patterns.") matching and globbing with support for \"doublestar\" patterns.")
(license license:expat))) (license license:expat)))
;; For chezmoi-1.8.10
(define-public go-github-com-bmatcuk-doublestar-v2
(package
(inherit go-github-com-bmatcuk-doublestar)
(name "go-github-com-bmatcuk-doublestar-v2")
(version "2.0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bmatcuk/doublestar")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "09ma8a9rhs8dg527vjhdf3lsb6lajaq193m6ksssm2k3qajhpi94"))))
(arguments
(list
#:tests? #f ; tests have more broken parts
#:unpack-path "github.com/bmatcuk/doublestar/v2"
#:import-path "github.com/bmatcuk/doublestar/v2"))))
(define-public go-github-com-dlclark-regexp2 (define-public go-github-com-dlclark-regexp2
(package (package
(name "go-github-com-dlclark-regexp2") (name "go-github-com-dlclark-regexp2")
@ -7582,30 +7610,29 @@ stripped.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-alecthomas-repr (define-public go-github-com-alecthomas-repr
(let ((commit "4184120f674c8860a5b48142509a2411a0a1766f")
(revision "1"))
(package (package
(name "go-github-com-alecthomas-repr") (name "go-github-com-alecthomas-repr")
(version (git-version "0.0.1" revision commit)) (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/alecthomas/repr") (url "https://github.com/alecthomas/repr")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1z0gdkjryxg1ps5fh4ybzip27g9lzdldz4hxqp5j7s2frbzaa9s7")))) "1zq30b36vvg4kzxkff64gjwvcjaw0d13dqzfjfai66hkh3ijdzwl"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/alecthomas/repr")) `(#:go ,go-1.18
#:import-path "github.com/alecthomas/repr"))
(native-inputs (native-inputs
(list go-github-com-stretchr-testify)) (list go-github-com-stretchr-testify))
(home-page "https://github.com/alecthomas/repr/") (home-page "https://github.com/alecthomas/repr/")
(synopsis "Represent Go values in an almost direct form") (synopsis "Represent Go values in an almost direct form")
(description "This package attempts to represent Go values in a form that (description "This package attempts to represent Go values in a form that
can be used almost directly in Go source code.") can be used almost directly in Go source code.")
(license license:expat)))) (license license:expat)))
(define-public go-github-com-sergi-go-diff (define-public go-github-com-sergi-go-diff
(package (package
@ -7637,35 +7664,6 @@ synchronizing plain text:
@end itemize\n") @end itemize\n")
(license license:expat))) (license license:expat)))
(define-public go-github-com-alecthomas-chroma
(package
(name "go-github-com-alecthomas-chroma")
(version "0.8.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alecthomas/chroma")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/alecthomas/chroma"))
(native-inputs
(list go-github-com-dlclark-regexp2
go-github-com-alecthomas-assert
go-github-com-alecthomas-colour
go-github-com-alecthomas-repr
go-github-com-mattn-go-isatty
go-github-com-sergi-go-diff))
(home-page "https://github.com/alecthomas/chroma/")
(synopsis "General purpose syntax highlighter in pure Go")
(description "Chroma takes source code and other structured text and
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
(define-public go-github-com-muesli-reflow-wordwrap (define-public go-github-com-muesli-reflow-wordwrap
(package (package
(name "go-github-com-muesli-reflow-wordwrap") (name "go-github-com-muesli-reflow-wordwrap")
@ -7889,7 +7887,13 @@ use one of our glamorous default themes.")
(base32 "1aasg0c0xxhwav4ivm1mqmsqab6lk407xky8c19pb85r1hdbq0n7")))) (base32 "1aasg0c0xxhwav4ivm1mqmsqab6lk407xky8c19pb85r1hdbq0n7"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/charmbracelet/harmonica")) (list
#:import-path "github.com/charmbracelet/harmonica"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-examples
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/examples")))))))
(home-page "https://github.com/charmbracelet/harmonica") (home-page "https://github.com/charmbracelet/harmonica")
(synopsis "Simple, physics-based animation library") (synopsis "Simple, physics-based animation library")
(description (description
@ -7899,7 +7903,7 @@ use one of our glamorous default themes.")
(define-public go-github-com-coreos-go-semver (define-public go-github-com-coreos-go-semver
(package (package
(name "go-github-com-coreos-go-semver") (name "go-github-com-coreos-go-semver")
(version "0.3.0") (version "0.3.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -7908,39 +7912,17 @@ use one of our glamorous default themes.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0770h1mpig2j5sbiha3abnwaw8p6dg9i87r8pc7cf6m4kwml3sc9")))) "0vs04yykv1bwgvbyvi1m7ps83w06wzplw4giw8jac2iidx0x74v5"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/coreos/go-semver")) `(#:import-path "github.com/coreos/go-semver"))
(propagated-inputs (list go-gopkg-in-yaml-v2))
(home-page "https://github.com/coreos/go-semver/") (home-page "https://github.com/coreos/go-semver/")
(synopsis "Semantic versioning library") (synopsis "Semantic versioning library")
(description "@code{go-semver} is a semantic versioning library for Go. (description "@code{go-semver} is a semantic versioning library for Go.
It lets you parse and compare two semantic version strings.") It lets you parse and compare two semantic version strings.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public go-github-com-coreos-go-systemd-activation
(package
(name "go-github-com-coreos-go-systemd-activation")
(version "0.0.0-20191104093116-d3cd4ed1dbcf")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/coreos/go-systemd")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"193mgqn7n4gbb8jb5kyn6ml4lbvh4xs55qpjnisaz7j945ik3kd8"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/coreos/go-systemd/activation"
#:unpack-path "github.com/coreos/go-systemd"))
(home-page "https://github.com/coreos/go-systemd")
(synopsis "Go bindings to systemd socket activation")
(description "Go bindings to systemd socket activation; for writing and
using socket activation from Go.")
(license license:asl2.0)))
(define-public go-github-com-emirpasic-gods (define-public go-github-com-emirpasic-gods
(package (package
(name "go-github-com-emirpasic-gods") (name "go-github-com-emirpasic-gods")
@ -8295,7 +8277,8 @@ temporal directories.")
(arguments (arguments
`(#:import-path "github.com/twpayne/go-vfs")) `(#:import-path "github.com/twpayne/go-vfs"))
(native-inputs (native-inputs
(list go-github-com-bmatcuk-doublestar)) (list go-github-com-bmatcuk-doublestar
go-github-com-stretchr-testify))
(home-page "https://github.com/twpayne/go-vfs/") (home-page "https://github.com/twpayne/go-vfs/")
(synopsis "Abstraction of the @code{os} and @code{ioutil} Go packages") (synopsis "Abstraction of the @code{os} and @code{ioutil} Go packages")
(description "Package @code{vfs} provides an abstraction of the @code{os} (description "Package @code{vfs} provides an abstraction of the @code{os}
@ -8547,6 +8530,7 @@ Prometheus metrics.")
;; The tests require Go modules, which are not yet supported in Guix's ;; The tests require Go modules, which are not yet supported in Guix's
;; Go build system. ;; Go build system.
#:tests? #f)) #:tests? #f))
(propagated-inputs (list go-golang.org-x-sync-errgroup))
(synopsis "Go library for reading @file{/proc}") (synopsis "Go library for reading @file{/proc}")
(description "The @code{procfs} Go package provides functions to retrieve (description "The @code{procfs} Go package provides functions to retrieve
system, kernel, and process metrics from the @file{/proc} pseudo file system.") system, kernel, and process metrics from the @file{/proc} pseudo file system.")
@ -8932,7 +8916,7 @@ modifying them.")
(define-public go-github-com-goccy-yaml (define-public go-github-com-goccy-yaml
(package (package
(name "go-github-com-goccy-yaml") (name "go-github-com-goccy-yaml")
(version "1.8.0") (version "1.11.3")
(home-page "https://github.com/goccy/go-yaml") (home-page "https://github.com/goccy/go-yaml")
(source (source
(origin (origin
@ -8942,14 +8926,22 @@ modifying them.")
(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 "1nps58dwkd915mx35h5f0dc05b880b4fdl6dcjxpfmmbzyinvg38")))) (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/goccy/go-yaml")) (list
#:go go-1.18
#:import-path "github.com/goccy/go-yaml"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-benchmarks
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/benchmarks")))))))
(propagated-inputs (propagated-inputs
(list go-github-com-fatih-color go-golang-org-x-xerrors)) (list go-github-com-fatih-color go-golang-org-x-xerrors))
(native-inputs (native-inputs
(list go-gopkg-in-go-playground-validator-v9)) (list go-github-com-go-playground-validator-v10
go-github-com-google-go-cmp-cmp))
(synopsis "YAML support for the Go language") (synopsis "YAML support for the Go language")
(description (description
"This package provides features beyond the "This package provides features beyond the
@ -8989,32 +8981,6 @@ modifying them.")
parsers, and related tools.") parsers, and related tools.")
(license license:expat)))) (license license:expat))))
(define-public go-github-com-songmu-gitconfig
(package
(name "go-github-com-songmu-gitconfig")
(version "0.1.0")
(home-page "https://github.com/songmu/gitconfig")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/Songmu/gitconfig"
;; Package's tests appear to be hardcoded to the author's gitconfig
;; and require network access.
#:tests? #f))
(propagated-inputs
(list go-github-com-goccy-yaml))
(synopsis "Go library to get configuration values from gitconfig")
(description "@{gitconfig} is a package to get configuration values from gitconfig.")
(license license:expat)))
(define-public go-github-com-akosmarton-papipes (define-public go-github-com-akosmarton-papipes
(let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64") (let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64")
(revision "0")) (revision "0"))
@ -9072,7 +9038,13 @@ sinks and sources.")
(propagated-inputs (propagated-inputs
(list pkg-config pulseaudio)) (list pkg-config pulseaudio))
(arguments (arguments
'(#:import-path "github.com/mesilliac/pulse-simple")) (list
#:import-path "github.com/mesilliac/pulse-simple"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-examples
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/examples")))))))
(home-page "https://github.com/mesilliac/pulse-simple") (home-page "https://github.com/mesilliac/pulse-simple")
(synopsis "Cgo bindings to PulseAudio's Simple API") (synopsis "Cgo bindings to PulseAudio's Simple API")
(description (description
@ -9153,6 +9125,38 @@ Gemini clients and servers.")
@code{getopt} for Go.") @code{getopt} for Go.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public go-go-uber-org-goleak
(package
(name "go-go-uber-org-goleak")
(version "1.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber-go/goleak")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1lpqw7ygffak8qki9i4vw8b99l25l8jrw8iwcplqsclk6fzkl24p"))))
(build-system go-build-system)
(arguments
'(#:tests? #f
#:import-path "go.uber.org/goleak"))
(propagated-inputs
(list go-github-com-davecgh-go-spew
go-github-com-kr-pretty
go-github-com-pmezard-go-difflib
go-github-com-stretchr-testify
go-golang-org-x-lint
go-golang-org-x-tools
go-gopkg-in-check-v1
go-gopkg-in-yaml-v3))
(home-page "https://go.uber.org/goleak")
(synopsis "Goroutine leak detector")
(description "Go package to verify that there are no unexpected goroutines
running at the end of a test.")
(license license:expat)))
(define-public go-go-uber-org-atomic (define-public go-go-uber-org-atomic
(package (package
(name "go-go-uber-org-atomic") (name "go-go-uber-org-atomic")
@ -9466,7 +9470,13 @@ back.")
"0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw")))) "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/OneOfOne/xxhash")) (list
#:import-path "github.com/OneOfOne/xxhash"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-benchmarks
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/benchmarks")))))))
(home-page "https://github.com/OneOfOne/xxhash") (home-page "https://github.com/OneOfOne/xxhash")
(synopsis "Go implementation of xxHash") (synopsis "Go implementation of xxHash")
(description "This is a native Go implementation of the (description "This is a native Go implementation of the
@ -9487,7 +9497,9 @@ non-cryptographic hash algorithm, working at speeds close to RAM limits.")
(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 "1xvl3rgjif5yf62p16yk05kxrsmzhz1kkqisvw4k02svzq10qbfy")))) (base32 "1xvl3rgjif5yf62p16yk05kxrsmzhz1kkqisvw4k02svzq10qbfy"))
(modules '((guix build utils)))
(snippet '(delete-file-recursively "example"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "gopkg.in/djherbis/times.v1")) '(#:import-path "gopkg.in/djherbis/times.v1"))
@ -9684,7 +9696,14 @@ string.")
"1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0")))) "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/charmbracelet/bubbletea")) (list
#:import-path "github.com/charmbracelet/bubbletea"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-examples
(lambda* (#:key import-path #:allow-other-keys)
(with-directory-excursion (string-append "src/" import-path)
(for-each delete-file-recursively
'("examples" "tutorials"))))))))
(propagated-inputs (propagated-inputs
`(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
("github.com/muesli/termenv" ,go-github-com-muesli-termenv) ("github.com/muesli/termenv" ,go-github-com-muesli-termenv)
@ -10191,6 +10210,10 @@ kubernetes-sigs/yaml is a permanent fork of
(list #:import-path "github.com/schollz/progressbar/v3" (list #:import-path "github.com/schollz/progressbar/v3"
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-examples
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/examples"))))
(replace 'check (replace 'check
(lambda* (#:key tests? import-path #:allow-other-keys) (lambda* (#:key tests? import-path #:allow-other-keys)
(when tests? (when tests?
@ -10754,30 +10777,6 @@ array or reader.")
ICU to Go.") ICU to Go.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-go-test-deep
(package
(name "go-github-com-go-test-deep")
(version "1.0.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-test/deep")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1mmw2w3by7y24jjpjwmf2gfl08c65jihn3si9m0sswmagmdsk8q0"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/go-test/deep"))
(home-page "https://github.com/go-test/deep")
(synopsis "Human-friendly deep variable equality in Go")
(description
"The deep package provides the deep.Equal function which is like
reflect.DeepEqual but returns a list of differences. This is helpful
when comparing complex types like structures and maps.")
(license license:expat)))
(define-public go-github-com-niemeyer-pretty (define-public go-github-com-niemeyer-pretty
(package (package
(name "go-github-com-niemeyer-pretty") (name "go-github-com-niemeyer-pretty")

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

@ -2947,14 +2947,14 @@ inspired by the SCSH regular expression system.")
(define-public haunt (define-public haunt
(package (package
(name "haunt") (name "haunt")
(version "0.2.6") (version "0.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://files.dthompson.us/haunt/haunt-" (uri (string-append "https://files.dthompson.us/haunt/haunt-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1nwhwngx0gl2892vrvrzrxy5w6a5l08j1w0522kdh9a3v11qpwmw")))) "0awrk4a2gfnk660m4kg9cy1w8z7bj454355w7rn0cjp5dg8bxflq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 match) (ice-9 ftw) `(#:modules ((ice-9 match) (ice-9 ftw)

98
gnu/packages/haskell.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
@ -681,6 +681,102 @@ interactive environment for the functional language Haskell.")
interactive environment for the functional language Haskell.") interactive environment for the functional language Haskell.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-7.0
(package
(inherit ghc-6.10)
(name "ghc")
(version "7.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.haskell.org/~ghc/"
version "/" name "-" version "-src.tar.bz2"))
(sha256
(base32
"1vfhdvf9nls4pn1vy48ndy2s81klp1my6ch9dkg2373csvcpi6qs"))
(snippet
#~(begin (use-modules (guix build utils))
(delete-file-recursively "utils/ghc-pwd/dist-boot")))))
(arguments
(list
#:system "i686-linux"
#:test-target "test"
#:tests? #false ;not yet
#:parallel-build? #false ;fails when building libraries/*
;; Don't pass --build=<triplet>, because the configure script
;; auto-detects slightly different triplets for --host and --target and
;; then complains that they don't match.
#:build #f
#:validate-runpath? #f ; libraries can't find each other.
#:configure-flags
#~(list
(string-append "--with-gmp-libraries="
(assoc-ref %build-inputs "gmp") "/lib")
(string-append "--with-gmp-includes="
(assoc-ref %build-inputs "gmp") "/include"))
#:make-flags
#~(list (string-append "CONFIG_SHELL=" (assoc-ref %build-inputs "bash")
"/bin/bash"))
#:phases
#~(modify-phases %standard-phases
(replace 'bootstrap
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (which "bash")))
;; Use our libffi package
(substitute* "rts/ghc.mk"
(("-I../libffi/build/include")
(string-append "-I" #$(this-package-input "libffi") "/include"))
(("-L../libffi/build/include")
(string-append "-L" #$(this-package-input "libffi") "/lib"))
(("-DDEBUG") ""))
(substitute* '("Makefile"
"distrib/Makefile")
(("SUBDIRS = gmp libffi")
"SUBDIRS = gmp")
(("\\$\\(MAKE\\) -C libffi.*") ""))
(substitute* "compiler/ghc.cabal.in"
(("../libffi/build/include")
(string-append #$(this-package-input "libffi") "/include")))
;; Do not use libbfd, because it complicates the build and
;; requires more patching. Disable all debug and profiling
;; builds.
(substitute* "mk/config.mk.in"
(("GhcRTSWays \\+= debug") "")
(("thr thr_debug thr_l") "thr thr_l")
(("dyn debug_dyn") "dyn")
(("thr_dyn thr_debug_dyn") "thr_dyn")
(("GhcLibWays += p") "GhcLibWays +="))
;; Replace /bin/sh.
(substitute* '("configure"
"distrib/configure.ac")
(("`/bin/sh") (string-append "`" bash))
(("SHELL=/bin/sh") (string-append "SHELL=" bash))
(("#! /bin/sh") (string-append "#! " bash)))
(substitute* '("mk/config.mk.in")
(("^SHELL.*=.*/bin/sh") (string-append "SHELL = " bash)))
(substitute* "aclocal.m4"
(("SHELL=/bin/sh") (string-append "SHELL=" bash)))
(substitute* "utils/ghc-pkg/ghc.mk"
(("#!/bin/sh") (string-append "#!" bash)))
(substitute* '("libraries/unix/cbits/execvpe.c"
"libraries/Cabal/Distribution/Simple/Hugs.hs"
"libraries/Cabal/Distribution/Simple/Program/Script.hs"
"libraries/process/System/Process/Internals.hs")
(("/bin/sh") bash)
(("\"sh\"") (string-append "\"" bash "\"")))))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
(string-append "lib/ghc-" version)))
(file-pattern ".*\\.conf\\.d$")
(file-type 'directory))))
(inputs
(list gmp libffi ncurses perl))
(native-inputs
(list perl ghc-6.10))))
(define ghc-bootstrap-x86_64-7.8.4 (define ghc-bootstrap-x86_64-7.8.4
(origin (origin
(method url-fetch) (method url-fetch)

22
gnu/packages/icu4c.scm
View file

@ -109,6 +109,28 @@ C/C++ part.")
(license x11) (license x11)
(home-page "http://site.icu-project.org/"))) (home-page "http://site.icu-project.org/")))
(define-public icu4c-73
(package
(inherit icu4c)
(name "icu4c")
(version "73.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/unicode-org/icu/releases/download/release-"
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
(sha256
(base32
"0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
(patches
(cons
(search-patch
"icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
(origin-patches (package-source icu4c))))))))
(define-public icu4c-70 (define-public icu4c-70
(package (package
(inherit icu4c) (inherit icu4c)

8
gnu/packages/image-viewers.scm
View file

@ -113,7 +113,7 @@
(define-public ytfzf (define-public ytfzf
(package (package
(name "ytfzf") (name "ytfzf")
(version "2.6.0") (version "2.6.2")
(home-page "https://github.com/pystardust/ytfzf") (home-page "https://github.com/pystardust/ytfzf")
(source (source
(origin (origin
@ -124,7 +124,7 @@
(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 "19wmzpbc23515ab4v4pw792x68y7bgsqhd2pmlqiq6bp6jxfrykg")))) (base32 "05zcs0avyjn1dlxxsrc47ld3iddls22g1bc4mk0g8ldxvcwra05g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -743,14 +743,14 @@ preloading.")
(define-public chafa (define-public chafa
(package (package
(name "chafa") (name "chafa")
(version "1.12.5") (version "1.14.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hpjansson.org/chafa/releases/chafa-" (uri (string-append "https://hpjansson.org/chafa/releases/chafa-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1wjp75l0qbikbdbvj8nlhl1gsakhx3309k0mdww6n2jh5bar0m0g")))) "1170g2qkcj2amsfl7sn81r42lwb2hy4z15xxhy0lrkayig15a3k7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))

43
gnu/packages/image.scm
View file

@ -38,6 +38,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2023-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2024 chris <chris@bumblehead.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -752,7 +753,7 @@ collection of tools for doing simple manipulations of TIFF images.")
(define-public leptonica (define-public leptonica
(package (package
(name "leptonica") (name "leptonica")
(version "1.83.1") (version "1.84.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -761,7 +762,7 @@ collection of tools for doing simple manipulations of TIFF images.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1j7qf9flb48q0aymf0yx9rypy3bs6hfjcln08zmy8qn2qcjzrmvi")))) (base32 "0b4ikf1p2ll4310n4dg5lg0b79wys71fb6nj22i7pz17wjdma0j8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list gnuplot ;needed for test suite (list gnuplot ;needed for test suite
@ -779,6 +780,9 @@ collection of tools for doing simple manipulations of TIFF images.")
zlib)) zlib))
(arguments (arguments
(list (list
;; Parallel tests cause some tests to fail randomly.
;; Same thing observed on Debian.
#:parallel-tests? #f
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-reg-wrapper (add-after 'unpack 'patch-reg-wrapper
@ -2816,3 +2820,38 @@ Graphics (PNGs), intended as an easy-to-use replacement for @code{libpng}.")
(license license:bsd-2) (license license:bsd-2)
;; Supports SSE on x86-64 and NEON on AArch64. ;; Supports SSE on x86-64 and NEON on AArch64.
(properties '((tunable? . #t))))) (properties '((tunable? . #t)))))
(define-public libsixel
(package
(name "libsixel")
(version "1.10.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/libsixel/libsixel")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1nny4295ipy4ajcxmmh04c796hcds0y7z7rv3qd17mj70y8j0r2d"))))
(build-system meson-build-system)
(arguments
(list
#:build-type "release"
#:configure-flags #~(list "--buildtype=plain"
"-Dtests=enabled"
"-Dlibcurl=disabled"
"-Dgdk-pixbuf2=enabled")))
(native-inputs (list pkg-config))
(inputs (list gdk-pixbuf libjpeg-turbo libpng python))
(home-page "https://github.com/libsixel/libsixel")
(synopsis
"Encoder and decoder implementation for DEC SIXEL graphics")
(description
"LibSIXEL is a an encoder/decoder implementation for DEC SIXEL graphics,
and some converter programs. SIXEL is one of image formats for printer and
terminal imaging introduced by @acronym{DEC, Digital Equipment Corp.}. Its
data scheme is represented as a terminal-friendly escape sequence. So if you
want to view a SIXEL image file, all you have to do is @command{cat} it to
your terminal.")
(license license:expat)))

18
gnu/packages/java.scm
View file

@ -92,6 +92,7 @@
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages security-token) #:use-module (gnu packages security-token)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module ((srfi srfi-1) #:select (fold alist-delete)) #:use-module ((srfi srfi-1) #:select (fold alist-delete))
@ -1298,10 +1299,10 @@ new Date();"))
(catch 'decoding-error (catch 'decoding-error
(lambda () (lambda ()
(substitute* file (substitute* file
(("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" (("VERSIONED_JNI_LIB_NAME\\(\"([^\"]*)\", \"([^\"]*)\"\\)"
_ name version) _ name version)
(string-append "\"" (find-library name) "\"")) (string-append "\"" (find-library name) "\""))
(("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) (("JNI_LIB_NAME\\(\"([^\"]*)\"\\)" _ name)
(string-append "\"" (find-library name) "\"")))) (string-append "\"" (find-library name) "\""))))
(lambda _ (lambda _
;; Those are safe to skip. ;; Those are safe to skip.
@ -1722,16 +1723,16 @@ OpenJDK.")
(package (package
(inherit openjdk17) (inherit openjdk17)
(name "jbr") (name "jbr")
(version "17.0.7-b1020") (version "17.0.10b1207.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/JetBrains/JetBrainsRuntime.git") (url "https://github.com/JetBrains/JetBrainsRuntime.git")
(commit (string-append "jb" version)))) (commit (string-append "jbr-release-" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0wh9xhqgcjk0jgvpvlvf78dy3r8m0vgqd0f54whpx0qqbmyavgdw")) "1n9i07i243wrnnnvj05j81qhx3b5dry8y423pnbrrdn8fcwm1f2d"))
(patches (search-patches "jbr-17-xcursor-no-dynamic.patch")))) (patches (search-patches "jbr-17-xcursor-no-dynamic.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk17) (substitute-keyword-arguments (package-arguments openjdk17)
@ -1756,20 +1757,21 @@ OpenJDK.")
(package (package
(inherit openjdk21) (inherit openjdk21)
(name "jbr") (name "jbr")
(version "21-b240.22") (version "21.0.2b375.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/JetBrains/JetBrainsRuntime.git") (url "https://github.com/JetBrains/JetBrainsRuntime.git")
(commit (string-append "jb" version)))) (commit (string-append "jbr-release-" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1sx48mm5vap4ab1qr6hy25wlgxljmhvpvrqiqiq692izr8dh7j4c")) "15rcwbch0xxzcgggc34lna9dwimwqsc0z4mvw5hd428414gz71iy"))
(patches (search-patches "openjdk-21-fix-rpath.patch" (patches (search-patches "openjdk-21-fix-rpath.patch"
"jbr-17-xcursor-no-dynamic.patch")))) "jbr-17-xcursor-no-dynamic.patch"))))
(inputs (inputs
`(("wayland" ,wayland) `(("wayland" ,wayland)
("libxkbcommon" ,libxkbcommon) ; for wayland
,@(package-inputs openjdk21))) ,@(package-inputs openjdk21)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk21) (substitute-keyword-arguments (package-arguments openjdk21)

71
gnu/packages/linux.scm
View file

@ -80,6 +80,7 @@
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Gabriel Wicki <gabriel@erlikon.ch> ;;; Copyright © 2024 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -496,7 +497,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "mainline" kernel. ;; The current "mainline" kernel.
(define-public linux-libre-6.7-version "6.7.4") (define-public linux-libre-6.7-version "6.7.5")
(define-public linux-libre-6.7-gnu-revision "gnu") (define-public linux-libre-6.7-gnu-revision "gnu")
(define deblob-scripts-6.7 (define deblob-scripts-6.7
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -506,7 +507,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1vb2pd0wdfl9p5qi8hj1i5xg1p4pyrp01iqhap9xbb2yai4l80j5"))) (base32 "1vb2pd0wdfl9p5qi8hj1i5xg1p4pyrp01iqhap9xbb2yai4l80j5")))
(define-public linux-libre-6.7-pristine-source (define-public linux-libre-6.7-pristine-source
(let ((version linux-libre-6.7-version) (let ((version linux-libre-6.7-version)
(hash (base32 "036nk3h7vqzd7gnxan2173kpss5qm2pci1lvd58gh90azigrz3gn"))) (hash (base32 "1zrralagnv9yr8qdg7lc05735691dbh92mgwfyxrq5xqc504dxi9")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.7))) deblob-scripts-6.7)))
@ -514,7 +515,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.6-version "6.6.16") (define-public linux-libre-6.6-version "6.6.17")
(define-public linux-libre-6.6-gnu-revision "gnu") (define-public linux-libre-6.6-gnu-revision "gnu")
(define deblob-scripts-6.6 (define deblob-scripts-6.6
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -524,7 +525,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5"))) (base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5")))
(define-public linux-libre-6.6-pristine-source (define-public linux-libre-6.6-pristine-source
(let ((version linux-libre-6.6-version) (let ((version linux-libre-6.6-version)
(hash (base32 "0c5a9agdr27bwd1z6790whczb858z8i34hhn548lzbdylfamf7dj"))) (hash (base32 "0si20m9ckir826jg40bh7sh4kwlp610rnc3gwsgs4nm7dfcm0xpf")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.6))) deblob-scripts-6.6)))
@ -532,7 +533,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.77") (define-public linux-libre-6.1-version "6.1.78")
(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
@ -542,7 +543,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jg2v1nxd6i5x536vmd1l14xhpzrcimpmjfipb1zkrwil102y25f"))) (base32 "1jg2v1nxd6i5x536vmd1l14xhpzrcimpmjfipb1zkrwil102y25f")))
(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 "07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v"))) (hash (base32 "12fn23m2xwdlv6gr1s8872lk8mvigqkblvlhr54nh8rik2b6n835")))
(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)))
@ -2004,6 +2005,17 @@ GnuPG-based password manager like @code{pass}.")
(package (package
(inherit linux-libre) (inherit linux-libre)
(name "linux-libre-documentation") (name "linux-libre-documentation")
(source
(origin
(inherit linux-libre-source)
(patches
(list
(origin
(method url-fetch)
(uri "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/Documentation/sphinx/kernel_feat.py?id=c23de7ceae59e4ca5894c3ecf4f785c50c0fa428")
(sha256
(base32
"0inw2pl7nh82sw8bhvvzqa61552bisl78yc1nyl2x6dmpyppzrld")))))))
(arguments (arguments
(list (list
#:tests? #f #:tests? #f
@ -5288,6 +5300,51 @@ existing Docker images. Singularity requires kernel support for container
isolation or root privileges.") isolation or root privileges.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-spython
(package
(name "python-spython")
(version "0.3.13")
(source
(origin
(method url-fetch)
(uri (pypi-uri "spython" version))
(sha256
(base32 "0kly851k6mj7xzcybciav5d0pq5q04pzg7c5a1g712bqbxkha4ck"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
;; Configure absolute path to singularity.
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((singularity (search-input-file inputs "bin/singularity")))
(substitute* "spython/utils/terminal.py"
(("software=\"singularity\"")
(string-append "software=\"" singularity "\"")))
(substitute* (list "spython/utils/terminal.py"
"spython/main/help.py"
"spython/main/base/command.py")
(("\\[\"singularity\"")
(string-append "[\"" singularity "\"")))
(substitute* "spython/main/execute.py"
(("shutil.which\\(\"singularity\"\\)")
(string-append "shutil.which(\"" singularity "\")"))))))
;; Skip tests that require network access.
(add-before 'check 'skip-tests
(lambda _
(delete-file "spython/tests/test_client.py"))))))
(inputs
(list singularity))
(native-inputs
(list python-pytest
python-pytest-runner))
(home-page "https://github.com/singularityhub/singularity-cli")
(synopsis "Singularity Python client")
(description "@code{python-spython} is a Python library to interact with
Singularity containers.")
(license license:mpl2.0)))
(define-public libnvme (define-public libnvme
(package (package
(name "libnvme") (name "libnvme")
@ -7845,7 +7902,7 @@ every time the power supply source is changed.")
(("\"tlp-stat\"") (("\"tlp-stat\"")
(string-append "'" tlp-stat "'")) (string-append "'" tlp-stat "'"))
(("/usr/share/tlp/defaults.conf") (("/usr/share/tlp/defaults.conf")
(string-append "'" defaults.conf "'"))) defaults.conf))
(substitute* "ui_config_objects/gtkusblist.py" (substitute* "ui_config_objects/gtkusblist.py"
(("\"lsusb\"") (("\"lsusb\"")
(string-append "'" lsusb "'"))) (string-append "'" lsusb "'")))

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

@ -42,6 +42,7 @@
;;; Copyright © 2023 Gabriel Hondet <gabriel.hondet@cominety.net> ;;; Copyright © 2023 Gabriel Hondet <gabriel.hondet@cominety.net>
;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com> ;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com>
;;; Copyright © 2024 Michal Atlas <michal_atlas+git@posteo.net> ;;; Copyright © 2024 Michal Atlas <michal_atlas+git@posteo.net>
;;; Copyright © 2024 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -15481,20 +15482,18 @@ functions.")
(sbcl-package->ecl-package sbcl-cl-dejavu)) (sbcl-package->ecl-package sbcl-cl-dejavu))
(define-public sbcl-mcclim (define-public sbcl-mcclim
(let ((commit "ece91cf035e2ccb1c6eb0bb867ae2bc45f627982")
(revision "3"))
(package (package
(name "sbcl-mcclim") (name "sbcl-mcclim")
(version (git-version "0.9.7" revision commit)) (version "0.9.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://codeberg.org/McCLIM/McCLIM") (url "https://codeberg.org/McCLIM/McCLIM")
(commit commit))) (commit (string-append version "-yule"))))
(file-name (git-file-name "cl-mcclim" version)) (file-name (git-file-name "cl-mcclim" version))
(sha256 (sha256
(base32 "0prn4f0nz604ykcg8004f1vndgjm7181wrlblq6mhasphca28c2k")))) (base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
(list sbcl-fiveam pkg-config)) (list sbcl-fiveam pkg-config))
@ -15514,10 +15513,12 @@ functions.")
sbcl-cl-vectors sbcl-cl-vectors
sbcl-cl-who sbcl-cl-who
sbcl-closer-mop sbcl-closer-mop
sbcl-cluffer
sbcl-clx sbcl-clx
sbcl-flexi-streams sbcl-flexi-streams
sbcl-flexichain sbcl-flexichain
sbcl-log4cl sbcl-log4cl
sbcl-lorem-ipsum
sbcl-opticl sbcl-opticl
sbcl-slime-swank sbcl-slime-swank
sbcl-spatial-trees sbcl-spatial-trees
@ -15545,7 +15546,7 @@ functions.")
(description (description
"McCLIM is an implementation of the @emph{Common Lisp Interface Manager "McCLIM is an implementation of the @emph{Common Lisp Interface Manager
specification}, a toolkit for writing GUIs in Common Lisp.") specification}, a toolkit for writing GUIs in Common Lisp.")
(license license:lgpl2.1+)))) (license license:lgpl2.1+)))
(define-public cl-mcclim (define-public cl-mcclim
(sbcl-package->cl-source-package sbcl-mcclim)) (sbcl-package->cl-source-package sbcl-mcclim))

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

@ -25,6 +25,7 @@
;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 David Pflug <david@pflug.io> ;;; Copyright © 2024 David Pflug <david@pflug.io>
;;; Copyright © 2024 Timothee Mathieu <timothee.mathieu@inria.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -5386,3 +5387,34 @@ performance library of basic building blocks for deep learning applications.")
(synopsis "Read and write ML models in GGUF for GGML") (synopsis "Read and write ML models in GGUF for GGML")
(description "A Python library for reading and writing GGUF & GGML format ML models.") (description "A Python library for reading and writing GGUF & GGML format ML models.")
(license license:expat))) (license license:expat)))
(define-public python-gymnasium
(package
(name "python-gymnasium")
(version "0.29.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "gymnasium" version))
(sha256
(base32 "1cab4wsnlsxn2z90qmymv8ppmsq8yq2amiqwid3r0xfbxx92flqs"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-cloudpickle python-farama-notifications
python-importlib-metadata python-numpy
python-typing-extensions))
(native-inputs (list python-pytest python-scipy))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'create-tests-module
(lambda _
(with-output-to-file "tests/__init__.py"
(lambda _ (display ""))))))))
(home-page "https://gymnasium.farama.org/")
(synopsis
"Standard API for reinforcement learning and a set of reference environments")
(description
"This package provides a standard API for reinforcement learning and a
diverse set of reference environments (formerly Gym).")
(license license:expat)))

38
gnu/packages/mail.scm
View file

@ -27,7 +27,7 @@
;;; Copyright © 2018, 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019–2022 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019–2022 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org> ;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
@ -195,7 +195,6 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix svn-download) #:use-module (guix svn-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix utils)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -281,14 +280,14 @@ example, modify the message headers or body, or encrypt or sign the message.")
(define-public mailutils (define-public mailutils
(package (package
(name "mailutils") (name "mailutils")
(version "3.16") (version "3.17")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/mailutils/mailutils-" (uri (string-append "mirror://gnu/mailutils/mailutils-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h02l0zilxsak1sxpm15vhfaahd8rwvcksc88cc7c0wc626ia784")) "1sc45gpvnrcf7b627n8cxsp379kk2s3x68c2z19gwrkmqg7bljgs"))
(patches (patches
(search-patches "mailutils-variable-lookup.patch")))) (search-patches "mailutils-variable-lookup.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -4617,6 +4616,37 @@ score.")
undelete email messages from Outlook Express .dbx files.") undelete email messages from Outlook Express .dbx files.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public libdbx
(package
(name "libdbx")
(version "1.0.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/ol2mbox/LibDBX/v"
version "/libdbx_"
version ".tar.gz"))
(sha256
(base32
"0fs4268qcy99nhl8345sv257b002530y77idkf6z9i7qxmqghq4w"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #false ;no tests
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda _
(for-each (lambda (file)
(install-file file
(string-append #$output "/bin")))
(list "readdbx" "readoe")))))))
(home-page "http://sourceforge.net/projects/ol2mbox/")
(synopsis "Tools for conversion of Outlook Express files to mailbox format")
(description "This package provides tools for the conversion of Outlook
Express data files to standard mailbox format.")
(license license:gpl2+)))
(define-public libpst (define-public libpst
(package (package
(name "libpst") (name "libpst")

7
gnu/packages/maths.scm
View file

@ -1056,7 +1056,7 @@ halfspaces) or by their double description with both representations.")
(define-public arpack-ng (define-public arpack-ng
(package (package
(name "arpack-ng") (name "arpack-ng")
(version "3.9.0") (version "3.9.1")
(home-page "https://github.com/opencollab/arpack-ng") (home-page "https://github.com/opencollab/arpack-ng")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -1064,9 +1064,10 @@ halfspaces) or by their double description with both representations.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09smxilyn8v9xs3kpx3nlj2s7ql3v8z40mpc09kccbb6smyd35iv")) "0bbw6a48py9fjlif2n4x75skyjskq2hghffjqzm85wnsnsjdlaqw"))))
(patches (search-patches "arpack-ng-propagate-rng-state.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DICB=ON")))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs

18
gnu/packages/mold.scm
View file

@ -35,7 +35,7 @@
(define-public mold (define-public mold
(package (package
(name "mold") (name "mold")
(version "2.3.2") (version "2.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -44,22 +44,10 @@
(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 "1p6w92caysy9h0vkl26iv3viv0lvwzvbd357yykls0p13hnzlzkr")) (base32 "0rqw7p61qijxhbfm887xbh8idbp5w30axvwgmm68s03xirnr7ymr"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
;; Fix detection of i686 systems.
;; This can be removed with the next release of mold.
(substitute* "test/elf/common.inc"
(("echo i386") "echo i686"))
(substitute* '("test/elf/common.inc"
"test/elf/global-offset-table.sh"
"test/elf/i386_tls-module-base.sh"
"test/elf/large-alignment-dso.sh"
"test/elf/large-alignment.sh"
"test/elf/nocopyreloc.sh"
"test/elf/range-extension-thunk.sh")
(("MACHINE = i386") "MACHINE = i686"))
(for-each (for-each
(lambda (x) (lambda (x)
(delete-file-recursively (string-append "third-party/" x))) (delete-file-recursively (string-append "third-party/" x)))
@ -93,7 +81,7 @@
;; but compiler in Guix will insert the path of gcc-lib and ;; but compiler in Guix will insert the path of gcc-lib and
;; glibc into the output binary. ;; glibc into the output binary.
(delete-file "test/elf/rpath.sh")))))) (delete-file "test/elf/rpath.sh"))))))
(inputs (list mimalloc openssl tbb xxhash zlib `(,zstd "lib"))) (inputs (list mimalloc tbb xxhash zlib `(,zstd "lib")))
(home-page "https://github.com/rui314/mold") (home-page "https://github.com/rui314/mold")
(synopsis "Fast linker") (synopsis "Fast linker")
(description (description

4
gnu/packages/monitoring.scm
View file

@ -789,7 +789,7 @@ provides a simple Python client for the StatsD daemon.")
(define-public batsignal (define-public batsignal
(package (package
(name "batsignal") (name "batsignal")
(version "1.6.4") (version "1.8.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -798,7 +798,7 @@ provides a simple Python client for the StatsD daemon.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0f8jabql70nxkslgxd8pcfllqy4bnbf1c19rcri0dp054aszk637")))) "0l6j873l1l0al95zl9ihxzrmy9r11pfm269gydlx8pps4gdisy6a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags

7
gnu/packages/music.scm
View file

@ -233,6 +233,13 @@
(string-append " " (string-append " "
#$(cc-for-target) " -o"))) #$(cc-for-target) " -o")))
(chdir "src"))) (chdir "src")))
(add-after 'install 'wrap-program
(lambda* (#:key inputs #:allow-other-keys)
(wrap-program (string-append #$output "/bin/alsa-scarlett-gui")
;; For GtkFileChooserDialog.
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append #$(this-package-input "gtk")
"/share/glib-2.0/schemas"))))))
(delete 'configure)))) (delete 'configure))))
(inputs (inputs
(list alsa-lib glib gtk)) (list alsa-lib glib gtk))

62
gnu/packages/networking.scm
View file

@ -179,6 +179,7 @@
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
@ -280,12 +281,11 @@ protocols.")
"1m29p4bsafzbchnkidyrnglfdf1c9pnq6akkmivi23qdv9kj51dg")))) "1m29p4bsafzbchnkidyrnglfdf1c9pnq6akkmivi23qdv9kj51dg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f (list
#:make-flags (let ((target ,(%current-target-system))) #:parallel-tests? #f
(list ,(string-append "CC=" #:make-flags
(cc-for-target)) #~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" (string-append "PREFIX=" #$output))
(assoc-ref %outputs "out"))))
#:test-target "test")) #:test-target "test"))
(home-page "https://librecast.net/lcrq.html") (home-page "https://librecast.net/lcrq.html")
(synopsis "Librecast RaptorQ library") (synopsis "Librecast RaptorQ library")
@ -351,12 +351,10 @@ Unix Domain Sockets, SCTP for both IPv4 and IPv6.")
(base32 "1rhk80ybd2zranay76z1ysifnnm786lg9kiiijcwv76qy95in9ks")))) (base32 "1rhk80ybd2zranay76z1ysifnnm786lg9kiiijcwv76qy95in9ks"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f (list
#:configure-flags (list (string-append "--prefix=" #:parallel-tests? #f
(assoc-ref %outputs "out"))) #:configure-flags #~(list (string-append "--prefix=" #$output))
#:make-flags (let ((target ,(%current-target-system))) #:make-flags #~(list (string-append "CC=" #$(cc-for-target)))
(list ,(string-append "CC="
(cc-for-target))))
#:test-target "test")) #:test-target "test"))
(inputs (list lcrq librecast libsodium libbsd)) (inputs (list lcrq librecast libsodium libbsd))
(home-page "https://librecast.net/lcsync.html") (home-page "https://librecast.net/lcsync.html")
@ -531,12 +529,11 @@ GLib-based library, libnice, as well as GStreamer elements to use it.")
(base32 "01m0q4n2hy3csbzil8ivjyzb1mh4w9jlh9iiv6z53kasl7aas27i")))) (base32 "01m0q4n2hy3csbzil8ivjyzb1mh4w9jlh9iiv6z53kasl7aas27i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f (list
#:make-flags (let ((target ,(%current-target-system))) #:parallel-tests? #f
(list ,(string-append "CC=" #:make-flags
(cc-for-target)) #~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" (string-append "PREFIX=" #$output))
(assoc-ref %outputs "out"))))
#:test-target "test")) #:test-target "test"))
(inputs (list libsodium lcrq libbsd)) (inputs (list libsodium lcrq libbsd))
(synopsis "IPv6 multicast library") (synopsis "IPv6 multicast library")
@ -1774,23 +1771,23 @@ of the same name.")
(define-public wireshark (define-public wireshark
(package (package
(name "wireshark") (name "wireshark")
(version "4.0.7") (version "4.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.wireshark.org/download/src/wireshark-" (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "0xw7iagh37y02qgzgmb2xf1qagbphv5lpgra8lq3x0pzrc27p7x7")))) (base32 "04aqg5w8yfikqc1446c2zr2h4yyd5napwkhskdvr2galdycxb2wm"))))
(build-system cmake-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
;; This causes the plugins to register runpaths for the wireshark ;; This causes the plugins to register runpaths for the wireshark
;; libraries, which would otherwise cause the validate-runpath phase to ;; libraries, which would otherwise cause the validate-runpath phase to
;; fail. ;; fail.
#:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=" #:qtbase qtbase
"-Wl,-rpath=" #$output "/lib") #:configure-flags
"-DUSE_qt6=ON") #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" #$output "/lib"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'check (replace 'check
@ -1799,11 +1796,7 @@ of the same name.")
(invoke "ctest" "-VV" (invoke "ctest" "-VV"
"-j" (if parallel-tests? "-j" (if parallel-tests?
(number->string (parallel-job-count)) (number->string (parallel-job-count))
"1") "1"))))))))
;; Skip the suite_extcaps.case_extcaps.test_sdjournal
;; test as it requires sdjournal (from systemd) and
;; fails.
"-E" "suite_extcaps")))))))
(inputs (inputs
(list c-ares (list c-ares
glib glib
@ -1816,7 +1809,7 @@ of the same name.")
libssh libssh
libxml2 libxml2
lz4 lz4
lua lua-5.2
mit-krb5 mit-krb5
`(,nghttp2 "lib") `(,nghttp2 "lib")
minizip minizip
@ -1827,6 +1820,7 @@ of the same name.")
qtsvg qtsvg
sbc sbc
snappy snappy
speexdsp
zlib zlib
`(,zstd "lib"))) `(,zstd "lib")))
(native-inputs (native-inputs
@ -1842,7 +1836,7 @@ of the same name.")
(description "Wireshark is a network protocol analyzer, or @dfn{packet (description "Wireshark is a network protocol analyzer, or @dfn{packet
sniffer}, that lets you capture and interactively browse the contents of sniffer}, that lets you capture and interactively browse the contents of
network frames.") network frames.")
(home-page "https://www.wireshark.org/") (home-page "https://www.wireshark.org")
(license license:gpl2+))) (license license:gpl2+)))
(define-public fping (define-public fping
@ -4557,7 +4551,7 @@ network.")
(define-public ngtcp2 (define-public ngtcp2
(package (package
(name "ngtcp2") (name "ngtcp2")
(version "1.2.0") (version "1.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4565,14 +4559,14 @@ network.")
"releases/download/v" version "/" "releases/download/v" version "/"
"ngtcp2-" version ".tar.xz")) "ngtcp2-" version ".tar.xz"))
(sha256 (sha256
(base32 "158acn01df6sxqjqx4h948phpcgc2da88aiqn9p2jqgqph48brxh")))) (base32 "16qkik9185ygkr351a7q59l1rv6dzw51j4f7vkzfvzh385kqdqy3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:configure-flags #:configure-flags
;; openssl package does not support QUIC interface, so just gnutls ;; openssl package does not support QUIC interface, so just gnutls
#~(list "--with-gnutls"))) #~(list "--with-gnutls")))
(native-inputs (list cunit pkg-config)) (native-inputs (list pkg-config))
(inputs (list gnutls)) (inputs (list gnutls))
(home-page "https://nghttp2.org/ngtcp2/") (home-page "https://nghttp2.org/ngtcp2/")
(synopsis "QUIC protocol implementation") (synopsis "QUIC protocol implementation")

1881
gnu/packages/node-xyz.scm
View file

File diff suppressed because it is too large Load diff

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

@ -23,6 +23,7 @@
;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 jgart <jgart@dismail.de> ;;; Copyright © 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1251,7 +1252,7 @@ extracting, creating, and converting between formats.")
python-pyyaml python-pyyaml
python-requests python-requests
python-responses python-responses
python-ruamel.yaml python-ruamel.yaml-0.16
python-tqdm python-tqdm
;; XXX: This is dragged in by libarchive and is needed at runtime. ;; XXX: This is dragged in by libarchive and is needed at runtime.
zstd)) zstd))
@ -1512,8 +1513,8 @@ environments.")
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator (define-public guix-build-coordinator
(let ((commit "d9fa7947c25d0624c568f744ad2a2683a43e5644") (let ((commit "9f1545b15269523eac109b54e1a62f4c0cda837e")
(revision "96")) (revision "97"))
(package (package
(name "guix-build-coordinator") (name "guix-build-coordinator")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1524,7 +1525,7 @@ environments.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1l4d0fvk2pg4n6d532xb50iqa7py6v68298l3xd5g50dxl1f4jwp")) "1h35jjpvl7lipbys8q7ivx13cffkya6n0jpc91ckag3z2vb09iwp"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

523
gnu/packages/patches/arpack-ng-propagate-rng-state.patch
View file

@ -1,523 +0,0 @@
Fix a bug that manifests while running the test suite of 'python-igraph':
https://github.com/opencollab/arpack-ng/issues/401
https://github.com/opencollab/arpack-ng/pull/414
From d885b7be4ecdc9c1496f2d6f256f6c0d34962459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= <szhorvat@gmail.com>
Date: Sun, 9 Apr 2023 16:36:35 +0200
Subject: [PATCH] fix: ensure that LAPACK RNG state is propagated
- fixes #401, #410, #411
- restores 'inits' variable removed in ce2e69a849da1d10dad5d6d3ec4db6120b3ecf50, ensuring that the RNG state is propagated
- reverts e0d67054f573da351f12a226f7c7cc65a690ef3d to ensure that seed is different on each parallel thread
- updates seed initialization of parallel pdgetv0/psgetv0 so that they match that of pzgetv0/pcgetv0
---
PARPACK/SRC/MPI/pcgetv0.f | 48 +++++++++++++++++++++++----------------
PARPACK/SRC/MPI/pdgetv0.f | 40 ++++++++++++++++++++++++++------
PARPACK/SRC/MPI/psgetv0.f | 43 ++++++++++++++++++++++++++---------
PARPACK/SRC/MPI/pzgetv0.f | 48 +++++++++++++++++++++++----------------
SRC/cgetv0.f | 21 ++++++++++++-----
SRC/dgetv0.f | 21 ++++++++++++-----
SRC/sgetv0.f | 21 ++++++++++++-----
SRC/zgetv0.f | 21 ++++++++++++-----
8 files changed, 183 insertions(+), 80 deletions(-)
diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f
index 59e3d1658..24fe8a0f1 100644
--- a/PARPACK/SRC/MPI/pcgetv0.f
+++ b/PARPACK/SRC/MPI/pcgetv0.f
@@ -176,13 +176,13 @@ subroutine pcgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
+ logical first, inits, orth
integer idist, iseed(4), iter, msglvl, jj, myid, igen
Real
& rnorm0
Complex
& cnorm, cnorm2
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
Complex
& cnorm_buf, buf2(1)
@@ -203,6 +203,12 @@ subroutine pcgetv0
& ccdotc
external ccdotc, pscnorm2, slapy2
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -213,26 +219,30 @@ subroutine pcgetv0
c | random number generator |
c %-----------------------------------%
c
+ if (inits) then
c
-c %-----------------------------------%
-c | Generate a seed on each processor |
-c | using process id (myid). |
-c | Note: the seed must be between 1 |
-c | and 4095. iseed(4) must be odd. |
-c %-----------------------------------%
+c %-----------------------------------%
+c | Generate a seed on each processor |
+c | using process id (myid). |
+c | Note: the seed must be between 1 |
+c | and 4095. iseed(4) must be odd. |
+c %-----------------------------------%
c
- call MPI_COMM_RANK(comm, myid, ierr)
- igen = 1000 + 2*myid + 1
- if (igen .gt. 4095) then
- write(0,*) 'Error in p_getv0: seed exceeds 4095!'
- end if
+ call MPI_COMM_RANK(comm, myid, ierr)
+ igen = 1000 + 2*myid + 1
+ if (igen .gt. 4095) then
+ write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+ end if
+c
+ iseed(1) = igen/1000
+ igen = mod(igen,1000)
+ iseed(2) = igen/100
+ igen = mod(igen,100)
+ iseed(3) = igen/10
+ iseed(4) = mod(igen,10)
c
- iseed(1) = igen/1000
- igen = mod(igen,1000)
- iseed(2) = igen/100
- igen = mod(igen,100)
- iseed(3) = igen/10
- iseed(4) = 7
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f
index 0f348b820..5a1956997 100644
--- a/PARPACK/SRC/MPI/pdgetv0.f
+++ b/PARPACK/SRC/MPI/pdgetv0.f
@@ -177,11 +177,11 @@ subroutine pdgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
- integer idist, iseed(4), iter, msglvl, jj
+ logical first, inits, orth
+ integer idist, iseed(4), iter, msglvl, jj, myid, igen
Double precision
& rnorm0, buf2(1)
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
Double precision
& rnorm_buf
@@ -206,6 +206,12 @@ subroutine pdgetv0
c
intrinsic abs, sqrt
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -216,10 +222,30 @@ subroutine pdgetv0
c | random number generator |
c %-----------------------------------%
c
- iseed(1) = 1
- iseed(2) = 3
- iseed(3) = 5
- iseed(4) = 7
+ if (inits) then
+c
+c %-----------------------------------%
+c | Generate a seed on each processor |
+c | using process id (myid). |
+c | Note: the seed must be between 1 |
+c | and 4095. iseed(4) must be odd. |
+c %-----------------------------------%
+c
+ call MPI_COMM_RANK(comm, myid, ierr)
+ igen = 1000 + 2*myid + 1
+ if (igen .gt. 4095) then
+ write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+ end if
+c
+ iseed(1) = igen/1000
+ igen = mod(igen,1000)
+ iseed(2) = igen/100
+ igen = mod(igen,100)
+ iseed(3) = igen/10
+ iseed(4) = mod(igen,10)
+c
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f
index d79a513b2..078e4fa8c 100644
--- a/PARPACK/SRC/MPI/psgetv0.f
+++ b/PARPACK/SRC/MPI/psgetv0.f
@@ -177,11 +177,11 @@ subroutine psgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
- integer idist, iseed(4), iter, msglvl, jj
+ logical first, inits, orth
+ integer idist, iseed(4), iter, msglvl, jj, myid, igen
Real
& rnorm0
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
Real
& rnorm_buf
@@ -206,20 +206,41 @@ subroutine psgetv0
c
intrinsic abs, sqrt
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
c
c
-c %-----------------------------------%
-c | Initialize the seed of the LAPACK |
-c | random number generator |
-c %-----------------------------------%
+ if (inits) then
c
- iseed(1) = 1
- iseed(2) = 3
- iseed(3) = 5
- iseed(4) = 7
+c %-----------------------------------%
+c | Generate a seed on each processor |
+c | using process id (myid). |
+c | Note: the seed must be between 1 |
+c | and 4095. iseed(4) must be odd. |
+c %-----------------------------------%
+c
+ call MPI_COMM_RANK(comm, myid, ierr)
+ igen = 1000 + 2*myid + 1
+ if (igen .gt. 4095) then
+ write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+ end if
+c
+ iseed(1) = igen/1000
+ igen = mod(igen,1000)
+ iseed(2) = igen/100
+ igen = mod(igen,100)
+ iseed(3) = igen/10
+ iseed(4) = mod(igen,10)
+c
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f
index 731fb319f..94fb705f3 100644
--- a/PARPACK/SRC/MPI/pzgetv0.f
+++ b/PARPACK/SRC/MPI/pzgetv0.f
@@ -176,13 +176,13 @@ subroutine pzgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
+ logical first, inits, orth
integer idist, iseed(4), iter, msglvl, jj, myid, igen
Double precision
& rnorm0
Complex*16
& cnorm, cnorm2
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
Complex*16
& cnorm_buf, buf2(1)
@@ -203,6 +203,12 @@ subroutine pzgetv0
& zzdotc
external zzdotc , pdznorm2 , dlapy2
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -213,26 +219,30 @@ subroutine pzgetv0
c | random number generator |
c %-----------------------------------%
c
+ if (inits) then
c
-c %-----------------------------------%
-c | Generate a seed on each processor |
-c | using process id (myid). |
-c | Note: the seed must be between 1 |
-c | and 4095. iseed(4) must be odd. |
-c %-----------------------------------%
+c %-----------------------------------%
+c | Generate a seed on each processor |
+c | using process id (myid). |
+c | Note: the seed must be between 1 |
+c | and 4095. iseed(4) must be odd. |
+c %-----------------------------------%
c
- call MPI_COMM_RANK(comm, myid, ierr)
- igen = 1000 + 2*myid + 1
- if (igen .gt. 4095) then
- write(0,*) 'Error in p_getv0: seed exceeds 4095!'
- end if
+ call MPI_COMM_RANK(comm, myid, ierr)
+ igen = 1000 + 2*myid + 1
+ if (igen .gt. 4095) then
+ write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+ end if
+c
+ iseed(1) = igen/1000
+ igen = mod(igen,1000)
+ iseed(2) = igen/100
+ igen = mod(igen,100)
+ iseed(3) = igen/10
+ iseed(4) = mod(igen,10)
c
- iseed(1) = igen/1000
- igen = mod(igen,1000)
- iseed(2) = igen/100
- igen = mod(igen,100)
- iseed(3) = igen/10
- iseed(4) = 7
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f
index b49e66708..c231eadcb 100644
--- a/SRC/cgetv0.f
+++ b/SRC/cgetv0.f
@@ -156,13 +156,13 @@ subroutine cgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
+ logical first, inits, orth
integer idist, iseed(4), iter, msglvl, jj
Real
& rnorm0
Complex
& cnorm
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
c %----------------------%
c | External Subroutines |
@@ -180,6 +180,12 @@ subroutine cgetv0
& ccdotc
external ccdotc, scnrm2, slapy2
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -190,10 +196,13 @@ subroutine cgetv0
c | random number generator |
c %-----------------------------------%
c
- iseed(1) = 1
- iseed(2) = 3
- iseed(3) = 5
- iseed(4) = 7
+ if (inits) then
+ iseed(1) = 1
+ iseed(2) = 3
+ iseed(3) = 5
+ iseed(4) = 7
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f
index 8be4fa26d..1d6dc01bd 100644
--- a/SRC/dgetv0.f
+++ b/SRC/dgetv0.f
@@ -157,11 +157,11 @@ subroutine dgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
+ logical first, inits, orth
integer idist, iseed(4), iter, msglvl, jj
Double precision
& rnorm0
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
c %----------------------%
c | External Subroutines |
@@ -183,6 +183,12 @@ subroutine dgetv0
c
intrinsic abs, sqrt
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -193,10 +199,13 @@ subroutine dgetv0
c | random number generator |
c %-----------------------------------%
c
- iseed(1) = 1
- iseed(2) = 3
- iseed(3) = 5
- iseed(4) = 7
+ if (inits) then
+ iseed(1) = 1
+ iseed(2) = 3
+ iseed(3) = 5
+ iseed(4) = 7
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f
index 26130a014..d861b2d6d 100644
--- a/SRC/sgetv0.f
+++ b/SRC/sgetv0.f
@@ -157,11 +157,11 @@ subroutine sgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
+ logical first, inits, orth
integer idist, iseed(4), iter, msglvl, jj
Real
& rnorm0
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
c %----------------------%
c | External Subroutines |
@@ -183,6 +183,12 @@ subroutine sgetv0
c
intrinsic abs, sqrt
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -193,10 +199,13 @@ subroutine sgetv0
c | random number generator |
c %-----------------------------------%
c
- iseed(1) = 1
- iseed(2) = 3
- iseed(3) = 5
- iseed(4) = 7
+ if (inits) then
+ iseed(1) = 1
+ iseed(2) = 3
+ iseed(3) = 5
+ iseed(4) = 7
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c
diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f
index cc13c3cfb..1fbd50851 100644
--- a/SRC/zgetv0.f
+++ b/SRC/zgetv0.f
@@ -156,13 +156,13 @@ subroutine zgetv0
c | Local Scalars & Arrays |
c %------------------------%
c
- logical first, orth
+ logical first, inits, orth
integer idist, iseed(4), iter, msglvl, jj
Double precision
& rnorm0
Complex*16
& cnorm
- save first, iseed, iter, msglvl, orth, rnorm0
+ save first, iseed, inits, iter, msglvl, orth, rnorm0
c
c %----------------------%
c | External Subroutines |
@@ -180,6 +180,12 @@ subroutine zgetv0
& zzdotc
external zzdotc, dznrm2, dlapy2
c
+c %-----------------%
+c | Data Statements |
+c %-----------------%
+c
+ data inits /.true./
+c
c %-----------------------%
c | Executable Statements |
c %-----------------------%
@@ -190,10 +196,13 @@ subroutine zgetv0
c | random number generator |
c %-----------------------------------%
c
- iseed(1) = 1
- iseed(2) = 3
- iseed(3) = 5
- iseed(4) = 7
+ if (inits) then
+ iseed(1) = 1
+ iseed(2) = 3
+ iseed(3) = 5
+ iseed(4) = 7
+ inits = .false.
+ end if
c
if (ido .eq. 0) then
c

88
gnu/packages/patches/git-filter-repo-generate-doc.patch Normal file
View file

@ -0,0 +1,88 @@
From 56e6857e71d2b2a2236625f3c8b112bd40a8b164 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Fri, 16 Feb 2024 00:21:06 +0800
Subject: [PATCH] Add documentation generation.
This requires the manpage XSL and asciidoc config files from git 2.41.0.
Modified-by: Hilton Chain <hako@ultrarare.space>
---
Documentation/Makefile | 34 ++++++++++++++++++++++++++++++++++
Makefile | 17 +++--------------
2 files changed, 37 insertions(+), 14 deletions(-)
create mode 100644 Documentation/Makefile
diff --git a/Documentation/Makefile b/Documentation/Makefile
new file mode 100644
index 0000000..d81ffbe
--- /dev/null
+++ b/Documentation/Makefile
@@ -0,0 +1,34 @@
+MAN_BASE_URL := $(prefix)/share/doc/git-doc/
+VERSION := $(git log --pretty="%H" -n 1)
+
+ASCIIDOC := asciidoc
+ASCIIDOC_EXTRA :=
+ASCIIDOC_HTML := xhtml11
+ASCIIDOC_DOCBOOK := docbook
+ASCIIDOC_CONF := -f asciidoc.conf
+ASCIIDOC_COMMON := $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
+ -amanmanual='git-filter-repo Manual' -amansource='git-filter-repo $(VERSION)'
+ASCIIDOC_DEPS := asciidoc.conf
+TXT_TO_HTML := $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
+TXT_TO_XML := $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
+MANPAGE_XSL := manpage-normal.xsl
+XMLTO := xmlto
+XMLTO_EXTRA := -m manpage-bold-literal.xsl \
+ --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)'
+
+manpage-prereqs := $(wildcard manpage*.xsl)
+manpage-cmd := $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man
+
+%.xml : %.txt $(ASCIIDOC_DEPS)
+ $(TXT_TO_XML) -d manpage -o $@ $<
+
+man1/%.1 : %.xml $(manpage-prereqs)
+ mkdir -p man1
+ $(manpage-cmd) -o man1 $<
+
+html/%.html : %.txt $(ASCIIDOC_DEPS)
+ mkdir -p html
+ $(TXT_TO_HTML) -d manpage -o $@ $<
+
+man: man1/git-filter-repo.1
+html: html/git-filter-repo.html
diff --git a/Makefile b/Makefile
index a443450..d965ae5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,21 +20,10 @@ test:
fixup_locale:
sed -ie s%@@LOCALEDIR@@%$(localedir)% git-filter-repo
-# People installing from tarball will already have man1/git-filter-repo.1 and
-# html/git-filter-repo.html. But let's support people installing from a git
-# clone too; for them, just cheat and snag a copy of the built docs that I
-# record in a different branch.
-snag_docs: Documentation/man1/git-filter-repo.1 Documentation/html/git-filter-repo.html
+doc:
+ $(MAKE) -C Documentation man html
-Documentation/man1/git-filter-repo.1:
- mkdir -p Documentation/man1
- git show origin/docs:man1/git-filter-repo.1 >Documentation/man1/git-filter-repo.1
-
-Documentation/html/git-filter-repo.html:
- mkdir -p Documentation/html
- git show origin/docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html
-
-install: snag_docs #fixup_locale
+install: doc #fixup_locale
install -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo"
install -dm0755 "$(DESTDIR)/$(pythondir)"
ln -sf "$(bindir)/git-filter-repo" "$(DESTDIR)/$(pythondir)/git_filter_repo.py"
base-commit: cbc6535694380d3a3bf3e5c96410d4ce7e8de94f
--
2.41.0

53
gnu/packages/patches/r-sgloptim.patch Normal file
View file

@ -0,0 +1,53 @@
From cb9a15eb9d558b2b4b67f9e6806b394f65bff01f Mon Sep 17 00:00:00 2001
From: Dirk Eddelbuettel <edd@debian.org>
Date: Wed, 30 Nov 2022 20:15:42 -0600
Subject: [PATCH] Simplify includes and only include RcppArmadillo.h
---
inst/include/sgl.h | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/inst/include/sgl.h b/inst/include/sgl.h
index a36011e..869a295 100644
--- a/inst/include/sgl.h
+++ b/inst/include/sgl.h
@@ -21,13 +21,12 @@
#define R_NO_REMAP
+//R, Rcpp, RcppArmadillo
+#include <RcppArmadillo.h>
+
//Progress monitor
#include <progress.hpp>
-//Rcpp ect
-#include <RcppCommon.h>
-#include <Rconfig.h>
-#include <RcppArmadilloConfig.h>
// Debugging
#ifdef SGL_DEBUG
@@ -45,8 +44,10 @@
#else
// Do no debugging
#define ARMA_NO_DEBUG
+#ifndef NDEBUG
#define NDEBUG
#endif
+#endif
// Registration helper macros
#define STR_VALUE(x) #x
@@ -59,11 +60,6 @@
#define CALL_METHOD(METHOD, MODULE, ARGS) {GET_STR_VALUE(FUN_NAME(METHOD,MODULE)), (DL_FUNC) &r_ ## MODULE ## _ ## METHOD, ARGS}
-//Support for xl matrices
-//#define ARMA_64BIT_WORD
-
-#include <armadillo>
-#include <Rcpp.h>
//Boost
#include <boost/math/special_functions/fpclassify.hpp>

295
gnu/packages/patches/restartd-update-robust.patch Normal file
View file

@ -0,0 +1,295 @@
From 01cd2d15a9bf1109e0e71b3e31b835d63dcf9cd8 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>, Yin Kangkai <yinkangkai@xiaomi.com>, Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH]
Fix segfault when run as normal user
Also exit immediately when "restartd -h"
Signed-off-by: Yin Kangkai <yinkangkai@xiaomi.com>
Fix build with gcc-10
Bug: https://bugs.debian.org/957761
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Handle memory allocation failures.
This makes the code a little more robust.
Signed-off-by: Maxime Devos <maximedevos@telenet.be>
Handle fopen failures.
This makes the code a little more robust. What if /var/run does not
exist, or we do not have permission to open
/var/run/restartd.pid (EPERM?) due to SELinux misconfiguration?
Signed-off-by: Maxime Devos <maximedevos@telenet.be>
Handle printf and fprintf failures.
This makes the code a little more robust. What if the write was
refused to the underlying device being removed?
The --help, debug and stderr printfs were ignored because there error
handling does not appear important to me.
Signed-off-by: Maxime Devos <maximedevos@telenet.be>
Handle fclose failures when writing.
This makes the code a little more robust. What if a quotum is exceeded?
Signed-off-by: Maxime Devos <maximedevos@telenet.be>
---
config.c | 19 +++++++++----
config.h | 14 ++++++----
restartd.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 92 insertions(+), 21 deletions(-)
diff --git a/config.c b/config.c
index f307b8a..5cc0271 100644
--- a/config.c
+++ b/config.c
@@ -57,7 +57,11 @@ int read_config(void)
config_process_number = 0;
line1 = (char *) malloc(MAX_LINE_LENGTH);
+ if (!line1)
+ oom_failure();
line2 = (char *) malloc(MAX_LINE_LENGTH);
+ if (!line2)
+ oom_failure();
if ((config_fd = fopen(config_file, "rt")) == NULL) {
fprintf(stderr, "Error at opening config file: %s\n", config_file);
@@ -155,11 +159,16 @@ void dump_config(void) {
int i;
for(i=0; i<config_process_number; i++) {
- printf("ID=%d\n name=%s\n regexp=%s\n running=%s\n not_running=%s\n", i,
- config_process[i].name,
- config_process[i].regexp,
- config_process[i].running,
- config_process[i].not_running);
+ if (printf("ID=%d\n name=%s\n regexp=%s\n running=%s\n not_running=%s\n", i,
+ config_process[i].name,
+ config_process[i].regexp,
+ config_process[i].running,
+ config_process[i].not_running) < 0) {
+ /* Maybe stdout points to a file and a file system quotum was exceeded? */
+ fprintf(stderr, "Failed to dump the configuration. Exiting.\n");
+ syslog(LOG_ERR, "Failed to dump the configuration. Exiting.");
+ exit(1);
+ }
}
}
diff --git a/config.h b/config.h
index fabaa2b..2ba1cbe 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,7 @@
/* restartd - Process checker and/or restarter daemon
* Copyright (C) 2000-2002 Tibor Koleszar <oldw@debian.org>
* Copyright (C) 2006 Aurélien GÉRÔME <ag@roxor.cx>
+ * Copyright (C) 2022 Maxime Devos <maximedevos@telenet.be>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,12 +26,12 @@
#define DEFAULT_CONFIG "/etc/restartd.conf"
-int debug;
-int config_process_number;
-int check_interval;
-int foreground;
-struct config_process_type *config_process;
-char *config_file;
+extern int debug;
+extern int config_process_number;
+extern int check_interval;
+extern int foreground;
+extern struct config_process_type *config_process;
+extern char *config_file;
typedef struct config_process_type {
char name[64];
@@ -43,5 +44,6 @@ typedef struct config_process_type {
int read_config(/* char *config_file */);
void dump_config(void);
+void oom_failure(void);
#endif /* RESTARTD_CONFIG_H */
diff --git a/restartd.c b/restartd.c
index 2aa720c..aa74334 100644
--- a/restartd.c
+++ b/restartd.c
@@ -1,6 +1,7 @@
/* restartd - Process checker and/or restarter daemon
* Copyright (C) 2000-2002 Tibor Koleszar <oldw@debian.org>
* Copyright (C) 2006 Aurélien GÉRÔME <ag@roxor.cx>
+ * Copyright (C) 2022 Maxime Devos <maximedevos@telenet.be>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -35,6 +36,13 @@
#include "config.h"
+int debug;
+int config_process_number;
+int check_interval;
+int foreground;
+struct config_process_type *config_process;
+char *config_file;
+
/* SIGTERM & SIGHUP handler */
void got_signal(int sig)
{
@@ -52,6 +60,17 @@ void got_signal(int sig)
}
}
+/* Ignoring out-of-memory failures is risky on systems without virtual memory
+ where additionally at address 0 there is actually something important
+ mapped. Additionally, while often on Linux the OOM killer will kill processes
+ where an OOM happens, this is not always the case and there exist other systems
+ without an OOM killer (e.g. the Hurd). */
+void oom_failure()
+{
+ syslog(LOG_ERR, "Failed to allocate memory. Exiting.");
+ exit(1);
+}
+
int main(int argc, char *argv[])
{
DIR *procdir_id;
@@ -75,15 +94,21 @@ int main(int argc, char *argv[])
/* Options */
config_file = strdup(DEFAULT_CONFIG);
+ if (!config_file)
+ oom_failure();
+
list_only = 0;
for(i = 0; i < argc; i++) {
if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--config")) {
config_file = strdup(argv[i + 1]);
+ if (!config_file)
+ oom_failure();
}
if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
printf("restard %s - Copyright 2000-2002 Tibor Koleszar <oldw@debian.org>\n"
- " Copyright 2006 Aurélien GÉRÔME <ag@roxor.cx>\n",
+ " Copyright 2006 Aurélien GÉRÔME <ag@roxor.cx>\n"
+ " Copyright 2022 Maxime Devos <maximedevos@telenet.be>\n",
VERSION);
exit(0);
}
@@ -118,10 +143,13 @@ int main(int argc, char *argv[])
" -i <interval_sec>: the check interval in second\n"
" -l : list configuration options\n"
" -h : help\n\n", VERSION);
+ exit(0);
}
}
config_process = malloc(sizeof(struct config_process_type) * 128);
+ if (!config_process)
+ oom_failure();
read_config();
if (list_only) {
@@ -133,9 +161,17 @@ int main(int argc, char *argv[])
config_process_number);
procdir_dirent = malloc(sizeof(struct dirent));
+ if (!procdir_dirent)
+ oom_failure();
proc_cmdline_str = (char *) malloc(1024);
+ if (!proc_cmdline_str)
+ oom_failure();
proc_cmdline_name = (char *) malloc(1024);
+ if (!proc_cmdline_name)
+ oom_failure();
regc = malloc(1024);
+ if (!regc)
+ oom_failure();
/* Catch signals */
signal(SIGTERM, got_signal);
@@ -187,8 +223,19 @@ int main(int argc, char *argv[])
}
out_proc = fopen("/var/run/restartd.pid", "wt");
- fprintf(out_proc, "%d", getpid());
- fclose(out_proc);
+ if (!out_proc) {
+ syslog(LOG_ERR, "Failed to open /var/run/restartd.pid");
+ return -1;
+ }
+ if (fprintf(out_proc, "%d", getpid()) < 0) {
+ syslog(LOG_ERR, "Failed to write to /var/run/restartd.pid. Exiting.");
+ return -1;
+ }
+ if (fclose(out_proc) < 0) { /* errors can happen when flushing the buffer */
+ syslog(LOG_ERR, "Failed to write to /var/run/restartd.pid. Exiting.");
+ return -1;
+ }
+
while(1) {
if ((procdir_id = opendir("/proc")) == NULL) {
@@ -237,16 +284,23 @@ int main(int argc, char *argv[])
now = time(NULL);
out_proc = fopen("/var/run/restartd", "wt");
+ if (!out_proc) {
+ syslog(LOG_ERR, "Failed to open /var/run/restartd.pid");
+ return -1;
+ }
- fprintf(out_proc, "%s\n", ctime(&now));
+ if (fprintf(out_proc, "%s\n", ctime(&now)) < 0) {
+ syslog(LOG_ERR, "Failed to write to /var/run/restartd. Exiting.");
+ return -1;
+ }
for(i=0; i<config_process_number; i++) {
if (strlen(config_process[i].processes) > 0) {
if (strlen(config_process[i].running) > 0) {
strcpy(config_process[i].status, "running");
- syslog(LOG_INFO, "%s is running, executing '%s'",
+ /* syslog(LOG_INFO, "%s is running, executing '%s'",
config_process[i].name,
- config_process[i].running);
+ config_process[i].running); */
system(config_process[i].running);
} else {
strcpy(config_process[i].status, "running");
@@ -267,12 +321,18 @@ int main(int argc, char *argv[])
strcpy(config_process[i].status, "not running");
}
- fprintf(out_proc, "%-12s %-12s %s\n",
- config_process[i].name, config_process[i].status,
- config_process[i].processes);
+ if (fprintf(out_proc, "%-12s %-12s %s\n",
+ config_process[i].name, config_process[i].status,
+ config_process[i].processes) < 0) {
+ syslog(LOG_ERR, "Failed to write to /var/run/restartd. Exiting.");
+ return -1;
+ }
}
- fclose(out_proc);
+ if (fclose(out_proc) < 0) {
+ syslog(LOG_ERR, "Failed to write to /var/run/restartd.pid. Exiting.");
+ return -1;
+ }
sleep(check_interval);
}
--
2.37.3

244
gnu/packages/patches/sdcc-disable-non-free-code.patch
View file

@ -15,10 +15,10 @@ remove instructions that encourage the use of SDCC with non-free
software. software.
diff --git a/Makefile.common.in b/Makefile.common.in diff --git a/Makefile.common.in b/Makefile.common.in
index 9cd116c..6bbe9fb 100644 index 8469079..174ed91 100644
--- a/Makefile.common.in --- a/Makefile.common.in
+++ b/Makefile.common.in +++ b/Makefile.common.in
@@ -77,7 +77,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@ @@ -78,7 +78,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@
OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@ OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@
OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@ OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@
OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@ OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@
@ -27,10 +27,10 @@ index 9cd116c..6bbe9fb 100644
SLIB = $(top_builddir)/support/util SLIB = $(top_builddir)/support/util
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 6d035ec..12f1fad 100644 index 3287e30..69511e1 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -105,9 +105,6 @@ endif @@ -104,9 +104,6 @@ endif
ifeq ($(OPT_DISABLE_DEVICE_LIB), 0) ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
TARGETS += sdcc-device-lib TARGETS += sdcc-device-lib
PKGS += device/lib PKGS += device/lib
@ -40,7 +40,7 @@ index 6d035ec..12f1fad 100644
endif endif
ifeq ($(OPT_DISABLE_PACKIHX), 0) ifeq ($(OPT_DISABLE_PACKIHX), 0)
@@ -128,9 +125,6 @@ endif @@ -127,9 +124,6 @@ endif
TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
PKGS += $(SDCC_LIBS) src device/include PKGS += $(SDCC_LIBS) src device/include
@ -50,7 +50,7 @@ index 6d035ec..12f1fad 100644
PKGS += $(SDCC_AS) sdas/linksrc $(SDCC_SCRIPTS) PKGS += $(SDCC_AS) sdas/linksrc $(SDCC_SCRIPTS)
PORTS = $(shell cat ports.build) PORTS = $(shell cat ports.build)
@@ -168,21 +162,12 @@ sdcc-sdbinutils: @@ -167,21 +161,12 @@ sdcc-sdbinutils:
sdcc-device-inc: sdcc-device-inc:
$(MAKE) -C device/include $(MAKE) -C device/include
@ -73,7 +73,7 @@ index 6d035ec..12f1fad 100644
# doc depends on latex and latex2html # doc depends on latex and latex2html
diff --git a/configure b/configure diff --git a/configure b/configure
index 9de81c6..2620e3c 100755 index b509c84..c7ce7fc 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -659,7 +659,6 @@ LATEX @@ -659,7 +659,6 @@ LATEX
@ -84,7 +84,7 @@ index 9de81c6..2620e3c 100755
OPT_DISABLE_SDBINUTILS OPT_DISABLE_SDBINUTILS
OPT_DISABLE_SDCDB OPT_DISABLE_SDCDB
OPT_DISABLE_SDCPP OPT_DISABLE_SDCPP
@@ -692,10 +691,7 @@ OPT_DISABLE_Z80 @@ -693,10 +692,7 @@ OPT_DISABLE_Z80
OPT_DISABLE_MCS51 OPT_DISABLE_MCS51
SVN_REVISION SVN_REVISION
GIT_REVISION GIT_REVISION
@ -95,7 +95,7 @@ index 9de81c6..2620e3c 100755
include_dir_suffix include_dir_suffix
inclib_dir_suffix inclib_dir_suffix
LIB_TYPE LIB_TYPE
@@ -824,7 +820,6 @@ enable_packihx @@ -828,7 +824,6 @@ enable_packihx
enable_sdcpp enable_sdcpp
enable_sdcdb enable_sdcdb
enable_sdbinutils enable_sdbinutils
@ -103,7 +103,7 @@ index 9de81c6..2620e3c 100755
enable_doc enable_doc
enable_libgc enable_libgc
' '
@@ -845,10 +840,7 @@ sdccconf_h_dir_separator @@ -849,10 +844,7 @@ sdccconf_h_dir_separator
LIB_TYPE LIB_TYPE
inclib_dir_suffix inclib_dir_suffix
include_dir_suffix include_dir_suffix
@ -114,7 +114,7 @@ index 9de81c6..2620e3c 100755
docdir' docdir'
ac_subdirs_all='support/cpp ac_subdirs_all='support/cpp
support/packihx support/packihx
@@ -856,9 +848,7 @@ sim/ucsim @@ -860,9 +852,7 @@ sim/ucsim
debugger/mcs51 debugger/mcs51
support/sdbinutils support/sdbinutils
device/lib/pic14 device/lib/pic14
@ -125,7 +125,7 @@ index 9de81c6..2620e3c 100755
# Initialize some variables set by options. # Initialize some variables set by options.
ac_init_help= ac_init_help=
@@ -1512,7 +1502,6 @@ Optional Features: @@ -1517,7 +1507,6 @@ Optional Features:
--disable-sdcpp Disables building sdcpp --disable-sdcpp Disables building sdcpp
--disable-sdcdb Disables building sdcdb --disable-sdcdb Disables building sdcdb
--disable-sdbinutils Disables configuring and building of sdbinutils --disable-sdbinutils Disables configuring and building of sdbinutils
@ -133,7 +133,7 @@ index 9de81c6..2620e3c 100755
--enable-doc Enables building the documentation --enable-doc Enables building the documentation
--enable-libgc Use the Bohem memory allocator. Lower runtime --enable-libgc Use the Bohem memory allocator. Lower runtime
footprint. footprint.
@@ -1541,16 +1530,8 @@ Some influential environment variables: @@ -1551,16 +1540,8 @@ Some influential environment variables:
appended to datadir to define SDCC's include/lib directory appended to datadir to define SDCC's include/lib directory
include_dir_suffix include_dir_suffix
appended to datadir to define SDCC's include directory appended to datadir to define SDCC's include directory
@ -150,7 +150,7 @@ index 9de81c6..2620e3c 100755
docdir documentation installation directory docdir documentation installation directory
Use these variables to override the choices made by `configure' or to help Use these variables to override the choices made by `configure' or to help
@@ -7426,19 +7407,6 @@ if test "${include_dir_suffix}" = ""; then @@ -7869,19 +7850,6 @@ if test "${include_dir_suffix}" = ""; then
include_dir_suffix="${inclib_dir_suffix}/include" include_dir_suffix="${inclib_dir_suffix}/include"
fi fi
@ -170,7 +170,7 @@ index 9de81c6..2620e3c 100755
# lib_dir_suffix: # lib_dir_suffix:
# *nix default: "sdcc/lib" # *nix default: "sdcc/lib"
@@ -7446,13 +7414,6 @@ if test "${lib_dir_suffix}" = ""; then @@ -7889,13 +7857,6 @@ if test "${lib_dir_suffix}" = ""; then
lib_dir_suffix="${inclib_dir_suffix}/lib" lib_dir_suffix="${inclib_dir_suffix}/lib"
fi fi
@ -184,7 +184,7 @@ index 9de81c6..2620e3c 100755
# docdir: # docdir:
# *nix default: "${datadir}/sdcc/doc" # *nix default: "${datadir}/sdcc/doc"
@@ -7605,22 +7566,6 @@ esac @@ -8048,22 +8009,6 @@ esac
printf "%s\n" "#define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_inc_dir_suffix}\"" >>confdefs.h printf "%s\n" "#define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_inc_dir_suffix}\"" >>confdefs.h
@ -207,7 +207,7 @@ index 9de81c6..2620e3c 100755
norm_lib_dir_suffix=${lib_dir_suffix} norm_lib_dir_suffix=${lib_dir_suffix}
case ":$norm_lib_dir_suffix:" in case ":$norm_lib_dir_suffix:" in
@@ -7638,22 +7583,6 @@ esac @@ -8081,22 +8026,6 @@ esac
printf "%s\n" "#define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_lib_dir_suffix}\"" >>confdefs.h printf "%s\n" "#define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_lib_dir_suffix}\"" >>confdefs.h
@ -230,7 +230,7 @@ index 9de81c6..2620e3c 100755
# relative paths # relative paths
for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do
@@ -8769,27 +8698,6 @@ printf "%s\n" "#define OPT_DISABLE_SDBINUTILS $OPT_DISABLE_SDBINUTILS" >>confdef @@ -9237,27 +9166,6 @@ printf "%s\n" "#define OPT_DISABLE_SDBINUTILS $OPT_DISABLE_SDBINUTILS" >>confdef
@ -258,7 +258,7 @@ index 9de81c6..2620e3c 100755
# Check whether --enable-doc was given. # Check whether --enable-doc was given.
if test ${enable_doc+y} if test ${enable_doc+y}
@@ -9217,20 +9125,12 @@ if test $OPT_DISABLE_PIC14 = 0; then @@ -9685,20 +9593,12 @@ if test $OPT_DISABLE_PIC14 = 0; then
test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14" test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14"
@ -278,8 +278,8 @@ index 9de81c6..2620e3c 100755
- -
fi fi
if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_SM83 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0; then if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_SM83 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0 || test $OPT_DISABLE_R800 = 0; then
@@ -9307,8 +9207,6 @@ fi @@ -9775,8 +9675,6 @@ fi
test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile" test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile"
@ -288,7 +288,7 @@ index 9de81c6..2620e3c 100755
ac_config_files="$ac_config_files main.mk:main_in.mk bin/Makefile src/Makefile device/include/Makefile sdas/linksrc/Makefile support/makebin/Makefile support/regression/Makefile support/regression/cases/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in" ac_config_files="$ac_config_files main.mk:main_in.mk bin/Makefile src/Makefile device/include/Makefile sdas/linksrc/Makefile support/makebin/Makefile support/regression/Makefile support/regression/cases/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
@@ -9324,10 +9222,6 @@ ac_config_files="$ac_config_files bin/sdranlib" @@ -9792,10 +9690,6 @@ ac_config_files="$ac_config_files bin/sdranlib"
ac_config_files="$ac_config_files bin/sdobjcopy" ac_config_files="$ac_config_files bin/sdobjcopy"
@ -299,7 +299,7 @@ index 9de81c6..2620e3c 100755
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure # tests run on this system so they can be shared between configure
@@ -10068,7 +9962,6 @@ do @@ -10538,7 +10432,6 @@ do
"device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;; "device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;;
"sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;; "sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;;
"device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;; "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;;
@ -307,7 +307,7 @@ index 9de81c6..2620e3c 100755
"main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;; "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;
"bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;; "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -10088,7 +9981,6 @@ do @@ -10558,7 +10451,6 @@ do
"bin/sdnm") CONFIG_FILES="$CONFIG_FILES bin/sdnm" ;; "bin/sdnm") CONFIG_FILES="$CONFIG_FILES bin/sdnm" ;;
"bin/sdranlib") CONFIG_FILES="$CONFIG_FILES bin/sdranlib" ;; "bin/sdranlib") CONFIG_FILES="$CONFIG_FILES bin/sdranlib" ;;
"bin/sdobjcopy") CONFIG_FILES="$CONFIG_FILES bin/sdobjcopy" ;; "bin/sdobjcopy") CONFIG_FILES="$CONFIG_FILES bin/sdobjcopy" ;;
@ -315,7 +315,7 @@ index 9de81c6..2620e3c 100755
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac
@@ -10905,54 +10797,6 @@ esac @@ -11375,54 +11267,6 @@ esac
incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'` incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'`
@ -370,7 +370,7 @@ index 9de81c6..2620e3c 100755
libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'` libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'`
case ":$libPath1:" in case ":$libPath1:" in
@@ -11002,54 +10846,6 @@ esac @@ -11472,54 +11316,6 @@ esac
libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'` libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'`
@ -425,7 +425,7 @@ index 9de81c6..2620e3c 100755
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
sdcc ${VERSION} is now configured for sdcc ${VERSION} is now configured for
@@ -11091,7 +10887,6 @@ sdcc ${VERSION} is now configured for @@ -11562,7 +11358,6 @@ sdcc ${VERSION} is now configured for
mos6502 ${enable_mos6502_port} mos6502 ${enable_mos6502_port}
mos65c02 ${enable_mos65c02_port} mos65c02 ${enable_mos65c02_port}
@ -433,7 +433,7 @@ index 9de81c6..2620e3c 100755
Disable packihx: ${OPT_DISABLE_PACKIHX} Disable packihx: ${OPT_DISABLE_PACKIHX}
Disable ucsim: ${OPT_DISABLE_UCSIM} Disable ucsim: ${OPT_DISABLE_UCSIM}
Disable device lib: ${OPT_DISABLE_DEVICE_LIB} Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
@@ -11106,9 +10901,6 @@ sdcc ${VERSION} is now configured for @@ -11577,9 +11372,6 @@ sdcc ${VERSION} is now configured for
include/library files: ${datadir}/${inclib_dir_suffix} include/library files: ${datadir}/${inclib_dir_suffix}
include files: ${datadir}/${include_dir_suffix} include files: ${datadir}/${include_dir_suffix}
library files: ${datadir}/${lib_dir_suffix} library files: ${datadir}/${lib_dir_suffix}
@ -443,7 +443,7 @@ index 9de81c6..2620e3c 100755
documentation: ${docdir} documentation: ${docdir}
prefix: ${prefix} prefix: ${prefix}
@@ -11120,15 +10912,9 @@ sdcc ${VERSION} is now configured for @@ -11591,15 +11383,9 @@ sdcc ${VERSION} is now configured for
include files: ${incPath1} include files: ${incPath1}
path(argv[0])${incPath2} path(argv[0])${incPath2}
${incPath3} ${incPath3}
@ -459,7 +459,7 @@ index 9de81c6..2620e3c 100755
" >&5 " >&5
printf "%s\n" " printf "%s\n" "
sdcc ${VERSION} is now configured for sdcc ${VERSION} is now configured for
@@ -11171,7 +10957,6 @@ sdcc ${VERSION} is now configured for @@ -11643,7 +11429,6 @@ sdcc ${VERSION} is now configured for
mos6502 ${enable_mos6502_port} mos6502 ${enable_mos6502_port}
mos65c02 ${enable_mos65c02_port} mos65c02 ${enable_mos65c02_port}
@ -467,7 +467,7 @@ index 9de81c6..2620e3c 100755
Disable packihx: ${OPT_DISABLE_PACKIHX} Disable packihx: ${OPT_DISABLE_PACKIHX}
Disable ucsim: ${OPT_DISABLE_UCSIM} Disable ucsim: ${OPT_DISABLE_UCSIM}
Disable device lib: ${OPT_DISABLE_DEVICE_LIB} Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
@@ -11186,9 +10971,6 @@ sdcc ${VERSION} is now configured for @@ -11658,9 +11443,6 @@ sdcc ${VERSION} is now configured for
include/library files: ${datadir}/${inclib_dir_suffix} include/library files: ${datadir}/${inclib_dir_suffix}
include files: ${datadir}/${include_dir_suffix} include files: ${datadir}/${include_dir_suffix}
library files: ${datadir}/${lib_dir_suffix} library files: ${datadir}/${lib_dir_suffix}
@ -477,7 +477,7 @@ index 9de81c6..2620e3c 100755
documentation: ${docdir} documentation: ${docdir}
prefix: ${prefix} prefix: ${prefix}
@@ -11200,15 +10982,9 @@ sdcc ${VERSION} is now configured for @@ -11672,15 +11454,9 @@ sdcc ${VERSION} is now configured for
include files: ${incPath1} include files: ${incPath1}
path(argv[0])${incPath2} path(argv[0])${incPath2}
${incPath3} ${incPath3}
@ -494,10 +494,10 @@ index 9de81c6..2620e3c 100755
# End of configure/configure.in # End of configure/configure.in
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ead779c..a3578fe 100644 index adf5060..bd5a036 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -564,19 +564,6 @@ if test "${include_dir_suffix}" = ""; then @@ -542,19 +542,6 @@ if test "${include_dir_suffix}" = ""; then
include_dir_suffix="${inclib_dir_suffix}/include" include_dir_suffix="${inclib_dir_suffix}/include"
fi fi
@ -517,7 +517,7 @@ index ead779c..a3578fe 100644
# lib_dir_suffix: # lib_dir_suffix:
# *nix default: "sdcc/lib" # *nix default: "sdcc/lib"
AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory]) AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory])
@@ -584,13 +571,6 @@ if test "${lib_dir_suffix}" = ""; then @@ -562,13 +549,6 @@ if test "${lib_dir_suffix}" = ""; then
lib_dir_suffix="${inclib_dir_suffix}/lib" lib_dir_suffix="${inclib_dir_suffix}/lib"
fi fi
@ -531,7 +531,7 @@ index ead779c..a3578fe 100644
# docdir: # docdir:
# *nix default: "${datadir}/sdcc/doc" # *nix default: "${datadir}/sdcc/doc"
AC_ARG_VAR([docdir], [documentation installation directory]) AC_ARG_VAR([docdir], [documentation installation directory])
@@ -631,19 +611,11 @@ norm_inc_dir_suffix=${include_dir_suffix} @@ -609,19 +589,11 @@ norm_inc_dir_suffix=${include_dir_suffix}
adl_NORMALIZE_PATH([norm_inc_dir_suffix], [$sdccconf_h_dir_separator]) adl_NORMALIZE_PATH([norm_inc_dir_suffix], [$sdccconf_h_dir_separator])
AC_DEFINE_UNQUOTED(INCLUDE_DIR_SUFFIX, AC_DEFINE_UNQUOTED(INCLUDE_DIR_SUFFIX,
DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}", [XXX]) DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}", [XXX])
@ -551,7 +551,7 @@ index ead779c..a3578fe 100644
# relative paths # relative paths
adl_COMPUTE_RELATIVE_PATHS([expanded_bindir:expanded_datadir:bin2data_dir]) adl_COMPUTE_RELATIVE_PATHS([expanded_bindir:expanded_datadir:bin2data_dir])
@@ -836,7 +808,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx]) @@ -815,7 +787,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx])
AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp]) AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp])
AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb]) AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb])
AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils]) AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils])
@ -559,7 +559,7 @@ index ead779c..a3578fe 100644
AC_DO_ENABLER(doc, DOC, [Enables building the documentation]) AC_DO_ENABLER(doc, DOC, [Enables building the documentation])
AC_CHECK_PROG([LYX], [lyx], [lyx], [:]) AC_CHECK_PROG([LYX], [lyx], [lyx], [:])
@@ -915,16 +886,10 @@ if test $OPT_DISABLE_PIC14 = 0; then @@ -895,16 +866,10 @@ if test $OPT_DISABLE_PIC14 = 0; then
AC_CONFIG_FILES(src/pic14/Makefile) AC_CONFIG_FILES(src/pic14/Makefile)
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic14) test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic14)
fi fi
@ -574,9 +574,9 @@ index ead779c..a3578fe 100644
- test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16) - test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16)
-fi -fi
if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_SM83 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0; then if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_SM83 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0 || test $OPT_DISABLE_R800 = 0; then
AC_CONFIG_FILES([src/z80/Makefile]) AC_CONFIG_FILES([src/z80/Makefile])
@@ -988,7 +953,6 @@ fi @@ -969,7 +934,6 @@ fi
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile]) test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile])
@ -584,7 +584,7 @@ index ead779c..a3578fe 100644
AC_CONFIG_FILES([main.mk:main_in.mk AC_CONFIG_FILES([main.mk:main_in.mk
bin/Makefile bin/Makefile
@@ -1010,9 +974,6 @@ AC_CONFIG_FILES([bin/sdar], [chmod +x bin/sdar]) @@ -991,9 +955,6 @@ AC_CONFIG_FILES([bin/sdar], [chmod +x bin/sdar])
AC_CONFIG_FILES([bin/sdnm], [chmod +x bin/sdnm]) AC_CONFIG_FILES([bin/sdnm], [chmod +x bin/sdnm])
AC_CONFIG_FILES([bin/sdranlib], [chmod +x bin/sdranlib]) AC_CONFIG_FILES([bin/sdranlib], [chmod +x bin/sdranlib])
AC_CONFIG_FILES([bin/sdobjcopy], [chmod +x bin/sdobjcopy]) AC_CONFIG_FILES([bin/sdobjcopy], [chmod +x bin/sdobjcopy])
@ -594,7 +594,7 @@ index ead779c..a3578fe 100644
AC_OUTPUT AC_OUTPUT
# I found no better place # I found no better place
@@ -1030,16 +991,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [ @@ -1011,16 +972,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [
adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_inc_dir_suffix}, [incPath1], [$dirch]) adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_inc_dir_suffix}, [incPath1], [$dirch])
adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_inc_dir_suffix}, [incPath2], [$dirch]) adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_inc_dir_suffix}, [incPath2], [$dirch])
adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_inc_dir_suffix}, [incPath3], [$dirch]) adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_inc_dir_suffix}, [incPath3], [$dirch])
@ -611,7 +611,7 @@ index ead779c..a3578fe 100644
AC_MSG_RESULT([ AC_MSG_RESULT([
sdcc ${VERSION} is now configured for sdcc ${VERSION} is now configured for
@@ -1082,7 +1037,6 @@ sdcc ${VERSION} is now configured for @@ -1064,7 +1019,6 @@ sdcc ${VERSION} is now configured for
mos6502 ${enable_mos6502_port} mos6502 ${enable_mos6502_port}
mos65c02 ${enable_mos65c02_port} mos65c02 ${enable_mos65c02_port}
@ -619,7 +619,7 @@ index ead779c..a3578fe 100644
Disable packihx: ${OPT_DISABLE_PACKIHX} Disable packihx: ${OPT_DISABLE_PACKIHX}
Disable ucsim: ${OPT_DISABLE_UCSIM} Disable ucsim: ${OPT_DISABLE_UCSIM}
Disable device lib: ${OPT_DISABLE_DEVICE_LIB} Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
@@ -1097,9 +1051,6 @@ sdcc ${VERSION} is now configured for @@ -1079,9 +1033,6 @@ sdcc ${VERSION} is now configured for
include/library files: ${datadir}/${inclib_dir_suffix} include/library files: ${datadir}/${inclib_dir_suffix}
include files: ${datadir}/${include_dir_suffix} include files: ${datadir}/${include_dir_suffix}
library files: ${datadir}/${lib_dir_suffix} library files: ${datadir}/${lib_dir_suffix}
@ -629,7 +629,7 @@ index ead779c..a3578fe 100644
documentation: ${docdir} documentation: ${docdir}
prefix: ${prefix} prefix: ${prefix}
@@ -1111,14 +1062,8 @@ sdcc ${VERSION} is now configured for @@ -1093,14 +1044,8 @@ sdcc ${VERSION} is now configured for
include files: ${incPath1} include files: ${incPath1}
path(argv[[0]])${incPath2} path(argv[[0]])${incPath2}
${incPath3} ${incPath3}
@ -1003,7 +1003,7 @@ index db0d421..9e90d7a 100644
.SUFFIXES: .SUFFIXES:
diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in
index ae76fdd..75fc04a 100644 index 74147d2..bed548b 100644
--- a/device/lib/pic16/libc/Makefile.in --- a/device/lib/pic16/libc/Makefile.in
+++ b/device/lib/pic16/libc/Makefile.in +++ b/device/lib/pic16/libc/Makefile.in
@@ -88,10 +88,7 @@ PRE_UNINSTALL = : @@ -88,10 +88,7 @@ PRE_UNINSTALL = :
@ -1018,7 +1018,7 @@ index ae76fdd..75fc04a 100644
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -383,8 +380,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \ @@ -384,8 +381,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \
string/strpbrk.c string/strrchr.c string/strspn.c \ string/strpbrk.c string/strrchr.c string/strspn.c \
string/strstr.c string/strtok.c string/strupr.c \ string/strstr.c string/strtok.c string/strupr.c \
utils/cnvfrac.S utils/cnvint.S utils/cvtdec.S utils/cnvfrac.S utils/cnvint.S utils/cvtdec.S
@ -1028,7 +1028,7 @@ index ae76fdd..75fc04a 100644
#AM_CFLAGS += --no-optimize-goto #AM_CFLAGS += --no-optimize-goto
#AM_CFLAGS += --debug-ralloc #AM_CFLAGS += --debug-ralloc
@@ -398,11 +394,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \ @@ -399,11 +395,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
#AM_CFLAGS += --noinduction #AM_CFLAGS += --noinduction
#AM_CFLAGS += --nojtbound #AM_CFLAGS += --nojtbound
#AM_CFLAGS += --noloopreverse #AM_CFLAGS += --noloopreverse
@ -1248,7 +1248,7 @@ index 5c2fce7..8d70807 100644
.SUFFIXES: .SUFFIXES:
diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
index 3711c71..9e500a2 100644 index 8dfadb6..dd17528 100644
--- a/doc/INSTALL.txt --- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt +++ b/doc/INSTALL.txt
@@ -18,9 +18,7 @@ To install: @@ -18,9 +18,7 @@ To install:
@ -1282,7 +1282,7 @@ index 3711c71..9e500a2 100644
You can test the install by entering: You can test the install by entering:
diff --git a/doc/README.txt b/doc/README.txt diff --git a/doc/README.txt b/doc/README.txt
index cd1ef3f..5a0d0a8 100644 index e62177b..4d09afb 100644
--- a/doc/README.txt --- a/doc/README.txt
+++ b/doc/README.txt +++ b/doc/README.txt
@@ -37,10 +37,9 @@ Exception are pic device libraries and header files which are derived @@ -37,10 +37,9 @@ Exception are pic device libraries and header files which are derived
@ -1300,10 +1300,10 @@ index cd1ef3f..5a0d0a8 100644
However: Many think that the Microchip requirement is not legally enforceable, However: Many think that the Microchip requirement is not legally enforceable,
arguing that the header files only contain noncopyrightable facts. arguing that the header files only contain noncopyrightable facts.
diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx
index a57bf15..d6f30c7 100644 index efaf738..0ad1ba7 100644
--- a/doc/sdccman.lyx --- a/doc/sdccman.lyx
+++ b/doc/sdccman.lyx +++ b/doc/sdccman.lyx
@@ -1150,54 +1150,9 @@ A possible exception are pic device libraries and header files which are @@ -1151,54 +1151,9 @@ A possible exception are pic device libraries and header files which are
to be used with authentic Microchip devices" which makes them incompatible to be used with authentic Microchip devices" which makes them incompatible
with the GPL, if Microchip has any copyright in them (which might depend with the GPL, if Microchip has any copyright in them (which might depend
on local copyright laws). on local copyright laws).
@ -1361,7 +1361,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
@@ -1260,23 +1215,6 @@ makebin: @@ -1261,23 +1216,6 @@ makebin:
zlib/libpng License zlib/libpng License
\end_layout \end_layout
@ -1385,7 +1385,7 @@ index a57bf15..d6f30c7 100644
\end_deeper \end_deeper
\begin_layout Itemize \begin_layout Itemize
libraries: libraries:
@@ -3062,18 +3000,6 @@ include_dir_suffix environment variable, see table below @@ -3194,18 +3132,6 @@ include_dir_suffix environment variable, see table below
\end_inset \end_inset
@ -1404,7 +1404,7 @@ index a57bf15..d6f30c7 100644
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@@ -3086,22 +3012,6 @@ lib_dir_suffix environment variable, see table below @@ -3218,22 +3144,6 @@ lib_dir_suffix environment variable, see table below
\end_inset \end_inset
@ -1427,7 +1427,7 @@ index a57bf15..d6f30c7 100644
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@@ -3600,7 +3510,7 @@ These defaults are: @@ -3876,7 +3786,7 @@ These defaults are:
\begin_layout Standard \begin_layout Standard
\align center \align center
\begin_inset Tabular \begin_inset Tabular
@ -1436,7 +1436,7 @@ index a57bf15..d6f30c7 100644
<features tabularvalignment="middle"> <features tabularvalignment="middle">
<column alignment="block" valignment="top" width="0in"> <column alignment="block" valignment="top" width="0in">
<column alignment="block" valignment="top" width="0in"> <column alignment="block" valignment="top" width="0in">
@@ -3884,68 +3794,6 @@ sdcc/include @@ -4160,68 +4070,6 @@ sdcc/include
include include
\end_layout \end_layout
@ -1505,7 +1505,7 @@ index a57bf15..d6f30c7 100644
\end_inset \end_inset
</cell> </cell>
</row> </row>
@@ -3956,7 +3804,7 @@ lib @@ -4232,7 +4080,7 @@ lib
\begin_layout Plain Layout \begin_layout Plain Layout
\emph on \emph on
@ -1514,7 +1514,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\end_inset \end_inset
@@ -3965,7 +3813,7 @@ NON_FREE_LIB_DIR_SUFFIX @@ -4241,7 +4089,7 @@ NON_FREE_LIB_DIR_SUFFIX
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -1523,7 +1523,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\end_inset \end_inset
@@ -3974,7 +3822,7 @@ sdcc/non-free/lib @@ -4250,7 +4098,7 @@ sdcc/non-free/lib
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -1532,7 +1532,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\end_inset \end_inset
@@ -4373,20 +4221,6 @@ include @@ -4649,20 +4497,6 @@ include
\end_inset \end_inset
@ -1553,7 +1553,7 @@ index a57bf15..d6f30c7 100644
\backslash \backslash
\begin_inset Newline newline \begin_inset Newline newline
@@ -4401,20 +4235,6 @@ lib @@ -4677,20 +4511,6 @@ lib
\end_inset \end_inset
@ -1574,7 +1574,7 @@ index a57bf15..d6f30c7 100644
\backslash \backslash
\begin_inset Newline newline \begin_inset Newline newline
@@ -4595,20 +4415,6 @@ include @@ -4871,20 +4691,6 @@ include
\end_inset \end_inset
@ -1595,7 +1595,7 @@ index a57bf15..d6f30c7 100644
\backslash \backslash
\begin_inset Newline newline \begin_inset Newline newline
@@ -4623,20 +4429,6 @@ lib @@ -4899,20 +4705,6 @@ lib
\end_inset \end_inset
@ -1616,7 +1616,7 @@ index a57bf15..d6f30c7 100644
\backslash \backslash
\begin_inset Newline newline \begin_inset Newline newline
@@ -4733,7 +4525,7 @@ Install paths @@ -5009,7 +4801,7 @@ Install paths
\begin_layout Standard \begin_layout Standard
\align center \align center
\begin_inset Tabular \begin_inset Tabular
@ -1625,7 +1625,7 @@ index a57bf15..d6f30c7 100644
<features tabularvalignment="middle"> <features tabularvalignment="middle">
<column alignment="left" valignment="top"> <column alignment="left" valignment="top">
<column alignment="left" valignment="top" width="4.5cm"> <column alignment="left" valignment="top" width="4.5cm">
@@ -4889,64 +4681,6 @@ include @@ -5165,64 +4957,6 @@ include
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none"> <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text \begin_inset Text
@ -1690,7 +1690,7 @@ index a57bf15..d6f30c7 100644
\begin_layout Plain Layout \begin_layout Plain Layout
Library file** Library file**
\end_layout \end_layout
@@ -4996,64 +4730,6 @@ sdcc @@ -5272,64 +5006,6 @@ sdcc
lib lib
\end_layout \end_layout
@ -1755,7 +1755,7 @@ index a57bf15..d6f30c7 100644
\end_inset \end_inset
</cell> </cell>
</row> </row>
@@ -5376,7 +5052,7 @@ $PATH @@ -5652,7 +5328,7 @@ $PATH
\begin_layout Standard \begin_layout Standard
\align center \align center
\begin_inset Tabular \begin_inset Tabular
@ -1764,7 +1764,7 @@ index a57bf15..d6f30c7 100644
<features tabularvalignment="middle"> <features tabularvalignment="middle">
<column alignment="block" valignment="top" width="0.5cm"> <column alignment="block" valignment="top" width="0.5cm">
<column alignment="block" valignment="top" width="4.8cm"> <column alignment="block" valignment="top" width="4.8cm">
@@ -5654,203 +5330,13 @@ include @@ -5930,203 +5606,13 @@ include
</cell> </cell>
</row> </row>
<row> <row>
@ -1969,7 +1969,7 @@ index a57bf15..d6f30c7 100644
\end_inset \end_inset
</cell> </cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none"> <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
@@ -5866,21 +5352,13 @@ $DATADIR/ @@ -6142,21 +5628,13 @@ $DATADIR/
\end_inset \end_inset
@ -1992,7 +1992,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@@ -5888,7 +5366,7 @@ $INCLUDE_DIR_SUFFIX @@ -6164,7 +5642,7 @@ $INCLUDE_DIR_SUFFIX
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@ -2001,7 +2001,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\end_inset \end_inset
@@ -5986,7 +5464,7 @@ model @@ -6262,7 +5740,7 @@ model
\begin_layout Standard \begin_layout Standard
\align center \align center
\begin_inset Tabular \begin_inset Tabular
@ -2010,7 +2010,7 @@ index a57bf15..d6f30c7 100644
<features tabularvalignment="middle"> <features tabularvalignment="middle">
<column alignment="block" valignment="top" width="0.5cm"> <column alignment="block" valignment="top" width="0.5cm">
<column alignment="block" valignment="top" width="4.5cm"> <column alignment="block" valignment="top" width="4.5cm">
@@ -6266,7 +5744,7 @@ lib @@ -6542,7 +6020,7 @@ lib
</cell> </cell>
</row> </row>
<row> <row>
@ -2019,7 +2019,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@@ -6275,7 +5753,7 @@ lib @@ -6551,7 +6029,7 @@ lib
\end_inset \end_inset
</cell> </cell>
@ -2028,7 +2028,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@@ -6306,7 +5784,7 @@ $LIB_DIR_SUFFIX/ @@ -6582,7 +6060,7 @@ $LIB_DIR_SUFFIX/
\end_inset \end_inset
</cell> </cell>
@ -2037,7 +2037,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@@ -6321,7 +5799,7 @@ lib/ @@ -6597,7 +6075,7 @@ lib/
\end_inset \end_inset
</cell> </cell>
@ -2046,7 +2046,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@@ -6344,308 +5822,6 @@ lib @@ -6620,308 +6098,6 @@ lib
<model> <model>
\end_layout \end_layout
@ -2355,7 +2355,7 @@ index a57bf15..d6f30c7 100644
\end_inset \end_inset
</cell> </cell>
</row> </row>
@@ -8923,14 +8099,6 @@ In <installdir>/share/sdcc/include @@ -9201,14 +8377,6 @@ In <installdir>/share/sdcc/include
the include files the include files
\end_layout \end_layout
@ -2370,7 +2370,7 @@ index a57bf15..d6f30c7 100644
\begin_layout Standard \begin_layout Standard
In <installdir>/share/sdcc/lib In <installdir>/share/sdcc/lib
\end_layout \end_layout
@@ -8939,14 +8107,6 @@ In <installdir>/share/sdcc/lib @@ -9217,14 +8385,6 @@ In <installdir>/share/sdcc/lib
the src and target subdirectories with the precompiled relocatables. the src and target subdirectories with the precompiled relocatables.
\end_layout \end_layout
@ -2385,7 +2385,7 @@ index a57bf15..d6f30c7 100644
\begin_layout Standard \begin_layout Standard
In <installdir>/share/sdcc/doc In <installdir>/share/sdcc/doc
\end_layout \end_layout
@@ -16096,66 +15256,6 @@ splint @@ -16452,66 +15612,6 @@ splint
myprogram.c myprogram.c
\end_layout \end_layout
@ -2452,7 +2452,7 @@ index a57bf15..d6f30c7 100644
\begin_layout Subsection \begin_layout Subsection
Linker Options Linker Options
\begin_inset Index idx \begin_inset Index idx
@@ -45880,66 +44980,9 @@ http://sourceforge.net/projects/gputils @@ -46758,66 +45858,9 @@ http://sourceforge.net/projects/gputils
Pic device specific header and c source files are automatically generated Pic device specific header and c source files are automatically generated
from MPLAB include files, which are published by Microchip with a special from MPLAB include files, which are published by Microchip with a special
requirement that they are only to be used with authentic Microchip devices. requirement that they are only to be used with authentic Microchip devices.
@ -2522,7 +2522,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@@ -45993,7 +45036,7 @@ Makefile @@ -46871,7 +45914,7 @@ Makefile
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -2531,7 +2531,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@@ -46087,7 +45130,7 @@ Makefile @@ -46965,7 +46008,7 @@ Makefile
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -2540,7 +2540,7 @@ index a57bf15..d6f30c7 100644
\begin_inset Newline newline \begin_inset Newline newline
\end_inset \end_inset
@@ -46369,47 +45412,6 @@ status collapsed @@ -47247,47 +46290,6 @@ status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
@ -2588,7 +2588,7 @@ index a57bf15..d6f30c7 100644
\backslash \backslash
/ /
\end_layout \end_layout
@@ -47282,47 +46284,6 @@ status collapsed @@ -48160,47 +47162,6 @@ status collapsed
-all-callee-saves -all-callee-saves
\end_layout \end_layout
@ -2636,7 +2636,7 @@ index a57bf15..d6f30c7 100644
\begin_layout Subsection \begin_layout Subsection
Port Specific Options Port Specific Options
\begin_inset Index idx \begin_inset Index idx
@@ -48599,188 +47560,6 @@ Linker @@ -49477,188 +48438,6 @@ Linker
\end_inset \end_inset
@ -2825,7 +2825,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@@ -49476,66 +48255,9 @@ name "subsec:PIC16_Header-Files-and-Libraries" @@ -50354,66 +49133,9 @@ name "subsec:PIC16_Header-Files-and-Libraries"
Pic device specific header and c source files are automatically generated Pic device specific header and c source files are automatically generated
from MPLAB include files, which are published by Microchip with a special from MPLAB include files, which are published by Microchip with a special
requirement that they are only to be used with authentic Microchip devices. requirement that they are only to be used with authentic Microchip devices.
@ -2895,7 +2895,7 @@ index a57bf15..d6f30c7 100644
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
@@ -49781,195 +48503,6 @@ vfprintf.c @@ -50659,195 +49381,6 @@ vfprintf.c
should also work, but is untested. should also work, but is untested.
\end_layout \end_layout
@ -3091,7 +3091,7 @@ index a57bf15..d6f30c7 100644
\begin_layout Subsection \begin_layout Subsection
Memory Models Memory Models
\end_layout \end_layout
@@ -74714,6 +73247,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC @@ -75717,6 +74250,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC
developers. developers.
\end_layout \end_layout
@ -3105,7 +3105,7 @@ index a57bf15..d6f30c7 100644
All product names mentioned herein may be trademarks All product names mentioned herein may be trademarks
\begin_inset Index idx \begin_inset Index idx
diff --git a/sdcc.spec b/sdcc.spec diff --git a/sdcc.spec b/sdcc.spec
index b784cbc..f180b51 100644 index ccb3217..292b642 100644
--- a/sdcc.spec --- a/sdcc.spec
+++ b/sdcc.spec +++ b/sdcc.spec
@@ -89,9 +89,7 @@ rm -rf $RPM_BUILD_ROOT @@ -89,9 +89,7 @@ rm -rf $RPM_BUILD_ROOT
@ -3118,7 +3118,7 @@ index b784cbc..f180b51 100644
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
@@ -102,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT @@ -104,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT
- version updated to 4.2.0 - version updated to 4.2.0
* Sat Feb 20 2021 - pkk AT spth.de * Sat Feb 20 2021 - pkk AT spth.de
- version updated to 4.0.0 - version updated to 4.0.0
@ -3141,7 +3141,7 @@ index 8cf401b..19f5113 100644
#define BIN2DATA_DIR "\\.." #define BIN2DATA_DIR "\\.."
#define PREFIX2BIN_DIR "\\bin" #define PREFIX2BIN_DIR "\\bin"
diff --git a/sdccconf_in.h b/sdccconf_in.h diff --git a/sdccconf_in.h b/sdccconf_in.h
index ca8d69f..980af8d 100644 index 9e6e3c7..8681ceb 100644
--- a/sdccconf_in.h --- a/sdccconf_in.h
+++ b/sdccconf_in.h +++ b/sdccconf_in.h
@@ -100,12 +100,6 @@ @@ -100,12 +100,6 @@
@ -3168,10 +3168,10 @@ index ca8d69f..980af8d 100644
#undef OPT_DISABLE_PACKIHX #undef OPT_DISABLE_PACKIHX
diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h
index 87981f4..e2701f2 100644 index 9f0e52a..02a5fb8 100644
--- a/src/SDCCglobl.h --- a/src/SDCCglobl.h
+++ b/src/SDCCglobl.h +++ b/src/SDCCglobl.h
@@ -287,7 +287,6 @@ struct options @@ -290,7 +290,6 @@ struct options
int stack_size; /* MCS51/DS390 - Tells the linker to allocate this space for stack */ int stack_size; /* MCS51/DS390 - Tells the linker to allocate this space for stack */
int acall_ajmp; /* MCS51 - Use acall/ajmp instead of lcall/ljmp */ int acall_ajmp; /* MCS51 - Use acall/ajmp instead of lcall/ljmp */
int no_ret_without_call; /* MCS51 - Do not use ret independent of acall/lcall */ int no_ret_without_call; /* MCS51 - Do not use ret independent of acall/lcall */
@ -3180,7 +3180,7 @@ index 87981f4..e2701f2 100644
int xstack_loc; /* initial location of external stack */ int xstack_loc; /* initial location of external stack */
int stack_loc; /* initial value of internal stack pointer */ int stack_loc; /* initial value of internal stack pointer */
diff --git a/src/SDCCmain.c b/src/SDCCmain.c diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index 6b50572..089c42f 100644 index e7e8bd6..3b25061 100644
--- a/src/SDCCmain.c --- a/src/SDCCmain.c
+++ b/src/SDCCmain.c +++ b/src/SDCCmain.c
@@ -143,7 +143,6 @@ char buffer[PATH_MAX * 2]; @@ -143,7 +143,6 @@ char buffer[PATH_MAX * 2];
@ -3191,15 +3191,15 @@ index 6b50572..089c42f 100644
#define OPTION_PEEP_RETURN "--peep-return" #define OPTION_PEEP_RETURN "--peep-return"
#define OPTION_NO_PEEP_RETURN "--no-peep-return" #define OPTION_NO_PEEP_RETURN "--no-peep-return"
#define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm" #define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm"
@@ -193,7 +192,6 @@ static const OPTION optionsTable[] = { @@ -195,7 +194,6 @@ static const OPTION optionsTable[] = {
{0, OPTION_STD, NULL, "Determine the language standard (c89, c99, c11, c2x, sdcc89 etc.)"}, {0, OPTION_STD, NULL, "Determine the language standard (c89, c99, c11, c23, sdcc89 etc.)"},
{0, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"}, {0, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"},
{0, OPTION_SIGNED_CHAR, &options.signed_char, "Make \"char\" signed by default"}, {0, OPTION_SIGNED_CHAR, &options.signed_char, "Make \"char\" signed by default"},
- {0, OPTION_USE_NON_FREE, &options.use_non_free, "Search / include non-free licensed libraries and header files"}, - {0, OPTION_USE_NON_FREE, &options.use_non_free, "Search / include non-free licensed libraries and header files"},
{0, NULL, NULL, "Code generation options"}, {0, NULL, NULL, "Code generation options"},
{'m', NULL, NULL, "Set the port to use e.g. -mz80."}, {'m', NULL, NULL, "Set the port to use e.g. -mz80."},
@@ -2207,10 +2205,6 @@ preProcess (char **envp) @@ -2231,10 +2229,6 @@ preProcess (char **envp)
else else
addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED")); addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED"));
@ -3210,7 +3210,7 @@ index 6b50572..089c42f 100644
/* set the macro for large model */ /* set the macro for large model */
switch (options.model) switch (options.model)
{ {
@@ -2454,12 +2448,6 @@ setIncludePath (void) @@ -2478,12 +2472,6 @@ setIncludePath (void)
* 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX * 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX
* 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX * 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX
* 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix) * 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix)
@ -3223,7 +3223,7 @@ index 6b50572..089c42f 100644
*/ */
if (!options.nostdinc) if (!options.nostdinc)
@@ -2475,17 +2463,6 @@ setIncludePath (void) @@ -2499,17 +2487,6 @@ setIncludePath (void)
includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL); includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL);
mergeSets (&includeDirsSet, tempSet); mergeSets (&includeDirsSet, tempSet);
@ -3241,7 +3241,7 @@ index 6b50572..089c42f 100644
if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL) if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL)
{ {
struct dbuf_s dbuf; struct dbuf_s dbuf;
@@ -2510,9 +2487,6 @@ setLibPath (void) @@ -2534,9 +2511,6 @@ setLibPath (void)
* 3. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/<model> * 3. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/<model>
* 4. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/<model> * 4. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/<model>
* 5. - DATADIR/LIB_DIR_SUFFIX/<model> (only on *nix) * 5. - DATADIR/LIB_DIR_SUFFIX/<model> (only on *nix)
@ -3251,7 +3251,7 @@ index 6b50572..089c42f 100644
*/ */
if (!options.nostdlib) if (!options.nostdlib)
@@ -2529,13 +2503,6 @@ setLibPath (void) @@ -2553,13 +2527,6 @@ setLibPath (void)
dbuf_makePath (&dbuf, LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname); dbuf_makePath (&dbuf, LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname);
libDirsSet = processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL); libDirsSet = processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL);
@ -3266,7 +3266,7 @@ index 6b50572..089c42f 100644
{ {
addSetHead (&libDirsSet, Safe_strdup (p)); addSetHead (&libDirsSet, Safe_strdup (p));
diff --git a/src/pic14/main.c b/src/pic14/main.c diff --git a/src/pic14/main.c b/src/pic14/main.c
index ab4bcdf..1747fd6 100644 index 304c79b..9cbb9e8 100644
--- a/src/pic14/main.c --- a/src/pic14/main.c
+++ b/src/pic14/main.c +++ b/src/pic14/main.c
@@ -42,7 +42,6 @@ static OPTION _pic14_poptions[] = @@ -42,7 +42,6 @@ static OPTION _pic14_poptions[] =
@ -3319,7 +3319,7 @@ index 41a1b79..9c642e3 100644
extern pic16_options_t pic16_options; extern pic16_options_t pic16_options;
diff --git a/src/pic16/main.c b/src/pic16/main.c diff --git a/src/pic16/main.c b/src/pic16/main.c
index 8809e2c..53c700e 100644 index 9557a10..d650e66 100644
--- a/src/pic16/main.c --- a/src/pic16/main.c
+++ b/src/pic16/main.c +++ b/src/pic16/main.c
@@ -660,7 +660,6 @@ OPTION pic16_optionsTable[]= { @@ -660,7 +660,6 @@ OPTION pic16_optionsTable[]= {
@ -3404,10 +3404,10 @@ index b0b0867..2d5cdd3 100644
OBJEXT = .o OBJEXT = .o
diff --git a/support/regression/ports/pic16/spec.mk b/support/regression/ports/pic16/spec.mk diff --git a/support/regression/ports/pic16/spec.mk b/support/regression/ports/pic16/spec.mk
index 541608a..6e7238f 100644 index 15b4028..3b79cfe 100644
--- a/support/regression/ports/pic16/spec.mk --- a/support/regression/ports/pic16/spec.mk
+++ b/support/regression/ports/pic16/spec.mk +++ b/support/regression/ports/pic16/spec.mk
@@ -12,13 +12,9 @@ endif @@ -16,13 +16,9 @@ EMU_INPUT = -c $(PORTS_DIR)/pic16/gpsim.cmd
ifndef SDCC_BIN_PATH ifndef SDCC_BIN_PATH
ifndef CROSSCOMPILING ifndef CROSSCOMPILING
@ -3423,7 +3423,7 @@ index 541608a..6e7238f 100644
endif endif
ifdef CROSSCOMPILING ifdef CROSSCOMPILING
@@ -27,7 +23,6 @@ endif @@ -31,7 +27,6 @@ endif
SDCCFLAGS += -mpic16 -pp18f452 --less-pedantic -Wl,-q SDCCFLAGS += -mpic16 -pp18f452 --less-pedantic -Wl,-q
SDCCFLAGS += --no-peep SDCCFLAGS += --no-peep
@ -3541,10 +3541,10 @@ index 6db417a..4b35225 100755
); );
diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index 8309df1..c0cc223 100644 index 37393d7..997b2fe 100644
--- a/support/scripts/sdcc.nsi --- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi +++ b/support/scripts/sdcc.nsi
@@ -491,11 +491,6 @@ ${Section} "SDCC include files" SEC05 @@ -487,11 +487,6 @@ ${Section} "SDCC include files" SEC05
SetOutPath "$INSTDIR\include" SetOutPath "$INSTDIR\include"
File "${DEV_ROOT}\include\*.h" File "${DEV_ROOT}\include\*.h"
@ -3556,7 +3556,7 @@ index 8309df1..c0cc223 100644
${SectionEnd} ${SectionEnd}
${Section} "SDCC DS390 library" SEC06 ${Section} "SDCC DS390 library" SEC06
@@ -593,18 +588,12 @@ ${Section} "SDCC PIC16 library" SEC21 @@ -589,18 +584,12 @@ ${Section} "SDCC PIC16 library" SEC21
SetOutPath "$INSTDIR\lib\pic16" SetOutPath "$INSTDIR\lib\pic16"
File "${DEV_ROOT}\lib\pic16\*.o" File "${DEV_ROOT}\lib\pic16\*.o"
File "${DEV_ROOT}\lib\pic16\*.lib" File "${DEV_ROOT}\lib\pic16\*.lib"
@ -3575,7 +3575,7 @@ index 8309df1..c0cc223 100644
${SectionEnd} ${SectionEnd}
${Section} "SDCC STM8 medium model library" SEC23 ${Section} "SDCC STM8 medium model library" SEC23
@@ -713,10 +702,6 @@ ${Section} "SDCC library sources" SEC25 @@ -709,10 +698,6 @@ ${Section} "SDCC library sources" SEC25
File "${DEV_ROOT}\lib\src\pic14\libsdcc\enhanced\*.inc" File "${DEV_ROOT}\lib\src\pic14\libsdcc\enhanced\*.inc"
# File "${DEV_ROOT}\lib\src\pic14\libsdcc\Makefile" # File "${DEV_ROOT}\lib\src\pic14\libsdcc\Makefile"
@ -3586,7 +3586,7 @@ index 8309df1..c0cc223 100644
SetOutPath "$INSTDIR\lib\src\pic14\libm" SetOutPath "$INSTDIR\lib\src\pic14\libm"
# File "${DEV_ROOT}\lib\src\pic14\libm\*.c" # File "${DEV_ROOT}\lib\src\pic14\libm\*.c"
@@ -768,10 +753,6 @@ ${Section} "SDCC library sources" SEC25 @@ -764,10 +749,6 @@ ${Section} "SDCC library sources" SEC25
File "${DEV_ROOT}\lib\src\pic16\libc\utils\*.S" File "${DEV_ROOT}\lib\src\pic16\libc\utils\*.S"
# File "${DEV_ROOT}\lib\src\pic16\libc\utils\Makefile" # File "${DEV_ROOT}\lib\src\pic16\libc\utils\Makefile"
@ -3597,7 +3597,7 @@ index 8309df1..c0cc223 100644
SetOutPath "$INSTDIR\lib\src\pic16\libio" SetOutPath "$INSTDIR\lib\src\pic16\libio"
File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore" File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore"
# File "${DEV_ROOT}\lib\src\pic16\libio\Makefile" # File "${DEV_ROOT}\lib\src\pic16\libio\Makefile"
@@ -1137,13 +1118,9 @@ ${Section} Uninstall SECUNINSTALL @@ -1169,13 +1150,9 @@ ${Section} Uninstall SECUNINSTALL
Delete "$INSTDIR\lib\pic14\*.lib" Delete "$INSTDIR\lib\pic14\*.lib"
@ -3611,7 +3611,7 @@ index 8309df1..c0cc223 100644
Delete "$INSTDIR\lib\hc08\*.lib" Delete "$INSTDIR\lib\hc08\*.lib"
Delete "$INSTDIR\lib\s08\*.lib" Delete "$INSTDIR\lib\s08\*.lib"
@@ -1219,9 +1196,7 @@ ${Section} Uninstall SECUNINSTALL @@ -1259,9 +1236,7 @@ ${Section} Uninstall SECUNINSTALL
Delete "$INSTDIR\include\pic14\*.h" Delete "$INSTDIR\include\pic14\*.h"
Delete "$INSTDIR\include\pic14\*.txt" Delete "$INSTDIR\include\pic14\*.txt"
Delete "$INSTDIR\include\pic14\*.inc" Delete "$INSTDIR\include\pic14\*.inc"
@ -3621,7 +3621,7 @@ index 8309df1..c0cc223 100644
Delete "$INSTDIR\include\pic16\*.txt" Delete "$INSTDIR\include\pic16\*.txt"
Delete "$INSTDIR\include\mcs51\*.h" Delete "$INSTDIR\include\mcs51\*.h"
Delete "$INSTDIR\include\hc08\*.h" Delete "$INSTDIR\include\hc08\*.h"
@@ -1298,9 +1273,7 @@ ${Section} Uninstall SECUNINSTALL @@ -1334,9 +1309,7 @@ ${Section} Uninstall SECUNINSTALL
Delete "$INSTDIR\uninstall.exe" Delete "$INSTDIR\uninstall.exe"
RMDir /r "$INSTDIR\lib\src\pic14" RMDir /r "$INSTDIR\lib\src\pic14"
@ -3631,9 +3631,9 @@ index 8309df1..c0cc223 100644
RMDir "$INSTDIR\lib\src\small" RMDir "$INSTDIR\lib\src\small"
RMDir "$INSTDIR\lib\src\medium" RMDir "$INSTDIR\lib\src\medium"
RMDir "$INSTDIR\lib\src\large" RMDir "$INSTDIR\lib\src\large"
@@ -1328,12 +1301,9 @@ ${Section} Uninstall SECUNINSTALL @@ -1367,12 +1340,9 @@ ${Section} Uninstall SECUNINSTALL
RMDir "$INSTDIR\lib\src\mos6502" RMDir "$INSTDIR\lib\src\mos65c02"
RMDir "$INSTDIR\lib\src\z80n" RMDir "$INSTDIR\lib\src\s08-stack-auto"
RMDir "$INSTDIR\lib\src" RMDir "$INSTDIR\lib\src"
- RMDir "$INSTDIR\non-free\lib\src" - RMDir "$INSTDIR\non-free\lib\src"
@ -3644,9 +3644,9 @@ index 8309df1..c0cc223 100644
RMDir "$INSTDIR\lib\z80" RMDir "$INSTDIR\lib\z80"
RMDir "$INSTDIR\lib\z180" RMDir "$INSTDIR\lib\z180"
RMDir "$INSTDIR\lib\r2k" RMDir "$INSTDIR\lib\r2k"
@@ -1361,15 +1331,12 @@ ${Section} Uninstall SECUNINSTALL @@ -1403,15 +1373,12 @@ ${Section} Uninstall SECUNINSTALL
RMDir "$INSTDIR\lib\mos6502" RMDir "$INSTDIR\lib\mos65c02"
RMDir "$INSTDIR\lib\z80n" RMDir "$INSTDIR\lib\s08-stack-auto"
RMDir "$INSTDIR\lib" RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR\non-free\lib" - RMDir "$INSTDIR\non-free\lib"
@ -3660,7 +3660,7 @@ index 8309df1..c0cc223 100644
RMDir "$INSTDIR\include\asm\mcs51" RMDir "$INSTDIR\include\asm\mcs51"
RMDir "$INSTDIR\include\asm\sm83" RMDir "$INSTDIR\include\asm\sm83"
RMDir "$INSTDIR\include\asm\ds390" RMDir "$INSTDIR\include\asm\ds390"
@@ -1378,17 +1345,12 @@ ${Section} Uninstall SECUNINSTALL @@ -1420,17 +1387,12 @@ ${Section} Uninstall SECUNINSTALL
RMDir "$INSTDIR\include\asm" RMDir "$INSTDIR\include\asm"
RMDir "$INSTDIR\include\z180" RMDir "$INSTDIR\include\z180"
RMDir "$INSTDIR\include\pic14" RMDir "$INSTDIR\include\pic14"

46
gnu/packages/patches/wlroots-hwdata-fallback.patch Normal file
View file

@ -0,0 +1,46 @@
backend/drm: add hardcoded hwdata path fallback
Add hardcoded fallback "/usr/share/hwdata/pnp.ids" as a
temporary solution to get things working in Guix until
hwdata ships with pkg-config file.
diff --git a/backend/drm/meson.build b/backend/drm/meson.build
index 6fcb2c15..ed95360a 100644
--- a/backend/drm/meson.build
+++ b/backend/drm/meson.build
@@ -1,8 +1,7 @@
hwdata = dependency(
'hwdata',
- required: 'drm' in backends,
+ required: false,
native: true,
- not_found_message: 'Required for the DRM backend.',
)
libdisplay_info = dependency(
@@ -19,15 +18,21 @@ libliftoff = dependency(
required: false,
)
-if not (hwdata.found() and libdisplay_info.found() and features['session'])
+if hwdata.found()
+ hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')
+ pnp_ids = files(hwdata_dir / 'pnp.ids')
+else
+ pnp_ids = files('/usr/share/hwdata/pnp.ids')
+endif
+
+if not (libdisplay_info.found() and features['session'])
subdir_done()
endif
-hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')
pnpids_c = custom_target(
'pnpids.c',
output: 'pnpids.c',
- input: files(hwdata_dir / 'pnp.ids'),
+ input: pnp_ids,
feed: true,
capture: true,
command: files('gen_pnpids.sh'),

5
gnu/packages/perl.scm
View file

@ -371,7 +371,7 @@ more.")
(string-append "-Dprefix=" out) (string-append "-Dprefix=" out)
(string-append "-Dman1dir=" out "/share/man/man1") (string-append "-Dman1dir=" out "/share/man/man1")
(string-append "-Dman3dir=" out "/share/man/man3") (string-append "-Dman3dir=" out "/share/man/man3")
"-de" "-Dcc=gcc" "-de" "-Dcc=gcc -std=c90"
"-Uinstallusrbinperl" "-Uinstallusrbinperl"
"-Dinstallstyle=lib/perl5" "-Dinstallstyle=lib/perl5"
"-Duseshrplib" "-Duseshrplib"
@ -404,8 +404,7 @@ more.")
(for-each (lambda (dso) (for-each (lambda (dso)
(chmod dso #o755)) (chmod dso #o755))
(find-files lib "\\.so$")))))))) (find-files lib "\\.so$"))))))))
(native-inputs (native-inputs '())))
(list gcc-5))))
(define-public perl-algorithm-c3 (define-public perl-algorithm-c3
(package (package

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

@ -102,6 +102,7 @@
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#: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 node) #:use-module (gnu packages node)
#:use-module (gnu packages openstack) #:use-module (gnu packages openstack)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
@ -1280,28 +1281,30 @@ other HTTP libraries.")
(define-public httpie (define-public httpie
(package (package
(name "httpie") (name "httpie")
(version "3.2.1") (version "3.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "httpie" version)) (uri (pypi-uri "httpie" version))
(sha256 (sha256
(base32 (base32
"1v736y2h7lcyrnxs9y5sf4xwzgll7pc2s6r3ny929mm8lcn07h69")))) "140w4mr0w7scpf4j5qm4h475vbwrgxzkdwyygwcmql1r1cgngywb"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; The tests attempt to access external web servers, so we cannot run them. ;; The tests attempt to access external web servers, so we cannot run them.
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs (propagated-inputs
(list python-colorama (list python-charset-normalizer
python-colorama
python-defusedxml
python-importlib-metadata
python-multidict
python-pip
python-pygments python-pygments
python-requests python-requests
python-requests-toolbelt python-requests-toolbelt
python-pysocks
python-charset-normalizer
python-defusedxml
python-rich python-rich
python-multidict)) python-setuptools))
(home-page "https://httpie.io") (home-page "https://httpie.io")
(synopsis "cURL-like tool for humans") (synopsis "cURL-like tool for humans")
(description (description
@ -7056,6 +7059,71 @@ interpreter written in pure Python.")
Encoding for HTTP.") Encoding for HTTP.")
(license license:expat))) (license license:expat)))
(define-public python-cloud-init
(package
(name "python-cloud-init")
(version "23.4.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/canonical/cloud-init")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0przjj2j1ws6b7sbgqxnffsarbbwl00lhq3bn7yiksp8kg8np1m1"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list
;; This requires usermod
"--ignore=tests/unittests/distros/test_create_users.py"
;; This writes to /var
"--ignore=tests/unittests/net/test_dhcp.py"
"-k"
(string-append
;; This test messes with PATH, so it cannot find mkdir
"not test_path_env_gets_set_from_main"
;; These all fail because /bin/sh doesn't exist. We cannot patch
;; this because the generated scripts must use /bin/sh as they are
;; supposed to be run on minimal systems.
" and not test_handler_creates_and_runs_bootcmd_script_with_instance_id"
" and not test_handler_runs_bootcmd_script_with_error"
" and not test_subp_combined_stderr_stdout"
" and not test_handle_part"))
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'patch-references
(lambda _
(substitute* "tests/unittests/cmd/test_clean.py"
(("#!/bin/sh") (string-append "#!" (which "sh")))))))))
(propagated-inputs
(list python-configobj
python-jinja2
python-jsonpatch
python-jsonschema
python-netifaces
python-oauthlib
python-pyserial
python-pyyaml
python-responses))
(native-inputs
(list procps ;for ps when running tests
python-pytest
python-pytest-cov
python-pytest-mock
python-passlib))
(home-page "https://github.com/canonical/cloud-init")
(synopsis "Cloud instance initialization tools")
(description
"Cloud-init is the multi-distribution method for cross-platform cloud
instance initialization. It is supported across all major public cloud
providers, provisioning systems for private cloud infrastructure, and
bare-metal installations.")
;; Either license can be chosen
(license (list license:asl2.0 license:gpl3))))
(define-public python-cloudscraper (define-public python-cloudscraper
(package (package
(name "python-cloudscraper") (name "python-cloudscraper")

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

@ -146,6 +146,7 @@
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name> ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name>
;;; Copyright © 2023, 2024 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2023, 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Timothee Mathieu <timothee.mathieu@inria.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -4598,6 +4599,53 @@ a certain expected condition.")
Cython for speed.") Cython for speed.")
(license license:expat))) (license license:expat)))
(define-public python-daft
(package
(name "python-daft")
(version "0.1.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "daft" version))
(sha256
(base32
"1r8jsfavd624q2q61f863lk6has6mv5csswh39saafd5khwf0xry"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list "-k"
(string-append
;; The following tests compare matplotlib output with
;; previously generated images. They fail due to minor
;; differences in where matplotlib places labels.
"not test_bca[png]"
" and not test_classic[png]"
" and not test_deconvolution[png]"
" and not test_exoplanets[png]"
" and not test_fixed[png]"
" and not test_gaia[png]"
" and not test_galex[png]"
" and not test_huey_p_newton[png]"
" and not test_logo[png]"
" and not test_no_circles[png]"
" and not test_no_gray[png]"
" and not test_recursive[png]"
" and not test_thick_lines[png]"
" and not test_weaklensing[png]"
" and not test_wordy[png]"))))
(propagated-inputs (list python-matplotlib python-numpy))
(native-inputs (list python-pytest))
(home-page "https://docs.daft-pgm.org/")
(synopsis "PGM rendering library")
(description "Daft is a Python package that uses matplotlib to
render pixel-perfect probabilistic graphical models for publication in
a journal or on the internet. With a short Python script and an
intuitive model-building syntax you can design directed (Bayesian
Networks, directed acyclic graphs) and undirected (Markov random fields)
models and save them in any formats that matplotlib supports (including
PDF, PNG, EPS and SVG).")
(license license:expat)))
(define-public python-portalocker (define-public python-portalocker
(package (package
(name "python-portalocker") (name "python-portalocker")
@ -5769,7 +5817,7 @@ e.g. filters, callbacks and errbacks can all be promises.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list #:tests? #f)) ; tests not distributed on pypi (list #:tests? #f)) ; tests not distributed on pypi
(home-page "https://github.com/benfogle/virtualenv") (home-page "https://github.com/benfogle/crossenv")
(synopsis "Cross-compiling virtualenv for Python") (synopsis "Cross-compiling virtualenv for Python")
(description "This package is a tool for cross-compiling extension (description "This package is a tool for cross-compiling extension
modules. It creates a special virtual environment such that @command{pip} or modules. It creates a special virtual environment such that @command{pip} or
@ -26385,7 +26433,7 @@ Public Suffix List's private domains as well.")
(define-public python-tldr (define-public python-tldr
(package (package
(name "python-tldr") (name "python-tldr")
(version "3.1.0") (version "3.2.0")
(source (source
(origin (origin
;; There's no test in PyPI. ;; There's no test in PyPI.
@ -26395,7 +26443,7 @@ Public Suffix List's private domains as well.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1hxmprqg8c4cvs19n7f80f3y7jj74i8sc2dmq2gdjmsdrb54bbzc")))) (base32 "0hkjsnz03p9pdfgk85wampha4pyr82bwmnj8hj6kigc784ddy2ag"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list #:phases (list #:phases
@ -27818,13 +27866,7 @@ a mypy plugin that smooths over some limitations in the basic type hints.
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1yk2ak991kbl30xg8ldpggack1lwkizd7s5cpr28ir34z8iyjnpi")))) (base32 "1yk2ak991kbl30xg8ldpggack1lwkizd7s5cpr28ir34z8iyjnpi"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests? (invoke "pytest" "-vv")))))))
(native-inputs (list python-pytest python-pytest-trio python-trustme)) (native-inputs (list python-pytest python-pytest-trio python-trustme))
(propagated-inputs (list python-async-generator python-trio python-wsproto)) (propagated-inputs (list python-async-generator python-trio python-wsproto))
(home-page "https://github.com/HyperionGray/trio-websocket") (home-page "https://github.com/HyperionGray/trio-websocket")
@ -27842,17 +27884,17 @@ the Trio framework}.")
(define-public python-humanize (define-public python-humanize
(package (package
(name "python-humanize") (name "python-humanize")
(version "0.5.1") (version "4.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "humanize" version)) (uri (pypi-uri "humanize" version))
(sha256 (sha256
(base32 (base32
"06dvhm3k8lf2rayn1gxbd46y0fy1db26m3h9vrq7rb1ib08mfgx4")))) "006vpl19bffy9fn0sssxbfakcvgrx7fhvy6l515fzln7vwpqf7zf"))))
(arguments (build-system pyproject-build-system)
'(#:tests? #f)) ; tests not in pypi archive (native-inputs
(build-system python-build-system) (list python-freezegun python-pytest))
(home-page "https://github.com/jmoiron/humanize") (home-page "https://github.com/jmoiron/humanize")
(synopsis "Print numerical information in a human-readable form") (synopsis "Print numerical information in a human-readable form")
(description "This package provides a Python module that displays numbers (description "This package provides a Python module that displays numbers
@ -27945,17 +27987,27 @@ format.")
(define-public python-crontab (define-public python-crontab
(package (package
(name "python-crontab") (name "python-crontab")
(version "2.5.1") (version "3.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 "0cccrqc10r8781ba81x8r2frs3pl2m4hkm599k5358ak0xr7xgjb")))) (base32 "0yd3vdhl7z8lxa30czsry65srha51ppdcwnhjgxx9pwx0djp9yvr"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; Comptability tests fail so they are disabled. (list
`(#:tests? #f)) #:phases
#~(modify-phases %standard-phases
(add-before 'check 'disable-failing-tests
(lambda _
(substitute* '("tests/test_compatibility.py"
"tests/test_frequency.py")
(("test_07_non_posix_shell")
"__off_test_07_non_posix_shell")
;; AssertionError: 48 != 24
(("test_20_frequency_at_year")
"__off_test_20_frequency_at_year")))))))
(inputs (inputs
(list python-dateutil)) (list python-dateutil))
(home-page "https://gitlab.com/doctormo/python-crontab/") (home-page "https://gitlab.com/doctormo/python-crontab/")
@ -27964,6 +28016,42 @@ format.")
access the system cron automatically and simply using a direct API.") access the system cron automatically and simply using a direct API.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public python-apscheduler
(package
(name "python-apscheduler")
(version "3.10.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "APScheduler" version))
(sha256
(base32
"0jpg9jyx95jafkq0hz6sx7r4l2z5gc599ivb9278kgnr4wdhgpz6"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-pytz
python-six
python-tzlocal))
(native-inputs (list python-mock
python-twisted
python-gevent
python-setuptools-scm
python-sqlalchemy
python-pyside-6
python-pytest
python-pytest-asyncio
python-pytest-cov
python-pytest-tornado5))
(home-page "https://github.com/agronholm/apscheduler")
(synopsis "Task scheduling library for Python")
(description "Advanced Python Scheduler (APScheduler) is a Python library
that lets you schedule your Python code to be executed later, either just once
or periodically.
You can add new jobs or remove old ones on the fly as you please. If you store
your jobs in a database, they will also survive scheduler restarts and maintain
their state. When the scheduler is restarted, it will then run all the jobs it
should have run while it was offline.")
(license license:expat)))
(define-public python-pylzma (define-public python-pylzma
(package (package
(name "python-pylzma") (name "python-pylzma")
@ -28020,22 +28108,17 @@ enumeration library in Python.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1p1a0ywlg5sq0ilcphmz9h4kayscz0q1lyfk57j7mwxyx4gl9cpi")))) (base32 "1p1a0ywlg5sq0ilcphmz9h4kayscz0q1lyfk57j7mwxyx4gl9cpi"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:test-flags
(replace 'check #~(list "-k" (string-append
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest" "-k"
(string-append
;; Networking isn't available for these tests. ;; Networking isn't available for these tests.
"not test_integration_with_listener_ipv6" "not test_integration_with_listener_ipv6"
" and not test_launch_and_close_v4_v6" " and not test_launch_and_close_v4_v6"
" and not test_launch_and_close_context_manager" " and not test_launch_and_close_context_manager"
" and not test_launch_and_close" " and not test_launch_and_close"
" and not test_close_multiple_times")))))))) " and not test_close_multiple_times"))))
(native-inputs (native-inputs
(list python-pytest)) (list python-pytest))
(propagated-inputs (propagated-inputs
@ -28207,14 +28290,10 @@ translating between quadkey and tile coordinates.")
(uri (pypi-uri "xyzservices" version)) (uri (pypi-uri "xyzservices" version))
(sha256 (sha256
(base32 "1paxv4i0dws85md7csv7pf80jl3xh792mx8rxnsrk61ks3ivbsyg")))) (base32 "1paxv4i0dws85md7csv7pf80jl3xh792mx8rxnsrk61ks3ivbsyg"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:test-flags #~(list "-m" "not request")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs (native-inputs
(list python-pytest python-mercantile python-requests)) (list python-pytest python-mercantile python-requests))
(home-page "https://github.com/geopandas/xyzservices") (home-page "https://github.com/geopandas/xyzservices")
@ -29202,17 +29281,9 @@ files. These files are used to translate strings in android apps.")
(uri (pypi-uri "watchdog" version)) (uri (pypi-uri "watchdog" version))
(sha256 (sha256
(base32 "1rx2nyl0cyj0v4ja795cl3gi26577c5wg48syr3byz3ndkgpavm3")))) (base32 "1rx2nyl0cyj0v4ja795cl3gi26577c5wg48syr3byz3ndkgpavm3"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases (list #:test-flags #~(list "-k" "not test_kill_auto_restart")))
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest" "-k"
;; This test failed.
"not test_kill_auto_restart")))))))
(propagated-inputs (propagated-inputs
(list python-pathtools python-pyyaml)) (list python-pathtools python-pyyaml))
(native-inputs (native-inputs
@ -29668,6 +29739,37 @@ usable as a configuration language. This Python package implements parsing and
dumping of JSON5 data structures.") dumping of JSON5 data structures.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python-farama-notifications
(package
(name "python-farama-notifications")
(version "0.0.4")
(source
;; The version on pypi does not include tests.
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Farama-Foundation/Farama-Notifications")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1k1x48xpvhankw7vbjp20ljwran247aphc2qncqrxivrkgzwjjji"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python3" "tests/ci-test.py")))))))
(native-inputs (list python-pytest))
(home-page "https://github.com/Farama-Foundation/Farama-Notifications")
(synopsis "Notifications for all Farama Foundation maintained libraries")
(description
"This package allows for providing notifications for all Farama
Foundation maintained libraries.")
(license license:expat)))
(define-public python-freetype-py (define-public python-freetype-py
(package (package
(name "python-freetype-py") (name "python-freetype-py")
@ -30752,7 +30854,7 @@ and have a maximum lifetime built-in.")
(define-public python-devtools (define-public python-devtools
(package (package
(name "python-devtools") (name "python-devtools")
(version "0.6") (version "0.12.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -30761,18 +30863,28 @@ and have a maximum lifetime built-in.")
(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 "15zczdcm90wl54c68f1qjb05nkd5bjsc9xjl3lk4frs7k7wkmrvp")))) (base32 "0snmx7f0s44rzzx8advzmgj5av9dlpz1kx05f7ysya8xrhv5nwfl"))))
(build-system python-build-system) (build-system pyproject-build-system)
(native-inputs
(list python-pytest python-pytest-mock))
(propagated-inputs
(list python-pygments))
(arguments (arguments
`(#:phases (modify-phases %standard-phases (list
(replace 'check #:test-flags
;; Disable some failing tests.
#~(list "-k" (string-append "not test_print_subprocess"
" and not test_simple")
"--ignore=tests/test_insert_assert.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _ (lambda _
(invoke "pytest") (substitute* "pyproject.toml"
#t))))) ;; Pygments 2.12.0 is available.
(("2.15.0") "2.12.0")
;; executing 0.8.2 is available.
(("1.1.1") "0.8.2")))))))
(native-inputs
(list python-hatchling python-pytest python-pytest-mock))
(propagated-inputs
(list python-asttokens python-executing python-pygments))
(home-page "https://github.com/samuelcolvin/python-devtools") (home-page "https://github.com/samuelcolvin/python-devtools")
(synopsis "Debug command and development tools") (synopsis "Debug command and development tools")
(description (description
@ -31102,7 +31214,7 @@ module patches @code{asyncio} to allow nested use of @code{asyncio.run} and
(define-public python-simpervisor (define-public python-simpervisor
(package (package
(name "python-simpervisor") (name "python-simpervisor")
(version "0.4") (version "1.0.0")
(source (source
(origin (origin
;; Tests not included in release. ;; Tests not included in release.
@ -31112,20 +31224,18 @@ module patches @code{asyncio} to allow nested use of @code{asyncio.run} and
(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 "1brsisx7saf4ic0dih1n5y7rbdbwn1ywv9pl32bch3061r46prvv")))) (base32 "0drvqxbr6fpydb4d7z5dhn97d578gf39sd8cawyl6ksf1f4y8yzg"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:tests? #f ; Test suite can't find aiohttp. (list
#:phases #:test-flags '(list "-n" (number->string (parallel-job-count)))))
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "--maxfail" "3" "--verbose"))
#t)))))
(native-inputs (native-inputs
(list python-aiohttp python-pytest python-pytest-asyncio)) (list python-aiohttp
python-hatchling
python-psutil
python-pytest
python-pytest-asyncio
python-pytest-xdist))
(home-page "https://github.com/yuvipanda/simpervisor") (home-page "https://github.com/yuvipanda/simpervisor")
(synopsis "Simple async process supervisor") (synopsis "Simple async process supervisor")
(description (description
@ -33303,7 +33413,7 @@ Python @code{set} interface.")
"--maxfail=1" "tests/")))))))) "--maxfail=1" "tests/"))))))))
(propagated-inputs (propagated-inputs
(list python-click python-configobj python-dotenv-0.13.0 (list python-click python-configobj python-dotenv-0.13.0
python-ruamel.yaml python-toml python-tomli)) python-ruamel.yaml-0.16 python-toml python-tomli))
(native-inputs (native-inputs
(list python-django python-flask python-pytest python-pytest-cov (list python-django python-flask python-pytest python-pytest-cov
python-pytest-mock)) python-pytest-mock))

57
gnu/packages/radio.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2017, 2018, 2019, 2020, 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2019, 2020 Christopher Howard <christopher@librehacker.com>
;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com> ;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
;;; Copyright © 2020, 2021, 2022, 2023 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020-2024 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net> ;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
;;; Copyright © 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
@ -99,12 +99,14 @@
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages tex) #:use-module (gnu packages tex)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -1890,6 +1892,59 @@ their position, altitude, speed, etc.")
(home-page "https://github.com/flightaware/dump1090") (home-page "https://github.com/flightaware/dump1090")
(license license:gpl2+))) (license license:gpl2+)))
(define-public libacars
(package
(name "libacars")
(version "2.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/szpajder/libacars")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08cadcqzhl3i7hpd8jwph33kx52vdwbrj1rlagwrkwb2mfw6szfs"))))
(build-system cmake-build-system)
(inputs (list jansson libxml2 zlib))
(arguments (list #:tests? #f)) ; No test suite
(synopsis "Decoder for ACARS messages")
(description "This package provides a library for decoding the contents of
ACARS messages used by planes.")
(home-page "https://github.com/szpajder/libacars")
(license (list license:bsd-2
license:expat))))
(define-public dumpvdl2
(package
(name "dumpvdl2")
(version "2.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/szpajder/dumpvdl2")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1zxv24fg2ciy7bfiqhx95v0h8b1bnbs3ax06n9ywsssbf4ndas4n"))))
(build-system cmake-build-system)
(native-inputs (list pkg-config))
(inputs
(list glib
libacars
protobuf-c
rtl-sdr
soapysdr
sqlite
zeromq))
(arguments (list #:tests? #f)) ; No test suite
(synopsis "VDL Mode 2 message decoder")
(description "This package provides a decoder for VDL Mode 2 messages used
by planes.")
(home-page "https://github.com/szpajder/dumpvdl2")
(license license:gpl3+)))
(define-public rtl-433 (define-public rtl-433
(package (package
(name "rtl-433") (name "rtl-433")

644
gnu/packages/ruby.scm
View file

@ -35,6 +35,7 @@
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -67,6 +68,7 @@
#:use-module (gnu packages rails) #:use-module (gnu packages rails)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
@ -79,6 +81,7 @@
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages node) #:use-module (gnu packages node)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -88,6 +91,7 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages web-browsers) #:use-module (gnu packages web-browsers)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (guix packages) #:use-module (guix packages)
@ -737,6 +741,30 @@ includes the @code{Comparable} module for handling dates.")
(home-page "https://github.com/ruby/date") (home-page "https://github.com/ruby/date")
(license license:bsd-2))) (license license:bsd-2)))
(define-public ruby-time
(package
(name "ruby-time")
(version "0.3.0")
(source (origin
(method git-fetch) ; for tests
(uri (git-reference
(url "https://github.com/ruby/time")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0jd6df2lxd60wcxyaf37j8v3nnfn952d5xhg6aap9zlcdmkk4g2n"))))
(build-system ruby-build-system)
(propagated-inputs (list ruby-date))
(native-inputs (list ruby-test-unit-ruby-core))
(synopsis
"Extends the Time class with methods for parsing and conversion")
(description
"When this gem is @code{require}d, it extends the Time class with with
additional methods for parsing and converting Times.")
(home-page "https://github.com/ruby/time")
(license license:bsd-2)))
(define-public ruby-diff-lcs (define-public ruby-diff-lcs
(package (package
(name "ruby-diff-lcs") (name "ruby-diff-lcs")
@ -1210,6 +1238,65 @@ the @env{RSPEC_DEBUG} environment variable to @samp{true} then invoke the
(home-page "https://github.com/ko1/rspec-debug") (home-page "https://github.com/ko1/rspec-debug")
(license license:expat))) (license license:expat)))
(define-public ruby-specinfra
(package
(name "ruby-specinfra")
(version "2.88.1")
(source (origin
(method url-fetch)
(uri (rubygems-uri "specinfra" version))
(sha256
(base32
"07lap3sknncffpq9jw1x1mn9c5xxd058wxs5vnyz1y0lawdjfnsf"))))
(build-system ruby-build-system)
(propagated-inputs (list ruby-net-scp ruby-net-ssh ruby-net-telnet
ruby-sfl))
(arguments
(list
#:test-target "spec"
#:phases
#~(modify-phases %standard-phases
(add-after 'extract-gemspec 'relax-dependencies
(lambda _
(substitute* "specinfra.gemspec"
(("%q<net-telnet>.freeze, \\[.*\\]")
"%q<net-telnet>.freeze, [\">= 0\"]")))))))
(synopsis "Common layer for serverspec and itamae")
(description "This Gem provides a common layer for serverspec and
itamae.")
(home-page "https://github.com/mizzy/specinfra")
(license license:expat)))
(define-public ruby-serverspec
(package
(name "ruby-serverspec")
(version "2.42.3")
(source (origin
(method url-fetch)
(uri (rubygems-uri "serverspec" version))
(sha256
(base32
"0kfaqrqynly8n3dy5qrbjvx4lx6mk9a5vynwb7xwqj8bixm0mab4"))))
(build-system ruby-build-system)
(propagated-inputs (list ruby-multi-json ruby-rspec ruby-rspec-its
ruby-specinfra))
(arguments
(list #:test-target "spec"))
(synopsis
"RSpec tests for servers configured by Puppet, Chef, Itamae, etc")
(description
"With Serverspec, you can write RSpec tests for checking your servers are
configured correctly.
Serverspec tests your servers’ actual state by executing command locally, via
SSH, via WinRM, via Docker API and so on. So you don’t need to install any
agent softwares on your servers and can use any configuration management
tools, Puppet, Ansible, CFEngine, Itamae and so on.
But the true aim of Serverspec is to help refactoring infrastructure code.")
(home-page "https://serverspec.org/")
(license license:expat)))
;; Bundler is yet another source of circular dependencies, so we must disable ;; Bundler is yet another source of circular dependencies, so we must disable
;; its test suite as well. ;; its test suite as well.
(define-public bundler (define-public bundler
@ -3402,6 +3489,39 @@ identical to that of Hash.")
(home-page "http://rbtree.rubyforge.org/") (home-page "http://rbtree.rubyforge.org/")
(license license:expat))) (license license:expat)))
(define-public ruby-rgl
(package
(name "ruby-rgl")
(version "0.6.6")
(source (origin
(method url-fetch)
(uri (rubygems-uri "rgl" version))
(sha256
(base32
"0dji1k9knrf8cxm5psd3pgd9i8f7cfq182jwjpi1pwxw15axf496"))))
(build-system ruby-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'remove-unnecessary-dependencies
(lambda _
(substitute* "Gemfile"
;; Caring about coverage is a not a packager's task but a
;; developer's
;;(("gem \"simplecov\"") "")
;; CodeClimate is an online service, and is unnecessary for
;; running the tests
(("gem \"codeclimate-test-reporter\", .*") "\n")))))))
(native-inputs (list ruby-test-unit ruby-simplecov ruby-yard graphviz-minimal))
(propagated-inputs (list ruby-pairing-heap ruby-rexml ruby-stream))
(synopsis "Framework for graph data structures and algorithms")
(description "RGL is a framework for graph data structures and algorithms.
The design of the library is much influenced by the Boost Graph Library (BGL)
which is written in C++.")
(home-page "https://github.com/monora/rgl")
(license license:bsd-2)))
(define-public ruby-hkdf (define-public ruby-hkdf
(package (package
(name "ruby-hkdf") (name "ruby-hkdf")
@ -4427,6 +4547,87 @@ help tests uncover more bugs.")
(home-page "https://github.com/jordansissel/ruby-flores") (home-page "https://github.com/jordansissel/ruby-flores")
(license license:asl2.0))) (license license:asl2.0)))
(define-public ruby-ipaddr
(package
(name "ruby-ipaddr")
(version "1.2.6")
(source (origin
(method git-fetch) ;for tests
(uri (git-reference
(url "https://github.com/ruby/ipaddr")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0h3z8i1fa8s4gx48322fflhpkzghd4bmd9109hglsgdkic7b0dyp"))))
(build-system ruby-build-system)
(native-inputs (list ruby-test-unit-ruby-core))
(synopsis "Manipulate IP addresses")
(description "This package provides a set of methods to manipulate an IP
address. Both IPv4 and IPv6 are supported.")
(home-page "https://github.com/ruby/ipaddr")
(license license:bsd-2)))
(define-public ruby-fake-ftp
(package
(name "ruby-fake-ftp")
(version "0.3.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "fake_ftp" version))
(sha256
(base32
"1zl9q9m4x7lz9890g0h1qqj7hcxnwzpjfnfbxadjblps7b5054q4"))))
(build-system ruby-build-system)
(native-inputs (list ruby-rspec ruby-rubocop ruby-simplecov))
(arguments
'(#:test-target "spec"))
(synopsis "Fake FTP server for use with ruby tests")
(description "This package allows you to test FTP implementations in ruby.
It is a minimal single-client FTP server that can be bound to any arbitrary
port on localhost.")
(home-page "https://rubygems.org/gems/fake_ftp")
(license license:expat)))
(define-public ruby-net-telnet
(package
(name "ruby-net-telnet")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "net-telnet" version))
(sha256
(base32
"16nkxc79nqm7fd6w1fba4kb98vpgwnyfnlwxarpdcgywz300fc15"))))
(build-system ruby-build-system)
(synopsis "Telnet client functionality")
(description "This package provides telnet client functionality.")
(home-page "https://github.com/ruby/net-telnet")
(license license:bsd-2)))
(define-public ruby-net-ftp
(package
(name "ruby-net-ftp")
(version "0.3.4")
(source (origin
(method git-fetch) ;for tests
(uri (git-reference
(url "https://github.com/ruby/net-ftp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11b1sw7c4c7xrhn5li5m0wylw42hp52jp6pqacyb43hkw1m5zr36"))))
(build-system ruby-build-system)
(propagated-inputs (list ruby-net-protocol ruby-time))
(synopsis "File Transfer Protocol client library")
(description "This class implements the File Transfer Protocol. If you
have used a command-line FTP program, and are familiar with the commands, you
will be able to use this class easily. Some extra features are included to
take advantage of Ruby's style and strengths.")
(home-page "https://github.com/ruby/net-ftp")
(license license:bsd-2)))
(define-public ruby-net-http-persistent (define-public ruby-net-http-persistent
(package (package
(name "ruby-net-http-persistent") (name "ruby-net-http-persistent")
@ -4802,6 +5003,25 @@ It allows writing tests, checking results and automated testing in Ruby.")
(list #:tests? #f))) (list #:tests? #f)))
(native-inputs '())))) (native-inputs '()))))
(define-public ruby-test-unit-ruby-core
(package
(name "ruby-test-unit-ruby-core")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "test-unit-ruby-core" version))
(sha256
(base32 "1i7fa4hlj6xiqvjaikagwrmiyc21jzyswvd4grjbfqysziwsxygc"))))
(build-system ruby-build-system)
(arguments
(list #:tests? #f)) ; contains no tests
(synopsis "Additional test assertions for Ruby standard libraries")
(description "This package provides additional test assertions for Ruby
standard libraries.")
(home-page "https://github.com/ruby/test-unit-ruby-core")
(license license:ruby)))
(define-public ruby-mapping (define-public ruby-mapping
(package (package
(name "ruby-mapping") (name "ruby-mapping")
@ -5500,6 +5720,27 @@ client protocol.")
(home-page "https://github.com/net-ssh/net-scp") (home-page "https://github.com/net-ssh/net-scp")
(license license:expat))) (license license:expat)))
(define-public ruby-net-sftp
(package
(name "ruby-net-sftp")
(version "4.0.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "net-sftp" version))
(sha256
(base32
"0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5"))))
(build-system ruby-build-system)
(propagated-inputs (list ruby-net-ssh))
(synopsis "Pure Ruby implementation of the SFTP client protocol")
(description
"@code{Net::SFTP} is a pure Ruby implementation of the SFTP
protocol (specifically, versions 1 through 6 of the SFTP protocol). Note that
this is the “Secure File Transfer Protocol”, typically run over an SSH
connection, and has nothing to do with the FTP protocol.")
(home-page "https://github.com/net-ssh/net-sftp")
(license license:expat)))
(define-public ruby-minima (define-public ruby-minima
(package (package
(name "ruby-minima") (name "ruby-minima")
@ -9391,6 +9632,186 @@ follows Ruby conventions and requires little knowledge of REST.")
(home-page "https://github.com/octokit/octokit.rb") (home-page "https://github.com/octokit/octokit.rb")
(license license:expat))) (license license:expat)))
(define-public ruby-hashicorp-checkpoint
(package
(name "ruby-hashicorp-checkpoint")
(version "0.1.5")
(source (origin
(method url-fetch)
(uri (rubygems-uri "hashicorp-checkpoint" version))
(sha256
(base32
"1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd"))))
(build-system ruby-build-system)
(arguments
(list #:tests? #f)) ;; no need to test, useless outside HashiCorp anyway
(synopsis "Internal HashiCorp service to check version information")
(description "This package is probably useless outside of internal
HashiCorp use. It is open source for disclosure and because HashiCorp's open
source projects must be able to link to it.")
(home-page "https://github.com/hashicorp/ruby-checkpoint")
(license license:mpl2.0)))
(define-public ruby-vagrant-cloud
(package
(name "ruby-vagrant-cloud")
(version "3.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hashicorp/vagrant_cloud")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0bnjd8b86lrgj5ar1l7pg5if95bv0sxa75mz7x2ikqyz6q8rmjb3"))))
(build-system ruby-build-system)
(arguments
`(#:test-target "spec"))
(native-inputs (list ruby-rspec ruby-webmock))
(propagated-inputs (list ruby-excon ruby-log4r ruby-rexml))
(synopsis "Vagrant Cloud API library")
(description "This library provides the functionality to create, modify,
and delete boxes, versions, and providers on HashiCorp's Vagrant Cloud.")
(home-page "https://github.com/hashicorp/vagrant_cloud")
(license license:asl2.0)))
(define-public ruby-libvirt
(package
(name "ruby-libvirt")
(version "0.8.2")
(source (origin
(method url-fetch)
(uri (rubygems-uri "ruby-libvirt" version))
(sha256
(base32
"0v6vj5vs9v01zr00bflqpfczhwcyc6jdf8k2dqn42lq6d87si77d"))))
(build-system ruby-build-system)
(arguments
(list
#:tests? #f)) ; tests require access to libvirt socket
(native-inputs (list pkg-config))
(inputs (list libvirt))
(synopsis "Ruby bindings for libvirt")
(description "This package provides Ruby language binding for libvirt's
native C API.")
(home-page "https://ruby.libvirt.org/")
(license license:lgpl2.1+)))
(define-public ruby-fog-core
(package
(name "ruby-fog-core")
(version "2.4.0")
(source (origin
(method git-fetch) ; for tests
(uri (git-reference
(url "https://github.com/fog/fog-core")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"184vpi81az7raz98652m7d98ikabdl9di37dgal0adr76q57j03c"))))
(build-system ruby-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'set-home
(lambda _
(setenv "HOME" "/tmp"))))))
(native-inputs (list ruby-minitest-stub-const))
(propagated-inputs (list ruby-builder ruby-excon ruby-formatador
ruby-mime-types))
(synopsis "Shared classes and tests for fog providers and services")
(description "@code{fog} is a Ruby cloud services library. This package
provides shared classes and tests for @code{fog} providers and services.")
(home-page "https://github.com/fog/fog-core")
(license license:expat)))
(define-public ruby-fog-json
(package
(name "ruby-fog-json")
(version "1.2.0")
(source (origin
(method git-fetch) ; for tests
(uri (git-reference
(url "https://github.com/fog/fog-json")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0f4hbmhy22b1gbkzd3pnj5xvljp6bl7inc2y4fxh29nrmcn4pgb0"))))
(build-system ruby-build-system)
(native-inputs (list ruby-minitest))
(propagated-inputs (list ruby-fog-core ruby-multi-json))
(synopsis "JSON parsing tools used by @code{fog} providers")
(description "This package containse the JSON parsing tools shared between
a number of providers in the @code{fog} gem. @code{fog} is a Ruby cloud
services library.")
(home-page "https://github.com/fog/fog-json")
(license license:expat)))
(define-public ruby-fog-xml
(package
(name "ruby-fog-xml")
(version "0.1.4")
(source (origin
(method git-fetch) ; for tests
(uri (git-reference
(url "https://github.com/fog/fog-xml")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0d0n201qzcjxis5wb26bi3s7yfhlmqkwsl6lb9w4szq3b8l1xbwn"))))
(build-system ruby-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
;; Run tests via bundler so rake picks up the minitest gem from
;; native-inputs, not the one installed otherwise. This is required
;; since turn@0.9.7 needs minitest@4 and can not be upgraded to
;; minitest@5.
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "bundle" "exec" "rake")))))))
(native-inputs (list ruby-minitest-4 ruby-turn ruby-pry ruby-coveralls))
(propagated-inputs (list ruby-fog-core ruby-nokogiri))
(synopsis "XML parsing tools used by @code{fog} providers")
(description "This package containse the XML parsing tools shared between
a number of providers in the @code{fog} gem. @code{fog} is a Ruby cloud
services library.")
(home-page "https://github.com/fog/fog-xml")
(license license:expat)))
(define-public ruby-fog-libvirt
(package
(name "ruby-fog-libvirt")
(version "0.12.0")
(source (origin
(method git-fetch) ; for tests
(uri (git-reference
(url "https://github.com/fog/fog-libvirt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0b1qafb0l24anmr8fviwhp9vj14g0fic0mkg9n1i11h68zhqkj2v"))))
(build-system ruby-build-system)
(native-inputs (list ruby-minitest-stub-const ruby-mocha ruby-net-ssh
ruby-netrc ruby-octokit ruby-pry ruby-rubocop
ruby-shindo ruby-simplecov ruby-yard ))
(propagated-inputs (list ruby-fog-core ruby-fog-json ruby-fog-xml
ruby-json ruby-libvirt))
(synopsis "Ruby libvirt provider, either standalone or as a module for
@code{fog}")
(description "This library can be used as a module for @code{fog} or as
standalone libvirt provider. @code{fog} is a Ruby cloud services library.")
(home-page "https://github.com/fog/fog-libvirt")
(license license:expat)))
(define-public ruby-pry-byebug (define-public ruby-pry-byebug
(package (package
(name "ruby-pry-byebug") (name "ruby-pry-byebug")
@ -11930,6 +12351,32 @@ dependency, @code{pg}.")
(home-page "https://github.com/QueueClassic/queue_classic") (home-page "https://github.com/QueueClassic/queue_classic")
(license license:expat))) (license license:expat)))
(define-public ruby-pairing-heap
(package
(name "ruby-pairing-heap")
(version "3.1.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "pairing_heap" version))
(sha256
(base32
"059kqpw53cancnp0bp7y1s74y1955riw33w3lqfbnms4b4mdh5zj"))))
(build-system ruby-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(substitute* "Rakefile"
(("require \"standard/rake\"") "")
((":\"standard:fix\",") "")))))))
(synopsis "Priority queue in pure Ruby")
(description "This package provides a performant priority queue in pure
ruby with support for changing priority using pairing heap data structure")
(home-page "https://github.com/mhib/pairing_heap")
(license license:expat)))
(define-public ruby-ae (define-public ruby-ae
(package (package
(name "ruby-ae") (name "ruby-ae")
@ -12802,24 +13249,49 @@ manifest file.")
(home-page "https://github.com/mvz/rake-manifest") (home-page "https://github.com/mvz/rake-manifest")
(license license:expat))) (license license:expat)))
(define-public ruby-sfl
(package
(name "ruby-sfl")
(version "2.3")
(source (origin
(method url-fetch)
(uri (rubygems-uri "sfl" version))
(sha256
(base32
"1qm4hvhq9pszi9zs1cl9qgwx1n4wxq0af0hq9sbf6qihqd8rwwwr"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f ;; some tests fail, gem is a dummy for ruby >= 1.9 anyway
#:test-target "spec"))
(synopsis "Spawn for Ruby 1.8")
(description "This pure ruby library provides @code{spawn()} which is
almost perfectly compatible with ruby 1.9's.")
(home-page "https://github.com/ujihisa/spawn-for-legacy")
(license license:bsd-2)))
(define-public ruby-childprocess (define-public ruby-childprocess
(package (package
(name "ruby-childprocess") (name "ruby-childprocess")
(version "3.0.0") (version "4.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "childprocess" version)) (uri (rubygems-uri "childprocess" version))
(sha256 (sha256
(base32 (base32
"1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5")))) "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:tests? #f)) `(#:tests? #f ;; one failing test, even with fixes below
#:test-target "spec"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(substitute* "spec/spec_helper.rb"
(("#!/bin/sh\\\\n") (string-append "#!" (which "sh") "\\n"))))))))
(native-inputs (native-inputs
(list bundler ruby-rspec)) (list ruby-coveralls ruby-rspec))
(propagated-inputs
(list ruby-ffi))
(synopsis "Control external programs running in the background, in Ruby") (synopsis "Control external programs running in the background, in Ruby")
(description "@code{childprocess} provides a gem to control external (description "@code{childprocess} provides a gem to control external
programs running in the background, in Ruby.") programs running in the background, in Ruby.")
@ -13794,6 +14266,54 @@ GFM dialect to HTML.")
parser for writing http servers, clients and proxies.") parser for writing http servers, clients and proxies.")
(license license:expat))) (license license:expat)))
(define-public ruby-excon
(package
(name "ruby-excon")
(version "0.109.0")
(source (origin
(method git-fetch) ;for tests
(uri (git-reference
(url "https://github.com/excon/excon")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"199niqbpzj70k3n6ybg4vbcw3qm76kwic4nl9747l1n0v49aaj24"))))
(build-system ruby-build-system)
(arguments
(list
#:tests? #f ;; some tests require DNS
#:phases
#~(modify-phases %standard-phases
(replace 'replace-git-ls-files
(lambda _
(substitute* "excon.gemspec"
(("`git ls-files -- data/. lib/.`")
"`find data lib -type f`"))))
(add-before 'check 'disable-server-spec-checks
(lambda _ ;; TODO: Remove this if ruby-unicorn is available.
;; Some of the tests in this file require ruby-unicorn, which is
;; not yet packaged for guix and would pull in a lot of other
;; dependencies.
(delete-file "spec/excon/test/server_spec.rb"))))))
(native-inputs
(list
ruby-activesupport
ruby-eventmachine
ruby-json
ruby-open4
ruby-puma
ruby-rspec
ruby-shindo
ruby-sinatra
ruby-webrick))
(synopsis "Usable, fast, simple Ruby HTTP 1.1")
(description "Excon was designed to be simple, fast and performant. It
works great as a general HTTP(s) client and is particularly well suited to
usage in API clients.")
(home-page "https://github.com/excon/excon")
(license license:expat)))
(define-public ruby-em-websocket (define-public ruby-em-websocket
(package (package
(name "ruby-em-websocket") (name "ruby-em-websocket")
@ -14741,6 +15261,49 @@ can be used to build formatters, linters, language servers, and more.")
(home-page "https://github.com/ruby-syntax-tree/syntax_tree") (home-page "https://github.com/ruby-syntax-tree/syntax_tree")
(license license:expat))) (license license:expat)))
(define-public ruby-stringio
(package
(name "ruby-stringio")
(version "3.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruby/stringio")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1jgi2w5y0z0x9mfapr2pdlag4wvn03fpf5kbai8bscyh8nn79yka"))))
(build-system ruby-build-system)
(native-inputs (list ruby-rake-compiler ruby-test-unit-ruby-core))
(synopsis "Pseudo `IO` class from and to `String`")
(description "Pseudo `IO` class from and to `String`.")
(home-page "https://github.com/ruby/stringio")
(license license:bsd-2)))
(define-public ruby-stream
(package
(name "ruby-stream")
(version "0.5.5")
(source (origin
(method url-fetch)
(uri (rubygems-uri "stream" version))
(sha256
(base32
"016m9v81vpj14d8g5ins91zc4pzl7vf5f1gxl7jhfsfy601k7cv2"))))
(build-system ruby-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'remove-version-constraints
(lambda _
(delete-file "Gemfile.lock"))))))
(native-inputs (list bundler ruby-stringio ruby-webrick ruby-yard))
(synopsis "Interface for external iterators")
(description "Module Stream defines an interface for external iterators.")
(home-page "https://github.com/monora/stream")
(license license:bsd-2)))
(define sorbet-version "0.5.10610.20230106174520-1fa668010") (define sorbet-version "0.5.10610.20230106174520-1fa668010")
(define sorbet-monorepo (define sorbet-monorepo
@ -17362,6 +17925,75 @@ has not yet been packaged for Guix.")
(license license:bsd-2) (license license:bsd-2)
(properties `((upstream-name . "anystyle-cli"))))) (properties `((upstream-name . "anystyle-cli")))))
(define-public ruby-google-protobuf
(package
(name "ruby-google-protobuf")
(version "3.25.3")
(source (origin
(method url-fetch)
(uri (rubygems-uri "google-protobuf" version))
(sha256
(base32
"1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f)) ;; has no tests
(native-inputs (list ruby-rake))
(synopsis "Protocol Buffers are Google's data interchange format")
(description "This library contains the Ruby extension that implements
Protocol Buffers functionality in Ruby.
The Ruby extension makes use of generated Ruby code that defines message and
enum types in a Ruby DSL. You may write definitions in this DSL directly, but
we recommend using protoc's Ruby generation support with @code{.proto} files.
The build process in this directory only installs the extension; you need to
install @code{protoc} (in package ruby-grpc-tools) as well to have Ruby code
generation functionality.")
(home-page "https://protobuf.dev")
(license license:bsd-3)))
(define-public ruby-googleapis-common-protos-types
(package
(name "ruby-googleapis-common-protos-types")
(version "1.13.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "googleapis-common-protos-types" version))
(sha256
(base32
"1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f)) ;; has no tests
(propagated-inputs (list ruby-google-protobuf))
(synopsis "Common protocol buffer types used by Google APIs")
(description "Common protocol buffer types used by Google APIs")
(home-page "https://github.com/googleapis/common-protos-ruby")
(license license:asl2.0)))
(define-public ruby-grpc
(package
(name "ruby-grpc")
(version "1.62.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "grpc" version))
(sha256
(base32
"03z8yq0z228g6xxxq6s2mmslpv6psrdmi30dpmhysr4px16d897n"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f)) ;; has no tests
;; TODO remove third-party sources (zlib, upb, utf8-range, re2, c-ares,
;; boringssl-with-bazel, address_sorting, abseil-cpp), see Makefile
(propagated-inputs (list ruby-google-protobuf
ruby-googleapis-common-protos-types))
(synopsis "GRPC system in Ruby")
(description "GRPC is a high performance, open-source universal RPC
framework. This package provides a ruby interface for it.")
(home-page "https://github.com/grpc/grpc/tree/master/src/ruby")
(license license:asl2.0)))
;;; ;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar ;;; of a merge conflict, place them above by existing packages with similar

4
gnu/packages/scanner.scm
View file

@ -106,7 +106,7 @@ WSD and eSCL.")
(define-public sane-backends-minimal (define-public sane-backends-minimal
(package (package
(name "sane-backends-minimal") (name "sane-backends-minimal")
(version "1.0.32") (version "1.2.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -114,7 +114,7 @@ WSD and eSCL.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13jlqdp7n7z2n78v6idl3ri5idk7ddk9j8wrmh73lba8l9y8xnsi")) (base32 "1dyipgfn8b8g38iqipy9y1p32p8xyf5sllh4dzhpx54schc4j3hm"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Generated HTML files and udev rules normally embed a ;; Generated HTML files and udev rules normally embed a

4
gnu/packages/search.scm
View file

@ -569,14 +569,14 @@ conflict with slocate compatibility.")
(define-public plocate (define-public plocate
(package (package
(name "plocate") (name "plocate")
(version "1.1.21") (version "1.1.22")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://plocate.sesse.net/download/" (uri (string-append "https://plocate.sesse.net/download/"
"plocate-" version ".tar.gz")) "plocate-" version ".tar.gz"))
(sha256 (sha256
(base32 "1b6khw8lf757wic6pc3w2r8wl9i5c4z98cdmp2qxmyspxhxvbrhd")))) (base32 "0j80zcklr7g73wsq54wbj8ggp8rj993hdzrywm2c0bmani0lfziv"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

45
gnu/packages/serialization.scm
View file

@ -17,6 +17,8 @@
;;; Copyright © 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -622,6 +624,29 @@ object, without whitespace.")
(home-page "https://github.com/dominictarr/JSON.sh") (home-page "https://github.com/dominictarr/JSON.sh")
(license (list license:expat license:asl2.0))))) ;dual-licensed (license (list license:expat license:asl2.0))))) ;dual-licensed
(define-public ckdl
(package
(name "ckdl")
(version "0.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tjol/ckdl")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1zdpil61lm141lcxmfrg7jvfjp2n98v5q2rfqzm4wiqcdprgmasv"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
"-DDOWNLOAD_TEST_DATA=OFF")))
(home-page "https://ckdl.readthedocs.io/en/latest/")
(synopsis "C library for parsing and emitting KDL")
(description "@samp{ckdl} is a C library for parsing and emitting KDL.
This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.")
(license license:expat)))
(define-public capnproto (define-public capnproto
(package (package
(name "capnproto") (name "capnproto")
@ -720,14 +745,14 @@ includes the following features:
(define-public python-ruamel.yaml (define-public python-ruamel.yaml
(package (package
(name "python-ruamel.yaml") (name "python-ruamel.yaml")
(version "0.16.13") (version "0.18.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ruamel.yaml" version)) (uri (pypi-uri "ruamel.yaml" version))
(sha256 (sha256
(base32 (base32
"0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v")))) "06rimidc9nb3i3r90n3a1zwf0qxw24zqykb3wpxwd1p72yifc9wb"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
(list python-pytest)) (list python-pytest))
@ -746,10 +771,22 @@ and has round-trip loaders and dumpers. It supports comments. Block
style and key ordering are kept, so you can diff the source.") style and key ordering are kept, so you can diff the source.")
(license license:expat))) (license license:expat)))
(define-public python-ruamel.yaml-0.16
(package
(inherit python-ruamel.yaml)
(version "0.16.13")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ruamel.yaml" version))
(sha256
(base32
"0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v"))))))
(define-public python-ruamel.yaml.clib (define-public python-ruamel.yaml.clib
(package (package
(name "python-ruamel.yaml.clib") (name "python-ruamel.yaml.clib")
(version "0.2.6") (version "0.2.8")
(source (source
(origin (origin
;; pypi release code has cythonized code without corresponding source. ;; pypi release code has cythonized code without corresponding source.
@ -760,7 +797,7 @@ style and key ordering are kept, so you can diff the source.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"05m3y7pjfbaarqbbgw1k6gs6cnnmxnwadjipxvw1aaaqk3s236cs")) "0qspqnk72xrjj17b00hjibbzjk3krsrakzf08wxwz7z908cv6278"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

10
gnu/packages/spice.scm
View file

@ -90,16 +90,16 @@ different (virtual) machine than the one to which the USB device is attached.")
(define-public virglrenderer (define-public virglrenderer
(package (package
(name "virglrenderer") (name "virglrenderer")
(version "0.10.4") (version "1.0.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.freedesktop.org/virgl/virglrenderer") (url "https://gitlab.freedesktop.org/virgl/virglrenderer.git")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"06pwavrknyhghlxyh7ckq4scjx47v9fhy08r6pn194whzvzivmqg")))) "0xw2qk8557gqpm1ssgk3ccshgljm6sh3wbbwpsp9cl0h4hdf2wq2"))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs (list libepoxy mesa)) (inputs (list libepoxy mesa))
(native-inputs (list pkg-config python)) (native-inputs (list pkg-config python))
@ -230,7 +230,7 @@ which allows users to view a desktop computing environment.")
(define-public spice (define-public spice
(package (package
(name "spice") (name "spice")
(version "0.15.1") (version "0.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -238,7 +238,7 @@ which allows users to view a desktop computing environment.")
"spice-server/spice-" version ".tar.bz2")) "spice-server/spice-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0ym3n60gq0kzzknk5ir8ib09cxsak9hkv7mmgsyic69jmdkszadd")))) "10av05vk60jzqjhqbsw5zdwqmx6gpr50045wqiqp9483gw8vd7kd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list openssl-1.1 pixman spice-protocol)) (list openssl-1.1 pixman spice-protocol))

145
gnu/packages/statistics.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Vicente Vera Parra <vicentemvp@gmail.com> ;;; Copyright © 2015 Vicente Vera Parra <vicentemvp@gmail.com>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
@ -18,6 +18,7 @@
;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com> ;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com>
;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -508,14 +509,14 @@ available, greatly increasing its breadth and scope.")
(define-public r-boot (define-public r-boot
(package (package
(name "r-boot") (name "r-boot")
(version "1.3-28.1") (version "1.3-29")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "boot" version)) (uri (cran-uri "boot" version))
(sha256 (sha256
(base32 (base32
"0lzz08fpn80qzm197s4806hr6skanr3r3rlx6bx7zk4cripygkfl")))) "1zgvy7n01qyxk52yhk43d7z7c36nr54z98vqwmjdlmhx4zyj0s7f"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/boot") (home-page "https://cran.r-project.org/web/packages/boot")
(synopsis "Bootstrap functions for R") (synopsis "Bootstrap functions for R")
@ -801,14 +802,14 @@ analysis.")
(define-public r-survival (define-public r-survival
(package (package
(name "r-survival") (name "r-survival")
(version "3.5-7") (version "3.5-8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "survival" version)) (uri (cran-uri "survival" version))
(sha256 (sha256
(base32 (base32
"0bi76kr5xkcs98r795lz9nvsj6zzxq0w6zn1938z0ffx5b9js3nm")))) "1d0qvw4200mjldna9n0acis0fk8xj28wwzqb8c3d4537l92zivbi"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-matrix)) (list r-matrix))
@ -997,19 +998,20 @@ OpenSSL should be used.")
(define-public r-estimability (define-public r-estimability
(package (package
(name "r-estimability") (name "r-estimability")
(version "1.4.1") (version "1.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "estimability" version)) (uri (cran-uri "estimability" version))
(sha256 (sha256
(base32 (base32
"090i1xwdp4fwj8jr8nk13w49516lfkk5mq1w7l0lff9g8lgaynn6")))) "0s6w8vnq0jc136d2mpf6pgg45rbxccrlsgdy89pgksnbaxhmyb5k"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://cran.r-project.org/web/packages/estimability") (home-page "https://cran.r-project.org/web/packages/estimability")
(synopsis "Tools for assessing estimability of linear predictions") (synopsis "Tools for assessing estimability of linear predictions")
(description "Provides tools for determining estimability of linear (description "This package provides tools for determining estimability of
functions of regression coefficients, and @code{epredict} methods that handle linear functions of regression coefficients, and @code{epredict} methods that
non-estimable cases correctly.") handle non-estimable cases correctly.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-labeling (define-public r-labeling
@ -1413,13 +1415,13 @@ evaluation (NSE) in R.")
(define-public r-dbi (define-public r-dbi
(package (package
(name "r-dbi") (name "r-dbi")
(version "1.2.1") (version "1.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "DBI" version)) (uri (cran-uri "DBI" version))
(sha256 (sha256
(base32 (base32
"0w7dpp1zg8w0mback1mk0a0vp51hf4njmrxz1i3j1xq5b1jfyiz4")))) "10d7sl9nk1gkkbinmvplyp2hg9zgxgs03llamrvbf4a5cnrs0mcd"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
@ -1518,6 +1520,36 @@ it supports LaTeX and HTML output. Source code of other languages is
supported via Andre Simon's highlight package.") supported via Andre Simon's highlight package.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public r-httpgd
(let ((commit "3f5f55822c4dce930155b91cedcfd4d483e3294e")
(revision "1"))
(package
(name "r-httpgd")
(version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nx10/httpgd")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "14i7mhbv1vcz2886w9lii9zhgr4zhhc844349syb989nhhzg552n"))))
(properties `((upstream-name . "httpgd")))
(build-system r-build-system)
(propagated-inputs (list r-asioheaders r-cpp11 r-unigd))
(native-inputs (list r-knitr))
(home-page "https://github.com/nx10/httpgd")
(synopsis "'HTTP' Server Graphics Device")
(description
"This package provides a graphics device for R that is accessible via
network protocols. This package was created to make it easier to embed live R
graphics in integrated development environments and other applications. The
included HTML/@code{JavaScript} client (plot viewer) aims to provide a better
overall user experience when dealing with R graphics. The device
asynchronously serves graphics via HTTP and @code{WebSockets}'.")
(license license:gpl2+))))
(define-public r-mime (define-public r-mime
(package (package
(name "r-mime") (name "r-mime")
@ -3548,14 +3580,14 @@ statements.")
(define-public r-segmented (define-public r-segmented
(package (package
(name "r-segmented") (name "r-segmented")
(version "2.0-2") (version "2.0-3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "segmented" version)) (uri (cran-uri "segmented" version))
(sha256 (sha256
(base32 (base32
"0ym5z2zngkqvs1cd7c3k16k9ipsli6xc6qp0nmr77va34d8v0n4q")))) "1f89v6zbxwl6yhx3qi7wrr3rndnxfwaf49mygw357f7cf3i8ma77"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-mass r-nlme)) (propagated-inputs (list r-mass r-nlme))
(home-page "https://cran.r-project.org/web/packages/segmented") (home-page "https://cran.r-project.org/web/packages/segmented")
@ -3793,13 +3825,13 @@ using the multicore functionality of the parallel package.")
"datatables-extensions/Buttons")))) "datatables-extensions/Buttons"))))
(package (package
(name "r-dt") (name "r-dt")
(version "0.31") (version "0.32")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "DT" version)) (uri (cran-uri "DT" version))
(sha256 (sha256
(base32 (base32
"11wwd76x1bk9aswi8w4bmvbf51j8hlmb5gsyqzfjdi6ihjkl4vwm")) "0nvj2bc441b9h13085fa7q281f86lgx4k0d8lr64xgdpbmbvkl21"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 match))) (ice-9 match)))
(snippet (snippet
@ -4363,13 +4395,13 @@ persistent (on the file system).")
(define-public r-r-rsp (define-public r-r-rsp
(package (package
(name "r-r-rsp") (name "r-r-rsp")
(version "0.45.0") (version "0.46.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "R.rsp" version)) (uri (cran-uri "R.rsp" version))
(sha256 (sha256
(base32 (base32
"192x8cvna1j0sx37xh3ha8bjjyx39pn5wnxzn5gs3z5j93a4d055")))) "1frkgjc2mzvjnay8g5nky1bvxv60wvsypmmdj6mbsfjnzq7ni7qs"))))
(properties `((upstream-name . "R.rsp"))) (properties `((upstream-name . "R.rsp")))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
@ -6776,8 +6808,8 @@ Java package that provides routines for various statistical distributions.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-ess (define-public emacs-ess
(let ((commit "3691ecc642eab5d016887e42699648e0eeeef566") (let ((commit "ab2faeca1ba6c456333312c58f58ef9e5ef4aa8b")
(version "18.10.2") (version "24.01.1")
(revision "1")) (revision "1"))
(package (package
(name "emacs-ess") (name "emacs-ess")
@ -6789,7 +6821,7 @@ Java package that provides routines for various statistical distributions.")
(url "https://github.com/emacs-ess/ESS") (url "https://github.com/emacs-ess/ESS")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "19p8djsbgvahpsx1w8i6h3qvpbdr4isjwm3wi82yk2648ri0qsq1")) (base32 "0jfdfqpa3x1zm65cllkzhqir057xd3hxi4z2ddii1i26zy56iikf"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -6807,9 +6839,6 @@ Java package that provides routines for various statistical distributions.")
;; Stop install-info from trying to update the info directory. ;; Stop install-info from trying to update the info directory.
(substitute* "doc/Makefile" (substitute* "doc/Makefile"
((".*/dir.*") "")) ((".*/dir.*") ""))
;; Fix r-help-mode test.
(substitute* "test/ess-test-r.el"
(("\\(equal ess-help-object \"plot.default\")") "t"))
;; Avoid generating ess-autoloads.el twice. ;; Avoid generating ess-autoloads.el twice.
(substitute* "Makefile" (substitute* "Makefile"
(("all: lisp doc etc autoloads") (("all: lisp doc etc autoloads")
@ -6839,9 +6868,6 @@ Java package that provides routines for various statistical distributions.")
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'check 'skip-failing-tests (add-before 'check 'skip-failing-tests
;; The command-without-trailing-newline-test and other
;; tests fail for unknown reasons (see:
;; https://github.com/emacs-ess/ESS/issues/1272).
(lambda _ (lambda _
(let-syntax (let-syntax
((disable-tests ((disable-tests
@ -6853,22 +6879,7 @@ Java package that provides routines for various statistical distributions.")
(((string-append "^\\(ert-deftest " test-name ".*") (((string-append "^\\(ert-deftest " test-name ".*")
all) all)
(string-append all "(skip-unless nil)\n")) (string-append all "(skip-unless nil)\n"))
...)))) ...)))))
(disable-etests ;different test syntax
(syntax-rules ()
((_ file ())
(syntax-error "test names list must not be empty"))
((_ file (test-name ...))
(emacs-batch-edit-file file
'(progn
(mapc (lambda (test)
(goto-char (point-min))
(search-forward
(format "etest-deftest %s " test))
(beginning-of-line)
(kill-sexp))
(list test-name ...))
(basic-save-buffer)))))))
(disable-tests (list "test/ess-test-inf.el" (disable-tests (list "test/ess-test-inf.el"
"test/ess-test-r.el") "test/ess-test-r.el")
("ess--derive-connection-path" ("ess--derive-connection-path"
@ -6878,15 +6889,10 @@ Java package that provides routines for various statistical distributions.")
"ess-r-load-ESSR-github-fetch-no" "ess-r-load-ESSR-github-fetch-no"
"ess-r-load-ESSR-github-fetch-yes" "ess-r-load-ESSR-github-fetch-yes"
"ess-set-working-directory-test" "ess-set-working-directory-test"
"ess-test-r-startup-directory")) "ess-test-r-startup-directory")))))
(disable-etests "test/ess-test-r-eval.el"
("ess-r-eval-ns-env-roxy-tracebug-test"
"ess-r-eval-sink-freeze-test"))
(disable-etests
"test/ess-test-inf.el"
("command-without-trailing-newline-test")))))
(replace 'check (replace 'check
(lambda _ (invoke "make" "test"))))))) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (invoke "make" "test"))))))))
(native-inputs (list perl r-roxygen2 texinfo)) (native-inputs (list perl r-roxygen2 texinfo))
(inputs (list emacs-minimal r-minimal)) (inputs (list emacs-minimal r-minimal))
(propagated-inputs (list emacs-julia-mode)) (propagated-inputs (list emacs-julia-mode))
@ -7775,3 +7781,40 @@ weighting schemes.")
statistical summary in arrays and enumerables.") statistical summary in arrays and enumerables.")
(home-page "https://github.com/mrkn/enumerable-statistics") (home-page "https://github.com/mrkn/enumerable-statistics")
(license license:expat))) (license license:expat)))
(define-public python-pgmpy
(package
(name "python-pgmpy")
(version "0.1.24")
(source
(origin
(method git-fetch) ;pypi package does not include test data
(uri (git-reference
(url "https://github.com/pgmpy/pgmpy")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0fvzh6v0yhgdryczamvzhfy2ymywkh0ssx4rl47xnfvi43hnij90"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-daft
python-joblib
python-networkx
python-numpy
python-opt-einsum
python-pandas
python-pyparsing
python-pytorch
python-scikit-learn
python-scipy
python-statsmodels
python-tqdm))
(native-inputs (list python-mock
python-pytest))
(home-page "https://github.com/pgmpy/pgmpy")
(synopsis "Probabilistic Graphical Models library")
(description "This package provides a library for Probabilistic
Graphical Models. It can be used for learning (Structure and Parameter),
inference (Probabilistic and Causal), and simulations in Bayesian
Networks.")
(license license:expat)))

202
gnu/packages/sugar.scm
View file

@ -19,10 +19,12 @@
(define-module (gnu packages sugar) (define-module (gnu packages sugar)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages abiword) #:use-module (gnu packages abiword)
#: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 freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -35,6 +37,7 @@
#: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 search) #:use-module (gnu packages search)
#:use-module (gnu packages speech)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages time) #:use-module (gnu packages time)
@ -480,6 +483,58 @@ a Tetris-like game.")
license:gpl2+ license:gpl2+
license:gpl3+)))) license:gpl3+))))
(define-public sugar-chat-activity
;; The last release was in 2019 and since then commits have been published
;; that include build fixes and translation updates.
(let ((commit "a6a14b99576619639fd82fd265c4af096bcf52dc")
(revision "1"))
(package
(name "sugar-chat-activity")
(version (git-version "86" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sugarlabs/chat")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1gp1ljazm119hqzwz0rkr6k588ngd68manndm808pj5vgbv7qsdq"))))
(build-system python-build-system)
(arguments
(list
#:test-target "check"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-launcher
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "activity/activity.info"
(("exec = sugar-activity3")
(string-append "exec = "
(search-input-file inputs "/bin/sugar-activity3"))))))
(replace 'install
(lambda _
(setenv "HOME" "/tmp")
(invoke "python" "setup.py" "install"
(string-append "--prefix=" #$output)))))))
;; All these libraries are accessed via gobject introspection.
(propagated-inputs
(list gdk-pixbuf
gobject-introspection
gtk+
gstreamer
gst-plugins-base
python-pygobject
sugar-toolkit-gtk3
telepathy-glib))
(native-inputs
(list gettext-minimal))
(home-page "https://help.sugarlabs.org/chat.html")
(synopsis "Sugar activity to chat")
(description "Chat is an activity used to exchange messages with friends
or classmates.")
(license license:gpl2+))))
(define-public sugar-help-activity (define-public sugar-help-activity
(let ((commit "492531e95a4c60af9b85c79c59c24c06c2cd4bb3") (let ((commit "492531e95a4c60af9b85c79c59c24c06c2cd4bb3")
(revision "1")) (revision "1"))
@ -674,6 +729,67 @@ looking for why an activity or Sugar is not working properly.")
or you can also play with a friend!") or you can also play with a friend!")
(license license:gpl3+))) (license license:gpl3+)))
(define-public sugar-physics-activity
(let ((commit "cfd17b82b783f1ce4952ccdef6a8ddbe3d8f3e46")
(revision "1"))
(package
(name "sugar-physics-activity")
(version (git-version "35" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sugarlabs/physics")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0yzq4cbgcngf1ayi4bsn04l3mz6pnayd6db9bv0v9xfrpjmffvyk"))))
(build-system python-build-system)
(arguments
(list
#:test-target "check"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-launcher
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "activity/activity.info"
(("exec = sugar-activity3")
(string-append "exec = "
(search-input-file inputs "/bin/sugar-activity3"))))))
(add-after 'unpack 'inject-load-path
(lambda _
(substitute* "activity.py"
(("^import os")
(string-append "\
import sys, os
for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"):
try:
sys.path.index(directory)
except ValueError:
sys.path.insert(1, directory)
")))))
(replace 'install
(lambda _
(setenv "HOME" "/tmp")
(invoke "python" "setup.py" "install"
(string-append "--prefix=" #$output)))))))
;; All these libraries are accessed via gobject introspection.
(propagated-inputs
(list gtk+
gdk-pixbuf))
(inputs
(list python-pybox2d
python-pygame
sugar-toolkit-gtk3
gettext-minimal))
(home-page "https://github.com/sugarlabs/physics")
(synopsis "Physical world simulator and playground")
(description "Physics is a physical world simulator and playground---you
can add squares, circles, triangles, or draw your own shapes, and see them
come to life with forces (think gravity, Newton!), friction (scrrrrape), and
inertia (ahh, slow down!).")
(license license:gpl3+))))
(define-public sugar-read-activity (define-public sugar-read-activity
(let ((commit "25f69e41a4fa69d93c73c0c9367b4777a014b1cd") (let ((commit "25f69e41a4fa69d93c73c0c9367b4777a014b1cd")
(revision "1")) (revision "1"))
@ -768,6 +884,92 @@ controls.")
a Command-Line Interface (CLI) to the system.") a Command-Line Interface (CLI) to the system.")
(license (list license:gpl2+ license:gpl3+))))) (license (list license:gpl2+ license:gpl3+)))))
(define-public sugar-turtleart-activity
(let ((commit "a4340adea18efbdb987eca6477fa71d5c924811f")
(revision "1"))
(package
(name "sugar-turtleart-activity")
(version (git-version "202" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sugarlabs/turtleart-activity")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"11agqyahjhxb7bakzix63lazcbin0jfiypqx0sm2i85bsl30fp7y"))))
(build-system python-build-system)
(arguments
(list
#:test-target "check"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-launcher
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "activity/activity.info"
(("exec = sugar-activity3")
(string-append "exec = "
(search-input-file inputs "/bin/sugar-activity3"))))))
(add-after 'unpack 'patch-locations
(lambda _
(substitute* "setup.py"
(("'/usr/share/applications")
"'share/applications"))))
(add-after 'unpack 'patch-tool-references
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("TurtleArtActivity.py"
"TurtleArt/turtleblocks.py")
(("glib-compile-schemas")
(search-input-file inputs "/bin/glib-compile-schemas")))
(substitute* '("plugins/turtle_blocks_extras/turtle_blocks_extras.py"
"pysamples/speak.py"
"TurtleArt/tacollaboration.py")
(("'espeak")
(string-append "'" (search-input-file inputs "/bin/espeak"))))
(substitute* '("pysamples/csound.py"
"plugins/turtle_blocks_extras/turtle_blocks_extras.py")
(("'csound '")
(string-append "'" (search-input-file inputs "/bin/csound")
" '")))
(substitute* '("plugins/turtle_blocks_extras/turtle_blocks_extras.py"
"pysamples/speak.py"
"TurtleArt/tacollaboration.py")
(("\\| aplay")
(string-append "| "
(search-input-file inputs "/bin/aplay"))))
(substitute* "pysamples/sinewave.py"
(("'speaker-test")
(string-append "'"
(search-input-file inputs "/bin/speaker-test"))))))
(replace 'install
(lambda _
(setenv "HOME" "/tmp")
(invoke "python" "setup.py" "install"
(string-append "--prefix=" #$output)))))))
;; All these libraries are accessed via gobject introspection.
(propagated-inputs
(list gstreamer
gtk+
telepathy-glib
webkitgtk-for-gtk3))
(inputs
(list alsa-utils
csound
espeak
(list glib "bin")
gettext-minimal
sugar-toolkit-gtk3))
(home-page "https://help.sugarlabs.org/en/turtleart.html")
(synopsis "Block-based Logo programming environment")
(description "Turtle Art, also known as Turtle Blocks, is an activity
with a Logo-inspired graphical “turtle” that draws colorful art based on
snap-together visual programming elements. Its “low floor” provides an easy
entry point for beginners. It also has “high ceiling” programming, graphics,
mathematics, and Computer Science features which will challenge the more
adventurous student.")
(license license:expat))))
(define-public sugar-typing-turtle-activity (define-public sugar-typing-turtle-activity
(package (package
(name "sugar-typing-turtle-activity") (name "sugar-typing-turtle-activity")

58
gnu/packages/terminals.scm
View file

@ -38,6 +38,7 @@
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Suhail <suhail@bayesians.ca>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -91,6 +92,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libcanberra) #:use-module (gnu packages libcanberra)
@ -156,7 +158,7 @@ less to gain, as only the helper process is running with privileges (e.g.,
(define-public tilda (define-public tilda
(package (package
(name "tilda") (name "tilda")
(version "1.5.4") (version "2.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -165,7 +167,7 @@ less to gain, as only the helper process is running with privileges (e.g.,
(commit (string-append "tilda-" version)))) (commit (string-append "tilda-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0q2i9ny8sh7zjzgvkx8vcvk593wcvchjc4xq4nrlqdd377r7cg5q")))) (base32 "1ad5jlyg9izm2rid115dv70af6j5i96p91i685c0h9vlrn5sviqs"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -173,7 +175,7 @@ less to gain, as only the helper process is running with privileges (e.g.,
(lambda _ (lambda _
(for-each make-file-writable (for-each make-file-writable
(find-files "po" ".")) #t))))) (find-files "po" ".")) #t)))))
(native-inputs (list autoconf automake gettext-minimal pkg-config)) (native-inputs (list autoconf-2.71 automake gettext-minimal pkg-config))
(inputs (list libconfuse vte)) (inputs (list libconfuse vte))
(synopsis "GTK+-based drop-down terminal") (synopsis "GTK+-based drop-down terminal")
(description (description
@ -185,29 +187,6 @@ configurable through a graphical wizard.")
(home-page "https://github.com/lanoxx/tilda") (home-page "https://github.com/lanoxx/tilda")
(license license:gpl2+))) (license license:gpl2+)))
(define-public tilda-dbus
(package
(inherit tilda)
(name "tilda")
(version "1.6-alpha")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lanoxx/tilda")
(commit "51a980a55ad6d750daa21d43a66d44577dad277b")))
(file-name (git-file-name name version))
(sha256
(base32 "1pdarmlxkap9v689s88b89l5hi4vspsrrysh7pbm9rhdjmzk5m2c"))))
(synopsis "GTK+-based drop-down terminal with experimental D-Bus support")
(description
"Tilda is a terminal emulator similar to normal terminals like
gnome-terminal (GNOME) or Konsole (KDE), with the difference that it drops down
from the edge of a screen when a certain configurable hotkey is pressed. This
is similar to the built-in consoles in some applications. Tilda is highly
configurable through a graphical wizard. This version enables D-Bus support
which is necessary for using Tilda on Wayland.")))
(define-public termite (define-public termite
(package (package
(name "termite") (name "termite")
@ -1727,3 +1706,30 @@ ephemeral serial ports. It features automatic port detection, port enumeration,
support for non-standard baud rates, the ability to wait for ports to appear, support for non-standard baud rates, the ability to wait for ports to appear,
and the ability to read and write via stdin and stdout.") and the ability to read and write via stdin and stdout.")
(license license:expat))) (license license:expat)))
(define-public roxterm
(package
(name "roxterm")
(version "3.15.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/realh/roxterm.git")
(commit version)))
(sha256
(base32
"19y4lxwj18pr231597rnyyk6f5hwvsajjv7w21wb5c62jjjyfrws"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; No tests
(native-inputs
(list docbook-xsl docbook-xml (list glib "bin") libxml2 libxslt
pkg-config))
(inputs
(list dbus dbus-glib gtk+ pcre vte))
(synopsis "ROXTerm terminal emulator")
(description "This package provides a terminal emulator with hyperlink
support. It's based on VTE and aimed at power users.")
(home-page "https://realh.github.io/roxterm/")
;; src/gresources.c is under LGPL 2.1+
(license (list license:gpl2+ license:lgpl2.1+))))

27
gnu/packages/tor-browsers.scm
View file

@ -53,6 +53,7 @@
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages hunspell) #:use-module (gnu packages hunspell)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages libcanberra) #:use-module (gnu packages libcanberra)
@ -149,16 +150,16 @@
;; We copy the official build id, which can be found there: ;; We copy the official build id, which can be found there:
;; https://aus1.torproject.org/torbrowser/update_3/release/. ;; https://aus1.torproject.org/torbrowser/update_3/release/.
(define %torbrowser-build-date "20240115174022") (define %torbrowser-build-date "20240213172118")
;; To find the last version, look at https://www.torproject.org/download/. ;; To find the last version, look at https://www.torproject.org/download/.
(define %torbrowser-version "13.0.9") (define %torbrowser-version "13.0.10")
;; To find the last Firefox version, browse ;; To find the last Firefox version, browse
;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version>
;; There should be only one archive that starts with ;; There should be only one archive that starts with
;; "src-firefox-tor-browser-". ;; "src-firefox-tor-browser-".
(define %torbrowser-firefox-version "115.7.0esr-13.0-1-build1") (define %torbrowser-firefox-version "115.8.0esr-13.0-1-build1")
;; See tor-browser-build/projects/translation/config. ;; See tor-browser-build/projects/translation/config.
;; If Tor Browser and Mullvad Browser updates are not synchronized, maybe this ;; If Tor Browser and Mullvad Browser updates are not synchronized, maybe this
@ -180,11 +181,11 @@
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.torproject.org/tpo/translation.git") (url "https://gitlab.torproject.org/tpo/translation.git")
(commit "767ab5111f065b82151275775af5ecf7a529ef48"))) (commit "a50fa943d7428ebe6e4e6b09f175e098a97eec63")))
(file-name "translation-tor-browser") (file-name "translation-tor-browser")
(sha256 (sha256
(base32 (base32
"034s0ivbama497xq0904q8p6d7n2f2aa2vn2jcs9g4bvmhgwicw4")))) "0kvjdkgfdl0sh413wrli9pn7ygv9idrq5yvsi5q8c4bmnnxfig7c"))))
(define torbrowser-assets (define torbrowser-assets
;; This is a prebuilt Torbrowser from which we take the assets we need. ;; This is a prebuilt Torbrowser from which we take the assets we need.
@ -200,7 +201,7 @@
version "/tor-browser-linux-x86_64-" version ".tar.xz")) version "/tor-browser-linux-x86_64-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0j143r24xzmq38nd5z1xqsa9zp35lws9rvlj6hb9xn3dnl67gh59")))) "1v4jbgzw640lnsyxk275w62xdyqbw0p0fwvkzfawpg4d3pqp7fpw"))))
(arguments (arguments
(list (list
#:install-plan #:install-plan
@ -236,7 +237,7 @@ Browser.")
".tar.xz")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0h05js9j1drzw5q98nlphsmvlp1k2a71z5jd06xk6pz29w6322pw")))) "0lbarj4i21f6jkpk2ji1cmgv625yhqyjksln97zgbbki43bx09v6"))))
(build-system mozilla-build-system) (build-system mozilla-build-system)
(inputs (inputs
(list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
@ -271,7 +272,7 @@ Browser.")
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
ffmpeg-5 ffmpeg-5
libvpx libvpx
(force (@@ (gnu packages gnuzilla) icu4c-73-promise)) icu4c-73
pixman pixman
pulseaudio pulseaudio
mesa mesa
@ -876,17 +877,17 @@ attacks on the privacy of Tor users.")
;; We copy the official build id, which can be found there: ;; We copy the official build id, which can be found there:
;; https://cdn.mullvad.net/browser/update_responses/update_1/release. ;; https://cdn.mullvad.net/browser/update_responses/update_1/release.
(define %mullvadbrowser-build-date "20240115174108") (define %mullvadbrowser-build-date "20240213150358")
;; To find the last version, look at ;; To find the last version, look at
;; https://mullvad.net/en/download/browser/linux. ;; https://mullvad.net/en/download/browser/linux.
(define %mullvadbrowser-version "13.0.9") (define %mullvadbrowser-version "13.0.10")
;; To find the last Firefox version, browse ;; To find the last Firefox version, browse
;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version>
;; There should be only one archive that starts with ;; There should be only one archive that starts with
;; "src-firefox-mullvad-browser-". ;; "src-firefox-mullvad-browser-".
(define %mullvadbrowser-firefox-version "115.7.0esr-13.0-1-build1") (define %mullvadbrowser-firefox-version "115.8.0esr-13.0-1-build1")
;; See tor-browser-build/projects/translation/config. ;; See tor-browser-build/projects/translation/config.
(define translation-mullvad-browser (define translation-mullvad-browser
@ -914,7 +915,7 @@ attacks on the privacy of Tor users.")
version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) version "/mullvad-browser-linux-x86_64-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1f930j3c1xq88cqlqmnj0m00k0hd63cmgnxd788sp9hz56al22sc")))) "1dkkk90lhvmhmi89rfjkx2m0ynyj0zajhxhxfmkzjj6bflmzgipv"))))
(arguments (arguments
(list (list
#:install-plan #:install-plan
@ -955,7 +956,7 @@ Mullvad Browser.")
%mullvadbrowser-firefox-version ".tar.xz")) %mullvadbrowser-firefox-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"16chkc07pqr4ypmmgy4z2grvlpvbyr161gpzy72w35dgzzff46f9")))) "09wawhb3ci0i7038xs0cqvlm37i90a5iwn9m2p5gaal5cz55dz3n"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments mullvadbrowser-base) (substitute-keyword-arguments (package-arguments mullvadbrowser-base)
((#:phases phases) ((#:phases phases)

72
gnu/packages/toys.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Sarthak Shah <shahsarthakw@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -399,6 +400,77 @@ the desktop background. Additional customizable effects include wind, stars
and various scenery elements.") and various scenery elements.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public xpenguins
(package
(name "xpenguins")
(version "3.2.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://ratrabbit.nl/downloads/xpenguins/xpenguins-"
version ".tar.gz"))
(sha256
(base32 "03qwc7gf21d2ixkrxxwwgayj6f5fv1kg4b7ggx90j5269il63adm"))))
(build-system gnu-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'fix-install-path
(lambda _
;; Install program to bin/ instead of games/.
(substitute* "src/Makefile.in"
(("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
(string-append prefix "bin"))))))))
(inputs
(list gtk+ libx11 libxml2 libxpm libxt))
(native-inputs
(list pkg-config))
(home-page
"https://www.ratrabbit.nl/ratrabbit/software/xpenguins/index.html")
(synopsis "Let penguins take over your desktop!")
(description "Xpenguins is a vintage application showing penguins running,
flying and falling on the desktop, using windows as run paths.")
(license license:gpl2+)))
(define-public xfishtank
(package
(name "xfishtank")
(version "3.2.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://www.ratrabbit.nl/downloads/xfishtank/xfishtank-"
version "~pre1.tar.gz"))
;; Version has ~pre1 in it. Guix store does not allow tilde in file
;; names. Save it in the Store using a hyphen.
(file-name (string-append name "-" version "-pre1.tar.gz"))
(sha256
(base32 "16i9diawkmar6dhx5xn0mflr2h585gamab6137hvxzgaczx55lwp"))))
(build-system gnu-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'fix-install-path
(lambda _
;; Install program to bin/ instead of games/.
(substitute* "src/Makefile.in"
(("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
(string-append prefix "bin"))))))))
(inputs
(list gtk+ libx11 libxml2 libxpm libxt))
(native-inputs
(list pkg-config))
(home-page
"https://www.ratrabbit.nl/ratrabbit/software/xfishtank/index.html")
(synopsis "Let fish swim over your desktop!")
(description "Xfishtank is a vintage application that uses the X11
protocol. It shows fishes swimming over the desktop.")
(license (list license:expat license:gpl3+))))
(define-public nyancat (define-public nyancat
(package (package
(name "nyancat") (name "nyancat")

194
gnu/packages/version-control.scm
View file

@ -50,6 +50,8 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Kjartan Oli Agustsson <kjartanoli@disroot.org> ;;; Copyright © 2023 Kjartan Oli Agustsson <kjartanoli@disroot.org>
;;; Copyright © 2023 Steve George <steve@futurile.net> ;;; Copyright © 2023 Steve George <steve@futurile.net>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -110,6 +112,7 @@
#:use-module (gnu packages golang-check) #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web) #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz) #:use-module (gnu packages guile-xyz)
@ -2926,9 +2929,16 @@ email header.")
;; XXX: dnspython attempts to read /etc/resolv.conf when loading ;; XXX: dnspython attempts to read /etc/resolv.conf when loading
;; resolver.py, which breaks the sanity check in dependent ;; resolver.py, which breaks the sanity check in dependent
;; packages. This should rather be fixed in dnspython. ;; packages. This should rather be fixed in dnspython.
(delete 'sanity-check)))) (delete 'sanity-check)
;; This ensures git is present when called.
(add-after 'unpack 'hardcode-git-bin
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "b4" "\\.py$")
(("\\['git'")
(string-append
"['" (search-input-file inputs "bin/git") "'"))))))))
(inputs (inputs
(list python-dkimpy python-dnspython python-requests)) (list git-minimal python-dkimpy python-dnspython python-requests))
(propagated-inputs (propagated-inputs
(list patatt)) (list patatt))
(home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
@ -3620,24 +3630,24 @@ defects faster.")
(invoke git-exe "config" "--global" "user.name" "GitHub Actions") (invoke git-exe "config" "--global" "user.name" "GitHub Actions")
#t) #t)
#t))))) #t)))))
(native-inputs (propagated-inputs
`(("go-github-com-emirpasic-gods" ,go-github-com-emirpasic-gods) (list go-github-com-alcortesm-tgz
("go-github-com-go-git-gcfg" ,go-github-com-go-git-gcfg) go-github-com-emirpasic-gods
("go-github-com-go-git-go-billy" ,go-github-com-go-git-go-billy) go-github-com-go-git-gcfg
("go-github-com-imdario-mergo" ,go-github-com-imdario-mergo) go-github-com-go-git-go-billy
("go-github-com-jbenet-go-context" ,go-github-com-jbenet-go-context) go-github-com-go-git-go-git-fixtures
("go-github-com-kevinburke-ssh-config" ,go-github-com-kevinburke-ssh-config) go-github-com-imdario-mergo
("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir) go-github-com-jbenet-go-context
("go-github-com-sergi-go-diff" ,go-github-com-sergi-go-diff) go-github-com-kevinburke-ssh-config
("go-github-com-xanzy-ssh-agentf" ,go-github-com-xanzy-ssh-agent) go-github-com-mitchellh-go-homedir
("go-golang-org-x-crypto" ,go-golang-org-x-crypto) go-github-com-sergi-go-diff
("go-golang-org-x-net" ,go-golang-org-x-net) go-github-com-xanzy-ssh-agent
("go-gopkg-in-warnings" ,go-gopkg-in-warnings) go-golang-org-x-crypto
("go-github-com-go-git-go-git-fixtures" ,go-github-com-go-git-go-git-fixtures) go-golang-org-x-net
("go-gopkg-in-check-v1" ,go-gopkg-in-check-v1) go-golang-org-x-text
("go-github-com-alcortesm-tgz" ,go-github-com-alcortesm-tgz) go-gopkg-in-check-v1
("go-golang-org-x-text" ,go-golang-org-x-text) go-gopkg-in-warnings))
("git" ,git))) (native-inputs (list git))
(home-page "https://github.com/go-git/") (home-page "https://github.com/go-git/")
(synopsis "Git implementation library") (synopsis "Git implementation library")
(description "This package provides a Git implementation library.") (description "This package provides a Git implementation library.")
@ -3719,13 +3729,15 @@ If several repos are related, it helps to see their status together.")
"155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh")))) "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:install-source? #f (list
#:install-source? #f
#:go go-1.21
#:import-path "github.com/x-motemen/ghq" #:import-path "github.com/x-motemen/ghq"
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'install-completions (add-after 'install 'install-completions
(lambda* (#:key outputs import-path #:allow-other-keys) (lambda* (#:key outputs import-path #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out #$output)
(bash-completion (string-append out "/etc/bash_completion.d")) (bash-completion (string-append out "/etc/bash_completion.d"))
(zsh-completion (string-append out "/share/zsh/site-functions"))) (zsh-completion (string-append out "/share/zsh/site-functions")))
(with-directory-excursion (string-append "src/" import-path) (with-directory-excursion (string-append "src/" import-path)
@ -3734,18 +3746,17 @@ If several repos are related, it helps to see their status together.")
(string-append bash-completion "/ghq")) (string-append bash-completion "/ghq"))
(mkdir-p zsh-completion) (mkdir-p zsh-completion)
(copy-file "misc/zsh/_ghq" (copy-file "misc/zsh/_ghq"
(string-append zsh-completion "/_ghq")))) (string-append zsh-completion "/_ghq")))))))))
#t)))))
(native-inputs (native-inputs
`(("git" ,git-minimal))) (list git-minimal))
(inputs (inputs
`(("github.com/songmu/gitconfig" ,go-github-com-songmu-gitconfig) (list go-github-com-songmu-gitconfig
("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) go-github-com-mattn-go-isatty
("github.com/motemen/go-colorine" ,go-github-com-motemen-go-colorine) go-github-com-motemen-go-colorine
("github.com/saracen/walker" ,go-github-com-saracen-walker) go-github-com-saracen-walker
("github.com/urfave/cli/v2" ,go-github-com-urfave-cli-v2) go-github-com-urfave-cli-v2
("golang.org/x/net/html" ,go-golang-org-x-net-html) go-golang-org-x-net-html
("golang.org/x/sync/errgroup" ,go-golang.org-x-sync-errgroup))) go-golang.org-x-sync-errgroup))
(synopsis "Manage remote repository clones") (synopsis "Manage remote repository clones")
(description (description
"@code{ghq} provides a way to organize remote repository clones, like "@code{ghq} provides a way to organize remote repository clones, like
@ -3837,25 +3848,64 @@ TkDiff is included for browsing and merging your changes.")
(define-public git-filter-repo (define-public git-filter-repo
(package (package
(name "git-filter-repo") (name "git-filter-repo")
(version "2.29.0") (version "2.38.0")
(source (source
(origin (origin
;; Use a release tarball instead of 'git-fetch' because it contains (method git-fetch)
;; pre-compiled man-pages which are too hard to build in this context (uri (git-reference
;; as it depends on Git's Makefile. (url "https://github.com/newren/git-filter-repo")
(method url-fetch) (commit (string-append "v" version))))
(uri (string-append "https://github.com/newren/git-filter-repo/releases/" (file-name (git-file-name name version))
"download/v" version
"/git-filter-repo-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb")))) "1al43zpw1mdfy9i05w4xw178abypjwnkk52lqvmbl19lr1l47r4i"))
(build-system copy-build-system) ;; Modified from <https://github.com/newren/git-filter-repo/pull/477>.
;; Used with 'unpack-git-source phase.
(patches (search-patches "git-filter-repo-generate-doc.patch"))))
(build-system gnu-build-system)
(arguments (arguments
`(#:install-plan (list
'(("git-filter-repo" "libexec/git-core/") #:tests? #f ;No tests.
("Documentation/man1/" "share/man/man1") #:imported-modules
("/" "" #:include ())))) `(,@%gnu-build-system-modules
(guix build python-build-system))
#:modules
'((guix build gnu-build-system)
((guix build python-build-system) #:select (site-packages))
(guix build utils)
(srfi srfi-26))
#:make-flags
#~(list (string-append "prefix=" #$output)
(string-append "VERSION=" #$(package-version this-package)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'unpack-git-source
(lambda _
(let* ((old-path (getcwd))
(doc-source (string-append old-path "/Documentation")))
(mkdir-p "git-source")
(chdir "git-source")
((assoc-ref %standard-phases 'unpack)
#:source #+(package-source git))
(for-each
(cut install-file <> doc-source)
(find-files "." "asciidoc\\.conf$|manpage.*\\.xsl$"))
(chdir old-path)
(delete-file-recursively "git-source"))))
(add-before 'build 'set-pythondir
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Makefile"
(("(pythondir = ).*" _ pre)
(string-append pre (site-packages inputs outputs))))))
(replace 'build
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "doc" make-flags))))))
(native-inputs
(list asciidoc
docbook-xsl
libxml2 ;for XML_CATALOG_FILES
xmlto))
(inputs (list python)) ;for the shebang (inputs (list python)) ;for the shebang
(home-page "https://github.com/newren/git-filter-repo") (home-page "https://github.com/newren/git-filter-repo")
(synopsis "Quickly rewrite Git repository history") (synopsis "Quickly rewrite Git repository history")
@ -4001,3 +4051,53 @@ file into Darcs, Git, Mercurial, Bazaar, Subversion, or CVS repositories. It
comes as a command line app and also an Emacs interface.") comes as a command line app and also an Emacs interface.")
(home-page "https://porkrind.org/commit-patch/") (home-page "https://porkrind.org/commit-patch/")
(license license:gpl2+))) (license license:gpl2+)))
(define-public git-sizer
(package
(name "git-sizer")
(version "1.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/github/git-sizer")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1b4sl4djnfaxwph41y4bh9yal4bpd1nz4403ryp7nzna7h2x0zis"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/github/git-sizer"
#:install-source? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("src/github.com/github/git-sizer/git_sizer_test.go")
(("bin/git-sizer")
(string-append (assoc-ref outputs "out")
"/bin/git-sizer")))))
(replace 'check
(lambda* (#:key tests? import-path #:allow-other-keys)
(when tests?
(for-each (lambda (test)
(invoke "go" "test" "-v" "-run" test import-path))
;; TestExec and TestSubmodule require a copy of the
;; Git repository.
'("TestBomb" "TestFromSubdir" "TestRefgroups"
"TestRefSelections" "TestTaggedTags"))))))))
(native-inputs (list git))
(propagated-inputs
(list go-github-com-cli-safeexec
go-github-com-davecgh-go-spew
go-github-com-pmezard-go-difflib
go-github-com-spf13-pflag
go-github-com-stretchr-testify
go-go-uber-org-goleak
go-golang-org-x-sync
go-gopkg-in-yaml-v3))
(home-page "https://github.com/github/git-sizer")
(synopsis "Analyze size of a Git repo")
(description "Compute various size metrics for a Git repository, flagging
those that might cause problems or inconvenience.")
(license license:expat)))

8
gnu/packages/video.scm
View file

@ -218,7 +218,7 @@
(define-public ani-cli (define-public ani-cli
(package (package
(name "ani-cli") (name "ani-cli")
(version "4.6") (version "4.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -227,7 +227,7 @@
(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 "1ni9pzjb5qh87iz7c8252bx79qadr1qx6jnkqvvjcqrchh7q473a")))) (base32 "1xfcn51yyzjc7gr2xzhz2i1i500ad1877dmdadipfdlfcs4l4yxy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -843,7 +843,7 @@ old-fashioned output methods with powerful ascii-art renderer.")
(define-public celluloid (define-public celluloid
(package (package
(name "celluloid") (name "celluloid")
(version "0.25") (version "0.26")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -851,7 +851,7 @@ old-fashioned output methods with powerful ascii-art renderer.")
"/releases/download/v" version "/releases/download/v" version
"/celluloid-" version ".tar.xz")) "/celluloid-" version ".tar.xz"))
(sha256 (sha256
(base32 "0an98lz90s4hhvrvqd1ja814mav9md9n843vhknjgcv4zmrwn0sg")))) (base32 "1pjxmvjjvw9k0kvhhqp4x73x6a0mslffsdil431q8m3iwasffwb1"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list

27
gnu/packages/vim.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@ -1053,7 +1053,7 @@ a nested nvim process.")
(define-public vim-asyncrun (define-public vim-asyncrun
(package (package
(name "vim-asyncrun") (name "vim-asyncrun")
(version "2.8.6") (version "2.12.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1062,7 +1062,7 @@ a nested nvim process.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"11zcw0sll6qg6ha0rr6n1cw5v73azvf7ycwn9lgiwa5cj7rrqjf4")))) "0hyz3bgbwmg85534ab71w2sr6fj94mz498ayn9bvhn4g7y6c951n"))))
(build-system vim-build-system) (build-system vim-build-system)
(arguments (arguments
(list (list
@ -1074,20 +1074,28 @@ NeoVim) to enable you to run shell commands in background and read output in the
quickfix window in realtime.") quickfix window in realtime.")
(license license:expat))) (license license:expat)))
(define-public neovim-asyncrun
(package
(inherit vim-asyncrun)
(name "neovim-asyncrun")))
(define-public vim-dispatch (define-public vim-dispatch
;; Last release was in June 2019.
(let ((commit "4c695bc052cad2ae6b980aebbe48d046466e27ae")
(revision "1"))
(package (package
(name "vim-dispatch") (name "vim-dispatch")
(version "1.8") (version (git-version "1.8" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/tpope/vim-dispatch") (url "https://github.com/tpope/vim-dispatch")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1m8b5mn2zqlphzs6xfwykwmghf6p0wabrhpjmh7vav35jgcxc4wl")))) "13c63n7gylny2s84k05cpl4cjn070d3qk6yagxny23yanz29hc15"))))
(build-system vim-build-system) (build-system vim-build-system)
(arguments (arguments
(list #:plugin-name "dispatch")) (list #:plugin-name "dispatch"))
@ -1097,7 +1105,12 @@ quickfix window in realtime.")
bound by synchronicity. Kick off builds and test suites using one of several bound by synchronicity. Kick off builds and test suites using one of several
asynchronous adapters (including tmux, screen, and a headless mode), and when asynchronous adapters (including tmux, screen, and a headless mode), and when
the job completes, errors will be loaded and parsed automatically.") the job completes, errors will be loaded and parsed automatically.")
(license license:vim))) (license license:vim))))
(define-public neovim-dispatch
(package
(inherit vim-dispatch)
(name "neovim-dispatch")))
(define-public vim-gemini-vim (define-public vim-gemini-vim
;; No releases have been tagged. ;; No releases have been tagged.

56
gnu/packages/virtualization.scm
View file

@ -31,6 +31,7 @@
;;; Copyright © 2023 Juliana Sims <juli@incana.org> ;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org> ;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -123,6 +124,7 @@
#: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 readline) #:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages rsync) #:use-module (gnu packages rsync)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
@ -143,6 +145,7 @@
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system ruby)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -2311,6 +2314,59 @@ the image.
@end enumerate") @end enumerate")
(license license:asl2.0))) (license license:asl2.0)))
(define-public ruby-vagrant-spec-helper-basic
(package
(name "ruby-vagrant-spec-helper-basic")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "vagrant-spec-helper-basic" version))
(sha256
(base32
"1qhxxc07dhrma1s1x2g9sma7xxgwzs20s6v5pv9jrpz6bl4b527n"))))
(build-system ruby-build-system)
(arguments
(list #:tests? #f)) ;; has not tests
(synopsis "Helper for vagrant-spec")
(description "This package is an internal helper for vagrant-spec. Don't
use it.")
(home-page "https://github.com/hashicorp/vagrant-spec")
(license license:mpl2.0)))
(define-public ruby-vagrant-spec
(package
(name "ruby-vagrant-spec")
(version "0.0.6")
(source (origin
(method url-fetch)
(uri (rubygems-uri "vagrant_spec" version))
(sha256
(base32
"1bkzz3mj7kzsv6k0ii8w31cgkpiqw3wvmvv2c6rknsavqqnagb4g"))))
(build-system ruby-build-system)
;; (native-inputs (list ruby-rubocop ruby-vagrant-spec-helper-basic))
(propagated-inputs (list ruby-coveralls ruby-serverspec ruby-dep))
(arguments
(list
#:tests? #f ;; tests require vagrant
;; target 'test' includes 'cops' and running some ansible-playbook
#:test-target "unit"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(substitute* "Rakefile"
(("Bundler::GemHelper") "require 'bundler'\nBundler::GemHelper"))))
(add-before 'check 'prepare-check
(lambda _
(setenv "HOME" "/tmp"))))))
(synopsis "Specification and tests for Vagrant")
(description "@code{vagrant-spec} is a both a specification of how Vagrant
and its various components should behave as well as a library of testing
helpers that let you write your own unit and acceptance tests for Vagrant.")
(home-page "https://github.com/hashicorp/vagrant-spec")
(license license:mpl2.0)))
(define-public python-vagrant (define-public python-vagrant
(package (package
(name "python-vagrant") (name "python-vagrant")

13
gnu/packages/vnc.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com> ;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -165,20 +165,17 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public tigervnc-client (define-public tigervnc-client
;; xorg-server 21 support was merged 2 weeks after the last (1.12.0) release.
(let ((revision "0")
(commit "b484c229853a08c7f254a4c6efbaf3c9e85b5074"))
(package (package
(name "tigervnc-client") (name "tigervnc-client")
(version (git-version "1.12.0" revision commit)) (version "1.13.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/TigerVNC/tigervnc") (url "https://github.com/TigerVNC/tigervnc")
(commit commit))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "125dnn05ps7vfsxlxmzm05w99lhm8hk8j4hpxl1mlzb5j0hp1061")) (base32 "1ymyay51sig9cs74ggb1vnyy7dzddkqa0ijjxvhb2v9v9y920ab1"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -210,7 +207,7 @@ Network Computing). It provides enough performance to run even 3D and video
applications. It also provides extensions for advanced authentication methods applications. It also provides extensions for advanced authentication methods
and TLS encryption. This package installs only the VNC client, the and TLS encryption. This package installs only the VNC client, the
application which is needed to connect to VNC servers.") application which is needed to connect to VNC servers.")
(license license:gpl2)))) (license license:gpl2)))
(define %tigervnc-client-source (package-source tigervnc-client)) (define %tigervnc-client-source (package-source tigervnc-client))

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

@ -590,7 +590,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.11.2") (version "3.11.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -599,7 +599,7 @@ driven and does not detract you from your daily work.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"1gg77dlc7mrwr9h6dgn0cnd78kw6glnr8j6xjs6l93wcr0z5pkqg")) "0vp3w9a3zzn9kbq48a4b1nylrn1i4ibwxpl377yq04ggqkd6fi9a"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

73
gnu/packages/web.scm
View file

@ -144,7 +144,9 @@
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web) #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -5199,6 +5201,69 @@ little effort, and the program to do so is often shorter and simpler than
you'd expect.") you'd expect.")
(license (list license:expat license:cc-by3.0)))) (license (list license:expat license:cc-by3.0))))
(define-public go-github-com-mikefarah-yq-v4
(package
(name "go-github-com-mikefarah-yq-v4")
(version "4.34.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mikefarah/yq")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0y5i0p4fiq0kad9xqihhyclhd9d3l2r5yligdkvsdc90hlqjmql3"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/mikefarah/yq/v4"
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'remove-binary
(lambda _
(delete-file-recursively
(string-append #$output "/bin")))))))
(propagated-inputs
(list go-github-com-a8m-envsubst
go-github-com-alecthomas-participle-v2
go-github-com-dimchansky-utfbom
go-github-com-elliotchance-orderedmap
go-github-com-fatih-color
go-github-com-goccy-go-json
go-github-com-goccy-yaml
go-github-com-jinzhu-copier
go-github-com-magiconair-properties
go-github-com-pelletier-go-toml-v2
go-github-com-spf13-cobra
go-golang-org-x-net
go-golang-org-x-text
go-gopkg-in-op-go-logging-v1
go-gopkg-in-yaml-v3))
(home-page "https://mikefarah.gitbook.io/yq/")
(synopsis
"Command-line YAML, JSON, XML, CSV, TOML and properties processor")
(description
"This package provides @code{yq}, a command-line YAML, JSON and XML
processor. It uses @code{jq}-like syntax but works with YAML files as well as
JSON, XML, properties, CSV and TSV.")
(license license:expat)))
(define-public yq
(package
(inherit go-github-com-mikefarah-yq-v4)
(name "yq")
(arguments
(list #:install-source? #f
#:import-path "github.com/mikefarah/yq/v4"
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'rename-binary
(lambda _
(rename-file (string-append #$output "/bin/v4")
(string-append #$output "/bin/yq")))))))
(propagated-inputs '())
(inputs (package-propagated-inputs go-github-com-mikefarah-yq-v4))))
(define-public go-github-com-itchyny-timefmt-go (define-public go-github-com-itchyny-timefmt-go
(package (package
(name "go-github-com-itchyny-timefmt-go") (name "go-github-com-itchyny-timefmt-go")
@ -8166,7 +8231,7 @@ compressed JSON header blocks.
(define-public nghttp3 (define-public nghttp3
(package (package
(name "nghttp3") (name "nghttp3")
(version "1.1.0") (version "1.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -8175,12 +8240,10 @@ compressed JSON header blocks.
"nghttp3-" version ".tar.gz")) "nghttp3-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1fzvadnwb03jlm180313gg5m4fg09qdcc67fwcfrv9zs22anaa55")))) "0xfa3nbpv3d514ssjpxvizqmss8z330w9p0bp045w4qsyr1vkj8c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config (list pkg-config))
;; Required by tests.
cunit))
(arguments (arguments
(list (list
#:configure-flags #:configure-flags

104
gnu/packages/wm.scm
View file

@ -67,6 +67,7 @@
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz> ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2024 Ahmad Draidi <a.r.draidi@redscript.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -208,7 +209,7 @@ the leaves of a full binary tree.")
(sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja")))) (sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list pkg-config scdoc)) (native-inputs (list pkg-config scdoc))
(inputs (list wayland wlroots libxkbcommon)) (inputs (list wayland wlroots-0.16 libxkbcommon))
(home-page "https://github.com/cage-kiosk/cage") (home-page "https://github.com/cage-kiosk/cage")
(synopsis "Wayland kiosk") (synopsis "Wayland kiosk")
(description "This package provides a Wayland @dfn{kiosk}, which runs a (description "This package provides a Wayland @dfn{kiosk}, which runs a
@ -1150,7 +1151,7 @@ the XDG Autostart specification.")
(define-public fnott (define-public fnott
(package (package
(name "fnott") (name "fnott")
(version "1.4.0") (version "1.4.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1159,7 +1160,7 @@ the XDG Autostart specification.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0l0brayvcifrc5rxxkqfrskd6523vs3allg2cxhwkixqf2ddg7kh")))) "0fmjvmsm2ikcmdzrf6xwyq6vxb9p1dd3bhvz3bvi7q7rb2g8h8pi"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments `(#:build-type "release")) (arguments `(#:build-type "release"))
(native-inputs (native-inputs
@ -1168,7 +1169,7 @@ the XDG Autostart specification.")
tllist tllist
scdoc)) scdoc))
(inputs (inputs
(list wlroots wayland fcft dbus libpng)) (list wlroots-0.16 wayland fcft dbus libpng))
(home-page "https://codeberg.org/dnkl/fnott") (home-page "https://codeberg.org/dnkl/fnott")
(synopsis "Keyboard driven and lightweight Wayland notification daemon") (synopsis "Keyboard driven and lightweight Wayland notification daemon")
(description "Fnott is a keyboard driven and lightweight notification daemon (description "Fnott is a keyboard driven and lightweight notification daemon
@ -1570,7 +1571,7 @@ started automatically on the first call via D-Bus.")
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list wlroots)) (list wlroots-0.16))
(home-page "https://github.com/djpohly/dwl") (home-page "https://github.com/djpohly/dwl")
(synopsis "Dynamic window manager for Wayland") (synopsis "Dynamic window manager for Wayland")
(description (description
@ -1623,14 +1624,14 @@ its size
(define-public polybar (define-public polybar
(package (package
(name "polybar") (name "polybar")
(version "3.6.3") (version "3.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/polybar/polybar/releases/" (uri (string-append "https://github.com/polybar/polybar/releases/"
"download/" version "/polybar-" version ".tar.gz")) "download/" version "/polybar-" version ".tar.gz"))
(sha256 (sha256
(base32 "19azx5dpfyfh0pv4q2fcrf4p7a0pc5d13m7lnv3qy8376mbmhmzj")))) (base32 "03zz2c3ckxqbwixc2qhsnasq4j4sfia71v75li9w97d0bcwavrjx"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Test is disabled because it requires downloading googletest from the ;; Test is disabled because it requires downloading googletest from the
@ -1676,7 +1677,7 @@ functionality to display information about the most commonly used services.")
(define-public wlroots (define-public wlroots
(package (package
(name "wlroots") (name "wlroots")
(version "0.16.2") (version "0.17.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1685,7 +1686,9 @@ functionality to display information about the most commonly used services.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1m12nv6avgnz626h3giqp6gcx44w1wq6z0jy780mx8z255ic7q15")))) (base32 "1hj4gq5vx8in65622yvjm8bwqkw2vpc556k9my997a0hn0ricj37"))
;; This patch can be removed once hwdata in Guix supports pkg-config
(patches (search-patches "wlroots-hwdata-fallback.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1706,6 +1709,7 @@ functionality to display information about the most commonly used services.")
(propagated-inputs (propagated-inputs
(list ;; As required by wlroots.pc. (list ;; As required by wlroots.pc.
eudev eudev
libdisplay-info
libinput-minimal libinput-minimal
libxkbcommon libxkbcommon
mesa mesa
@ -1731,6 +1735,23 @@ Wayland compositor")
modules for building a Wayland compositor.") modules for building a Wayland compositor.")
(license license:expat))) ; MIT license (license license:expat))) ; MIT license
(define-public wlroots-0.16
(package
(inherit wlroots)
(name "wlroots-0.16")
(version "0.16.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.freedesktop.org/wlroots/wlroots")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1m12nv6avgnz626h3giqp6gcx44w1wq6z0jy780mx8z255ic7q15"))))
(propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
(delete libdisplay-info)))))
(define-public sway (define-public sway
(package (package
(name "sway") (name "sway")
@ -1775,7 +1796,7 @@ modules for building a Wayland compositor.")
pcre2 pcre2
swaybg swaybg
wayland wayland
wlroots)) wlroots-0.16))
(native-inputs (native-inputs
(cons* linux-pam mesa pkg-config scdoc wayland-protocols (cons* linux-pam mesa pkg-config scdoc wayland-protocols
(if (%current-target-system) (if (%current-target-system)
@ -1864,7 +1885,7 @@ corners, shadows, inactive window dimming, etc.")
(package (package
(inherit swaylock) (inherit swaylock)
(name "swaylock-effects") (name "swaylock-effects")
(version "1.6.11") (version "1.7.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1874,7 +1895,7 @@ corners, shadows, inactive window dimming, etc.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) "0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj"))))
(arguments (arguments
(list #:configure-flags #~'("-Dsse=false"))) (list #:configure-flags #~'("-Dsse=false")))
(synopsis "Screen locking utility for Wayland compositors with effects") (synopsis "Screen locking utility for Wayland compositors with effects")
@ -2106,7 +2127,7 @@ compositors that support the layer-shell protocol.")
(define-public kanshi (define-public kanshi
(package (package
(name "kanshi") (name "kanshi")
(version "1.4.0") (version "1.5.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2115,7 +2136,7 @@ compositors that support the layer-shell protocol.")
(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 "016s2896mnf4dnyyrqp2pnqrvrqn404c6b16d5kcjf1p21003lp5")))) (base32 "1mc2zcqsv79y7682nwi1gn8p751zwflm9zirl98v2q2kvx334k8a"))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs (list wayland)) (inputs (list wayland))
(native-inputs (list pkg-config scdoc)) (native-inputs (list pkg-config scdoc))
@ -2967,7 +2988,7 @@ shows a notification for the user on the screen.")
(("/etc/") (string-append #$output "/etc/")) (("/etc/") (string-append #$output "/etc/"))
(("/usr/share/") (string-append #$output "/usr/share/")))))))) (("/usr/share/") (string-append #$output "/usr/share/"))))))))
(native-inputs (list pkg-config scdoc)) (native-inputs (list pkg-config scdoc))
(inputs (list libevdev pango wlroots)) (inputs (list libevdev pango wlroots-0.16))
(home-page "https://github.com/project-repo/cagebreak") (home-page "https://github.com/project-repo/cagebreak")
(synopsis "Tiling wayland compositor inspired by ratpoison") (synopsis "Tiling wayland compositor inspired by ratpoison")
(description (description
@ -2976,6 +2997,49 @@ for wayland conceptually based on the X11 window manager
@command{ratpoison}.") @command{ratpoison}.")
(license license:expat))) (license license:expat)))
(define-public libdisplay-info
(let ((commit "ebee35935dad01478ae1ae5ead298c4cd8018ac2")
(revision "0"))
(package
(name "libdisplay-info")
(version (git-version "0.2.0-dev" revision commit))
(home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info")
(source
(origin
(method git-fetch)
(uri (git-reference (url home-page) (commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1ly8acdjxn8l55y0wc07n7pb6rzh9dpr1vbsakdib2zrl0i5yh3a"))))
(build-system meson-build-system)
(arguments
(list
#:phases #~(modify-phases %standard-phases
(add-before 'configure 'fix-meson-file
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "meson.build"
(("/usr/share/hwdata/pnp.ids")
(string-append (assoc-ref (or native-inputs inputs)
"hwdata")
"/share/hwdata/pnp.ids"))))))))
(native-inputs (list `(,hwdata "pnp") python))
(synopsis "EDID and DisplayID library")
(description
"This package provides a library to read @acronym{EDID, Extended
Display Identification Data} and DisplayID metadata from display devices. It
has the following goals:
@enumerate
@item
Provide a set of high-level, easy-to-use, opinionated functions
as well as low-level functions to access detailed information.
@item
Simplicity and correctness over performance and resource usage.
@item
Well-tested and fuzzed.
@end enumerate")
(license license:expat))))
(define-public libucl (define-public libucl
(package (package
(name "libucl") (name "libucl")
@ -3003,7 +3067,7 @@ read and write, and compatible with JSON.")
(define-public labwc (define-public labwc
(package (package
(name "labwc") (name "labwc")
(version "0.6.5") (version "0.7.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3012,7 +3076,7 @@ read and write, and compatible with JSON.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"04401k1i6b9s2v6mbhw5llla8fdpkhmgz826iva246iqch9z20lx")))) "17p3wcnggnd4v37z1dgv8nmc35nq4261s8sglr44bf71vjircggz"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list pkg-config gettext-minimal scdoc)) (list pkg-config gettext-minimal scdoc))
@ -3064,7 +3128,7 @@ session. Nor does it depend on any UI toolkits such as Qt or GTK.")
linux-pam linux-pam
pango pango
wayland wayland
wlroots)) wlroots-0.16))
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags #:make-flags
@ -3342,7 +3406,7 @@ Type=Application~%"
(define-public avizo (define-public avizo
(package (package
(name "avizo") (name "avizo")
(version "1.2.1") (version "1.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3351,7 +3415,7 @@ Type=Application~%"
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ddv5ssxfjbzhqskbbhi9qj1yqkraiv3r8svfmp9s5nnfpid8aba")))) "01v1c9376pbjndyhj9r6f214kzhivl1m9pkl05sdkcj0v6n0wgsn"))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs (list gtk+)) (inputs (list gtk+))
(native-inputs (native-inputs

14
gnu/packages/xdisorg.scm
View file

@ -327,7 +327,7 @@ used to further tweak the behaviour of the different profiles.")
(define-public bemenu (define-public bemenu
(package (package
(name "bemenu") (name "bemenu")
(version "0.6.16") (version "0.6.19")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -336,7 +336,7 @@ used to further tweak the behaviour of the different profiles.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0q3i9blcw5i793m1rxf5dqp773hssdpifrz820psr90x982vvmib")))) (base32 "19lqwzp9d471zkhk36d42jr0ywz9gqmksfqczlbafd80jlqnkg4k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -359,7 +359,7 @@ used to further tweak the behaviour of the different profiles.")
wayland wayland
wayland-protocols)) wayland-protocols))
(native-inputs (native-inputs
(list doxygen pkg-config)) (list doxygen pkg-config scdoc))
(home-page "https://github.com/Cloudef/bemenu") (home-page "https://github.com/Cloudef/bemenu")
(synopsis "Dynamic menu library and client program inspired by dmenu") (synopsis "Dynamic menu library and client program inspired by dmenu")
(description (description
@ -372,7 +372,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
(define-public copyq (define-public copyq
(package (package
(name "copyq") (name "copyq")
(version "7.0.0") (version "7.1.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -381,7 +381,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0h8jz7v5xvpq23dh1sr600q5jlrfzm6wsnp7sln8hbgsn96n8kas")))) "1f39mh9qv1fa2vbwjigi1raz1pym2pz733j6b77r4588l8aaj2b8"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -1488,7 +1488,7 @@ Wacom tablet applet.")
(define-public xf86-input-wacom (define-public xf86-input-wacom
(package (package
(name "xf86-input-wacom") (name "xf86-input-wacom")
(version "1.1.0") (version "1.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1497,7 +1497,7 @@ Wacom tablet applet.")
"xf86-input-wacom-" version "/" "xf86-input-wacom-" version "/"
"xf86-input-wacom-" version ".tar.bz2")) "xf86-input-wacom-" version ".tar.bz2"))
(sha256 (sha256
(base32 "04ks577ag2yir7kssv8zhig4rx9xqj2wifmlrcmy4k9lgw379di3")))) (base32 "0pb8f8fvwm7vy5p3h8nc7x7fb68kpdkscz0j79xzsaxwn8435hhk"))))
(arguments (arguments
(list #:configure-flags (list #:configure-flags
#~(list (string-append "--with-sdkdir=" #$output "/include/xorg") #~(list (string-append "--with-sdkdir=" #$output "/include/xorg")

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

@ -52,6 +52,16 @@
(build-system zig-build-system) (build-system zig-build-system)
(arguments (arguments
(list (list
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-wayland-session
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(wayland-sessions
(string-append out "/share/wayland-sessions")))
(mkdir-p wayland-sessions)
(install-file "contrib/river.desktop"
wayland-sessions)))))
#:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
#:zig-release-type "safe")) #:zig-release-type "safe"))
(native-inputs (list libevdev (native-inputs (list libevdev
@ -61,7 +71,7 @@
scdoc scdoc
wayland wayland
wayland-protocols wayland-protocols
wlroots)) wlroots-0.16))
(home-page "https://github.com/riverwm/river") (home-page "https://github.com/riverwm/river")
(synopsis "Dynamic tiling Wayland compositor") (synopsis "Dynamic tiling Wayland compositor")
(description (description

2
gnu/services.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2023 Brian Cully <bjc@spork.org> ;;; Copyright © 2023 Brian Cully <bjc@spork.org>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -692,6 +693,7 @@ ACTIVATION-SCRIPT-TYPE."
(use-modules (gnu build activation) (use-modules (gnu build activation)
(guix build utils)) (guix build utils))
(mkdir-p "/var/run")
;; Make sure the user accounting database exists. If it ;; Make sure the user accounting database exists. If it
;; does not exist, 'setutxent' does not create it and ;; does not exist, 'setutxent' does not create it and
;; thus there is no accounting at all. ;; thus there is no accounting at all.

13
gnu/services/networking.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
@ -270,6 +270,14 @@
;;; ;;;
;;; Code: ;;; Code:
(define %unroutable-ipv4
;; Unroutable address, as per <https://www.rfc-editor.org/rfc/rfc5737>.
"203.0.113.1")
(define %unroutable-ipv6
;; Unroutable address, as per <https://www.rfc-editor.org/rfc/rfc6666>.
"0100::")
(define facebook-host-aliases (define facebook-host-aliases
;; This is the list of known Facebook hosts to be added to /etc/hosts if you ;; This is the list of known Facebook hosts to be added to /etc/hosts if you
;; are to block it. ;; are to block it.
@ -282,7 +290,8 @@
(append-map (lambda (name) (append-map (lambda (name)
(map (lambda (addr) (map (lambda (addr)
(host addr name)) (host addr name))
(list "127.0.0.1" "::1"))) domains))) (list %unroutable-ipv4 %unroutable-ipv6)))
domains)))
(define-deprecated %facebook-host-aliases (define-deprecated %facebook-host-aliases
block-facebook-hosts-service-type block-facebook-hosts-service-type

26
gnu/services/virtualization.scm
View file

@ -36,6 +36,7 @@
#:use-module (gnu services base) #:use-module (gnu services base)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (gnu services dbus) #:use-module (gnu services dbus)
#:use-module (gnu services mcron)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services ssh) #:use-module (gnu services ssh)
#:use-module (gnu services) #:use-module (gnu services)
@ -1209,6 +1210,11 @@ authpriv.*;auth.info /var/log/secure
(openssh-configuration (openssh-configuration
(openssh openssh-sans-x))) (openssh openssh-sans-x)))
;; Run GC once per hour.
(simple-service 'perdiodic-gc mcron-service-type
(list #~(job "12 * * * *"
"guix gc -F 2G")))
(modify-services %base-services (modify-services %base-services
;; By default, the secret service introduces a ;; By default, the secret service introduces a
;; pre-initialized /etc/guix/acl file in the VM. Thus, ;; pre-initialized /etc/guix/acl file in the VM. Thus,
@ -1239,6 +1245,7 @@ authpriv.*;auth.info /var/log/secure
(virtual-build-machine-name config))) (virtual-build-machine-name config)))
(format 'compressed-qcow2) (format 'compressed-qcow2)
(partition-table-type 'mbr) (partition-table-type 'mbr)
(volatile-root? #f)
(shared-store? #f) (shared-store? #f)
(size %default-virtual-build-machine-image-size) (size %default-virtual-build-machine-image-size)
(partitions (match (image-partitions base) (partitions (match (image-partitions base)
@ -1335,6 +1342,22 @@ authpriv.*;auth.info /var/log/secure
(kill (- pid) SIGTERM) (kill (- pid) SIGTERM)
(apply throw key args))))))) (apply throw key args)))))))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
(actions
(list (shepherd-action
(name 'configuration)
(documentation
"Display the configuration of this virtual build machine.")
(procedure
#~(lambda (_)
(format #t "CPU: ~a~%"
#$(virtual-build-machine-cpu config))
(format #t "number of CPU cores: ~a~%"
#$(virtual-build-machine-cpu-count config))
(format #t "memory size: ~a MiB~%"
#$(virtual-build-machine-memory-size config))
(format #t "initial date: ~a~%"
#$(date->string
(virtual-build-machine-date config))))))))
(auto-start? (virtual-build-machine-auto-start? config))))) (auto-start? (virtual-build-machine-auto-start? config)))))
(define (authorize-guest-substitutes-on-host) (define (authorize-guest-substitutes-on-host)
@ -1500,7 +1523,8 @@ CONFIG, a <virtual-build-machine>, is up and running."
(srfi srfi-34)) (srfi srfi-34))
(guard (c ((service-not-found-error? c) #f)) (guard (c ((service-not-found-error? c) #f))
(->bool (current-service '#$service-name)))))) (->bool (live-service-running
(current-service '#$service-name)))))))
(define (build-vm-guix-extension config) (define (build-vm-guix-extension config)
(define vm-ssh-key (define vm-ssh-key

56
gnu/services/web.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com> ;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Miguel Ángel Moreno <mail@migalmoreno.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -36,6 +37,7 @@
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services admin) #:use-module (gnu services admin)
#:use-module (gnu services configuration)
#:use-module (gnu services getmail) #:use-module (gnu services getmail)
#:use-module (gnu services mail) #:use-module (gnu services mail)
#:use-module (gnu system pam) #:use-module (gnu system pam)
@ -47,6 +49,7 @@
#:use-module (gnu packages patchutils) #:use-module (gnu packages patchutils)
#:use-module (gnu packages php) #:use-module (gnu packages php)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
@ -240,6 +243,13 @@
varnish-service-type varnish-service-type
whoogle-service-type
whoogle-configuration
whoogle-configuration-package
whoogle-configuration-host
whoogle-configuration-port
whoogle-configuration-environment-variables
patchwork-database-configuration patchwork-database-configuration
patchwork-database-configuration? patchwork-database-configuration?
patchwork-database-configuration-engine patchwork-database-configuration-engine
@ -1603,6 +1613,52 @@ files.")
(default-value (default-value
(varnish-configuration)))) (varnish-configuration))))
;;;
;;; Whoogle
;;;
(define-configuration/no-serialization whoogle-configuration
(package
(package whoogle-search)
"The @code{whoogle-search} package to use.")
(host
(string "127.0.0.1")
"The host address to run Whoogle on.")
(port
(integer 5000)
"The port to run Whoogle on.")
(environment-variables
(list-of-strings '())
"A list of strings specifying environment variables used to configure
Whoogle."))
(define (whoogle-shepherd-service config)
(match-record config <whoogle-configuration>
(package host port environment-variables)
(list
(shepherd-service
(provision '(whoogle-search))
(start #~(make-forkexec-constructor
(list (string-append #$package "/bin/whoogle-search")
"--host" #$host "--port" #$(number->string port))
#:environment-variables
(append (list "CONFIG_VOLUME=/var/cache/whoogle-search")
'#$environment-variables)))
(stop #~(make-kill-destructor))
(documentation "Run a @code{whoogle-search} instance.")))))
(define whoogle-service-type
(service-type
(name 'whoogle-search)
(extensions
(list (service-extension shepherd-root-service-type
whoogle-shepherd-service)
(service-extension profile-service-type
(compose list whoogle-configuration-package))))
(default-value (whoogle-configuration))
(description "Set up the @code{whoogle-search} metasearch engine.")))
;;; ;;;
;;; Patchwork ;;; Patchwork

14
gnu/system.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com> ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -197,15 +198,18 @@ VERSION is the target version of the boot-parameters record."
;; compatibility when producing bootloader configurations for older ;; compatibility when producing bootloader configurations for older
;; generations. ;; generations.
(define version>0? (> version 0)) (define version>0? (> version 0))
(list (string-append (if version>0? "root=" "--root=") (let ((root (file-system-device->string root-device
#:uuid-type 'dce)))
(append
(if (string=? root "none")
'() ; Ignore the case where the root is "none" (typically tmpfs).
;; Note: Always use the DCE format because that's what ;; Note: Always use the DCE format because that's what
;; (gnu build linux-boot) expects for the 'root' ;; (gnu build linux-boot) expects for the 'root'
;; kernel command-line option. ;; kernel command-line option.
(file-system-device->string root-device (list (string-append (if version>0? "root=" "--root=") root)))
#:uuid-type 'dce)) (list #~(string-append (if #$version>0? "gnu.system=" "--system=") #$system)
#~(string-append (if #$version>0? "gnu.system=" "--system=") #$system)
#~(string-append (if #$version>0? "gnu.load=" "--load=") #~(string-append (if #$version>0? "gnu.load=" "--load=")
#$system "/boot"))) #$system "/boot")))))
;; System-wide configuration. ;; System-wide configuration.

4
gnu/tests/install.scm
View file

@ -1194,7 +1194,9 @@ store a couple of full system images.")
((images (run-install %encrypted-root-not-boot-os ((images (run-install %encrypted-root-not-boot-os
%encrypted-root-not-boot-os-source %encrypted-root-not-boot-os-source
#:script #:script
%encrypted-root-not-boot-installation-script)) %encrypted-root-not-boot-installation-script
#:target-size
(* 1600 MiB)))
(command (qemu-command* images))) (command (qemu-command* images)))
(run-basic-test %encrypted-root-not-boot-os command (run-basic-test %encrypted-root-not-boot-os command
"encrypted-root-not-boot-os" "encrypted-root-not-boot-os"

55
guix/build/syscalls.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -765,27 +765,50 @@ current process."
(list (strerror err)) (list (strerror err))
(list err))))))) (list err)))))))
(define (kernel? pid) (define (linux-process-flags pid) ;copied from the Shepherd
"Return #t if PID designates a \"kernel thread\" rather than a normal "Return the process flags of @var{pid} (or'd @code{PF_} constants), assuming
user-land process." the Linux /proc file system is mounted; raise a @code{system-error} exception
(let ((stat (call-with-input-file (format #f "/proc/~a/stat" pid) otherwise."
(compose string-tokenize read-string)))) (call-with-input-file (string-append "/proc/" (number->string pid)
;; See proc.txt in Linux's documentation for the list of fields. "/stat")
(match stat (lambda (port)
((pid tcomm state ppid pgrp sid tty_nr tty_pgrp flags min_flt (define line
cmin_flt maj_flt cmaj_flt utime stime cutime cstime (read-string port))
priority nice num_thread it_real_value start_time
vsize rss rsslim ;; Parse like systemd's 'is_kernel_thread' function.
(= string->number start_code) (= string->number end_code) _ ...) (let ((offset (string-index line #\)))) ;offset past 'tcomm' field
;; Got this obscure trick from sysvinit's 'killall5' program. (match (and offset
(and (zero? start_code) (zero? end_code)))))) (string-tokenize (string-drop line (+ offset 1))))
((state ppid pgrp sid tty-nr tty-pgrp flags . _)
(or (string->number flags) 0))
(_
0))))))
;; Per-process flag defined in <linux/sched.h>.
(define PF_KTHREAD #x00200000) ;I am a kernel thread
(define (linux-kernel-thread? pid)
"Return true if @var{pid} is a Linux kernel thread."
(= PF_KTHREAD (logand (linux-process-flags pid) PF_KTHREAD)))
(define pseudo-process?
(if (string-contains %host-type "linux")
(lambda (pid)
"Return true if @var{pid} denotes a \"pseudo-process\" such as a Linux
kernel thread rather than a \"regular\" process. A pseudo-process is one that
may never terminate, even after sending it SIGKILL---e.g., kthreadd on Linux."
(catch 'system-error
(lambda ()
(linux-kernel-thread? pid))
(const #f)))
(const #f)))
(define (processes) (define (processes)
"Return the list of live processes." "Return the list of live processes."
(sort (filter-map (lambda (file) (sort (filter-map (lambda (file)
(let ((pid (string->number file))) (let ((pid (string->number file)))
(and pid (and pid
(not (kernel? pid)) (not (pseudo-process? pid))
pid))) pid)))
(scandir "/proc")) (scandir "/proc"))
<)) <))

2
guix/import/cran.scm
View file

@ -90,7 +90,7 @@
(map (lambda (input) (map (lambda (input)
(case (%input-style) (case (%input-style)
((specification) ((specification)
`(specification->package ,(upstream-input-name input))) `(specification->package ,(upstream-input-downstream-name input)))
(else (else
((compose string->symbol ((compose string->symbol
upstream-input-downstream-name) upstream-input-downstream-name)

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