ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into kde-updates

Browse source
This commit is contained in:
宋文武 2023-08-17 18:38:23 +08:00
commit 0ffbdf3456
No known key found for this signature in database
GPG key ID: D415BF253B515976
123 changed files with 31513 additions and 5513 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.mailmap
View file

@ -39,6 +39,7 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
Juliana Sims <juli@incana.org> <jtsims@protonmail.com>
Kei Kebreau <kkebreau@posteo.net>
Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
Liliana Marie Prikler <liliana.prikler@gmail.com>

1
Makefile.am
View file

@ -616,6 +616,7 @@ SH_TESTS = \
tests/guix-refresh.sh \
tests/guix-shell.sh \
tests/guix-shell-export-manifest.sh \
tests/guix-time-machine.sh \
tests/guix-graph.sh \
tests/guix-describe.sh \
tests/guix-repl.sh \

15
doc/contributing.texi
View file

@ -1589,10 +1589,21 @@ will automatically show up at
@indicateurl{https://qa.guix.gnu.org/branch/@var{branch}}, with an
indication of its build status on various platforms.
@cindex feature branches, coordination
To help coordinate the merging of branches, you must create a new
guix-patches issue each time you wish to merge a branch (@pxref{The
Issue Tracker}). Normally branches will be merged in a ``first come,
first merged'' manner, tracked through the guix-patches issues.
Issue Tracker}). The title of the issue requesting to merge a branch
should have the following format:
@cindex merge requests, template
@example
Request for merging "@var{name}" branch
@end example
The @url{https://qa.guix.gnu.org/, QA infrastructure} recognizes such
issues and lists the merge requests on its main page. Normally branches
will be merged in a ``first come, first merged'' manner, tracked through
the guix-patches issues.
If you agree on a different order with those involved, you can track
this by updating which issues block@footnote{You can mark an issue as

271
doc/guix-cookbook.texi
View file

@ -21,7 +21,7 @@ Copyright @copyright{} 2020 Brice Waegeneire@*
Copyright @copyright{} 2020 André Batista@*
Copyright @copyright{} 2020 Christine Lemmer-Webber@*
Copyright @copyright{} 2021 Joshua Branson@*
Copyright @copyright{} 2022 Maxim Cournoyer@*
Copyright @copyright{} 2022, 2023 Maxim Cournoyer@*
Copyright @copyright{} 2023 Ludovic Courtès
Permission is granted to copy, distribute and/or modify this document
@ -78,7 +78,7 @@ manual}).
* Containers:: Isolated environments and nested systems
* Advanced package management:: Power to the users!
* Environment management:: Control environment
* Installing Guix on a Cluster:: High-performance computing.
* Installing Guix on a Cluster:: High-performance computing.
* Acknowledgments:: Thanks!
* GNU Free Documentation License:: The license of this document.
@ -87,36 +87,86 @@ manual}).
@detailmenu
--- The Detailed Node Listing ---
Scheme tutorials
* A Scheme Crash Course::
Packaging
* Packaging Tutorial:: A tutorial on how to add packages to Guix.
* Packaging Tutorial:: A tutorial on how to add packages to Guix.
Packaging Tutorial
* A ``Hello World'' package::
* Setup::
* Extended example::
* Other build systems::
* Programmable and automated package definition::
* Getting help::
* Conclusion::
* References::
Setup
* Local file::
* Channels::
* Direct checkout hacking::
Programmable and automated package definition
* Recursive importers::
* Automatic update::
* Inheritance::
System Configuration
* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms.
* Using security keys:: How to use security keys with Guix System.
* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms.
* Using security keys:: How to use security keys with Guix System.
* Dynamic DNS mcron job:: Job to update the IP address behind a DuckDNS host name.
* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server
* Setting up a bind mount:: Setting up a bind mount in the file-systems definition.
* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor.
* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules.
* Music Server with Bluetooth Audio:: Headless music player with Bluetooth output.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server.
* Setting up a bind mount:: Setting up a bind mount in the file-systems definition.
* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor.
* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules.
* Music Server with Bluetooth Audio:: Headless music player with Bluetooth output.
Customizing a Window Manager
* StumpWM::
* Session lock::
Session lock
* Xorg::
Containers
* Guix Containers:: Perfectly isolated environments
* Guix System Containers:: A system inside your system
* Guix Containers:: Perfectly isolated environments
* Guix System Containers:: A system inside your system
Guix System Containers
* A Database Container::
* Container Networking::
Advanced package management
* Guix Profiles in Practice:: Strategies for multiple profiles and manifests.
* Guix Profiles in Practice:: Strategies for multiple profiles and manifests.
Guix Profiles in Practice
* Basic setup with manifests::
* Required packages::
* Default profile::
* The benefits of manifests::
* Reproducible profiles::
Environment management
* Guix environment via direnv:: Setup Guix environment with direnv
* Guix environment via direnv:: Setup Guix environment with direnv
Installing Guix on a Cluster
@ -144,6 +194,10 @@ experienced programmer to use them!
Let's get started!
@menu
* A Scheme Crash Course::
@end menu
@node A Scheme Crash Course
@section A Scheme Crash Course
@ -192,7 +246,8 @@ rest are the arguments passed to the function. Every function returns the
last evaluated expression as its return value.
@item
Anonymous functions are declared with the @code{lambda} term:
Anonymous functions---@dfn{procedures} in Scheme parlance---are declared
with the @code{lambda} term:
@lisp
(lambda (x) (* x x))
@ -208,6 +263,9 @@ which can in turn be applied to an argument:
@result{} 9
@end lisp
Procedures are regular values just like numbers, strings, Booleans, and
so on.
@item
Anything can be assigned a global name with @code{define}:
@ -233,6 +291,30 @@ A list structure can be created with the @code{list} procedure:
@result{} (2 3 5 7)
@end lisp
@item
Standard procedures are provided by the @code{(srfi srfi-1)} module to
create and process lists (@pxref{SRFI-1, list processing,, guile, GNU
Guile Reference Manual}). Here are some of the most useful ones in
action:
@lisp
(use-modules (srfi srfi-1)) ;import list processing procedures
(append (list 1 2) (list 3 4))
@result{} (1 2 3 4)
(map (lambda (x) (* x x)) (list 1 2 3 4))
@result{} (1 4 9 16)
(delete 3 (list 1 2 3 4)) @result{} (1 2 4)
(filter odd? (list 1 2 3 4)) @result{} (1 3)
(remove even? (list 1 2 3 4)) @result{} (1 3)
(find number? (list "a" 42 "b")) @result{} 42
@end lisp
Notice how the first argument to @code{map}, @code{filter},
@code{remove}, and @code{find} is a procedure!
@item
@cindex S-expression
The @dfn{quote} disables evaluation of a parenthesized expression, also
@ -280,6 +362,9 @@ they provide code to be executed during the package build process. They
look like this:
@lisp
(use-modules (guix gexp) ;so we can write gexps
(gnu packages base)) ;for 'coreutils'
;; Below is a G-expression representing staged code.
#~(begin
;; Invoke 'ls' from the package defined by the 'coreutils'
@ -347,6 +432,9 @@ defines the module @code{guix build-system ruby} which must be located in
@file{guix/build-system/ruby.scm} somewhere in the Guile load path. It
depends on the @code{(guix store)} module and it exports two variables,
@code{ruby-build} and @code{ruby-build-system}.
@xref{Package Modules,,, guix, GNU Guix Reference Manual}, for info on
modules that define packages.
@end itemize
@quotation Going further
@ -396,7 +484,7 @@ definitions in Guile Scheme, organizing them in package modules, and building
them.
@menu
* Packaging Tutorial:: A tutorial on how to add packages to Guix.
* Packaging Tutorial:: A tutorial on how to add packages to Guix.
@end menu
@node Packaging Tutorial
@ -438,6 +526,17 @@ It does not assume much knowledge of the Guix system nor of the Lisp language.
The reader is only expected to be familiar with the command line and to have some
basic programming knowledge.
@menu
* A ``Hello World'' package::
* Setup::
* Extended example::
* Other build systems::
* Programmable and automated package definition::
* Getting help::
* Conclusion::
* References::
@end menu
@node A ``Hello World'' package
@subsection A ``Hello World'' package
@ -643,6 +742,12 @@ easier for everyone to contribute to the project.
But first, let's look at other possibilities.
@menu
* Local file::
* Channels::
* Direct checkout hacking::
@end menu
@node Local file
@subsubsection Local file
@ -1293,6 +1398,12 @@ empowers us in ways that reach far beyond traditional package management.
Let's illustrate this with some awesome features of Guix!
@menu
* Recursive importers::
* Automatic update::
* Inheritance::
@end menu
@node Recursive importers
@subsubsection Recursive importers
@ -1456,17 +1567,18 @@ chapter is to demonstrate some advanced configuration concepts.
reference.
@menu
* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms.
* Using security keys:: How to use security keys with Guix System.
* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms.
* Using security keys:: How to use security keys with Guix System.
* Dynamic DNS mcron job:: Job to update the IP address behind a DuckDNS host name.
* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server
* Setting up a bind mount:: Setting up a bind mount in the file-systems definition.
* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor.
* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules.
* Music Server with Bluetooth Audio:: Headless music player with Bluetooth output.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server.
* Setting up a bind mount:: Setting up a bind mount in the file-systems definition.
* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor.
* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules.
* Music Server with Bluetooth Audio:: Headless music player with Bluetooth output.
@end menu
@node Auto-Login to a Specific TTY
@ -2022,6 +2134,77 @@ security key'' menu. If it works, congratulations, your security key is
ready to be used with applications supporting two-factor authentication
(2FA).
@subsection Disabling OTP code generation for a Yubikey
@cindex disabling yubikey OTP
If you use a Yubikey security key and are irritated by the spurious OTP
codes it generates when inadvertently touching the key (e.g. causing you
to become a spammer in the @samp{#guix} channel when discussing from
your favorite IRC client!), you can disable it via the following
@command{ykman} command:
@example
guix shell python-yubikey-manager -- ykman config usb --force --disable OTP
@end example
Alternatively, you could use the @command{ykman-gui} command provided by
the @code{yubikey-manager-qt} package and either wholly disable the
@samp{OTP} application for the USB interface or, from the
@samp{Applications -> OTP} view, delete the slot 1 configuration, which
comes pre-configured with the Yubico OTP application.
@node Dynamic DNS mcron job
@section Dynamic DNS mcron job
@cindex dynamic DNS, DDNS
If your @acronym{ISP, Internet Service Provider} only provides dynamic
IP addresses, it can be useful to setup a dynamic @acronym{DNS, Domain
Name System} (also known as @acronym{DDNS, Dynamic DNS}) service to
associate a static host name to a public but dynamic (often changing) IP
address. There are multiple existing services that can be used for
this; in the following mcron job, @url{https://duckdns.org, DuckDNS} is
used. It should also work with other dynamic DNS services that offer a
similar interface to update the IP address, such as
@url{https://freedns.afraid.org/}, with minor adjustments.
The mcron job is provided below, where @var{DOMAIN} should be
substituted for your own domain prefix, and the DuckDNS provided token
associated to @var{DOMAIN} added to the
@file{/etc/duckdns/@var{DOMAIN}.token} file.
@lisp
(define duckdns-job
;; Update personal domain IP every 5 minutes.
#~(job '(next-minute (range 0 60 5))
#$(program-file
"duckdns-update"
(with-extensions (list guile-gnutls) ;required by (web client)
#~(begin
(use-modules (ice-9 textual-ports)
(web client))
(let ((token (string-trim-both
(call-with-input-file "/etc/duckdns/@var{DOMAIN}.token"
get-string-all)))
(query-template (string-append "https://www.duckdns.org/"
"update?domains=@var{DOMAIN}"
"&token=~a&ip=")))
(http-get (format #f query-template token))))))
"duckdns-update"
#:user "nobody"))
@end lisp
The job then needs to be added to the list of mcron jobs for your
system, using something like:
@lisp
(operating-system
(services
(cons* (service mcron-service-type
(mcron-configuration
(jobs (list duckdns-job ...))))
...
%base-services)))
@end lisp
@node Connecting to Wireguard VPN
@section Connecting to Wireguard VPN
@ -2103,6 +2286,11 @@ this post by thaller}.
@section Customizing a Window Manager
@cindex wm
@menu
* StumpWM::
* Session lock::
@end menu
@node StumpWM
@subsection StumpWM
@cindex stumpwm
@ -2158,6 +2346,10 @@ or it might be something you have to set up yourself. If you use a desktop envir
like GNOME or KDE, it's usually built in. If you use a plain window manager like
StumpWM or EXWM, you might have to set it up yourself.
@menu
* Xorg::
@end menu
@node Xorg
@subsubsection Xorg
@ -2821,8 +3013,8 @@ from foreign libraries or configuration files that are available
system-wide.
@menu
* Guix Containers:: Perfectly isolated environments
* Guix System Containers:: A system inside your system
* Guix Containers:: Perfectly isolated environments
* Guix System Containers:: A system inside your system
@end menu
@node Guix Containers
@ -3006,6 +3198,11 @@ caches or log files, etc. In Guix System the demands of this kind of
software are satisfied through the deployment of system services.
@menu
* A Database Container::
* Container Networking::
@end menu
@node A Database Container
@subsection A Database Container
@ -3208,7 +3405,7 @@ concepts.
reference.
@menu
* Guix Profiles in Practice:: Strategies for multiple profiles and manifests.
* Guix Profiles in Practice:: Strategies for multiple profiles and manifests.
@end menu
@node Guix Profiles in Practice
@ -3287,6 +3484,14 @@ Games.
Let's dive in the set up!
@menu
* Basic setup with manifests::
* Required packages::
* Default profile::
* The benefits of manifests::
* Reproducible profiles::
@end menu
@node Basic setup with manifests
@subsection Basic setup with manifests
@ -3601,7 +3806,7 @@ Guix provides multiple tools to manage environment. This chapter
demonstrate such utilities.
@menu
* Guix environment via direnv:: Setup Guix environment with direnv
* Guix environment via direnv:: Setup Guix environment with direnv
@end menu
@node Guix environment via direnv

258
doc/guix.texi
View file

@ -118,6 +118,7 @@ Copyright @copyright{} 2023 Nathaniel Nicandro@*
Copyright @copyright{} 2023 Tanguy Le Carrour@*
Copyright @copyright{} 2023 Zheng Junjie@*
Copyright @copyright{} 2023 Brian Cully@*
Copyright @copyright{} 2023 Felix Lechner@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -5070,6 +5071,23 @@ opens the door to security vulnerabilities. @xref{Invoking guix pull,
@option{--allow-downgrades}}.
@end quotation
Due to @command{guix time-machine} relying on the ``inferiors''
mechanism (@pxref{Inferiors}), the oldest commit it can travel to is
commit @samp{6298c3ff} (``v1.0.0''), dated May 1@sup{st}, 2019, which is
the first release that included the inferiors mechanism. An error is
returned when attempting to navigate to older commits.
@quotation Note
Although it should technically be possible to travel to such an old
commit, the ease to do so will largely depend on the availability of
binary substitutes. When traveling to a distant past, some packages may
not easily build from source anymore. One such example are old versions
of Python 2 which had time bombs in its test suite, in the form of
expiring SSL certificates. This particular problem can be worked around
by setting the hardware clock to a value in the past before attempting
the build.
@end quotation
The general syntax is:
@example
@ -14530,6 +14548,26 @@ gnu/packages/guile.scm:147:2: guile: updating from version 2.0.10 to version 2.0
@dots{}
@end example
In some specific cases, you may have many packages specified via a
manifest or a module selection which should all be updated together; for
these cases, the @option{--target-version} option can be provided to have
them all refreshed to the same version, as shown in the examples below:
@example
$ guix refresh qtbase qtdeclarative --target-version=6.5.2
gnu/packages/qt.scm:1248:13: qtdeclarative would be upgraded from 6.3.2 to 6.5.2
gnu/packages/qt.scm:584:2: qtbase would be upgraded from 6.3.2 to 6.5.2
@end example
@example
$ guix refresh --manifest=qt5-manifest.scm --target-version=5.15.10
gnu/packages/qt.scm:1173:13: qtxmlpatterns would be upgraded from 5.15.8 to 5.15.10
gnu/packages/qt.scm:1202:13: qtdeclarative would be upgraded from 5.15.8 to 5.15.10
gnu/packages/qt.scm:1762:13: qtserialbus would be upgraded from 5.15.8 to 5.15.10
gnu/packages/qt.scm:2070:13: qtquickcontrols2 would be upgraded from 5.15.8 to 5.15.10
@dots{}
@end example
Sometimes the upstream name differs from the package name used in Guix,
and @command{guix refresh} needs a little help. Most updaters honor the
@code{upstream-name} property in package definitions, which can be used
@ -16925,6 +16963,13 @@ Alternatively, the @code{modify-services} macro can be used:
(delete avahi-service-type))
@end lisp
@quotation Do not panic
@cindex Scheme programming language, getting started
Intimidated by the Scheme language or curious about it? The Cookbook
has a short section to get started that explains the fundamentals, which
you will find helpful when hacking your configuration. @xref{A Scheme
Crash Course,,, guix-cookbook, GNU Guix Cookbook}.
@end quotation
@unnumberedsubsec Instantiating the System
@ -25169,6 +25214,20 @@ There is no need to add this field for contrib extensions such as hstore or
dblink as they are already loadable by postgresql. This field is only
required to add extensions provided by other packages.
@item @code{create-account?} (default: @code{#t})
Whether or not the @code{postgres} user and group should be created.
@item @code{uid} (default: @code{#f})
Explicitly specify the UID of the @code{postgres} daemon account.
You normally do not need to specify this, in which case a free UID will
be automatically assigned.
One situation where this option might be useful is if the @var{data-directory}
is located on a mounted network share.
@item @code{gid} (default: @code{#f})
Explicitly specify the GID of the @code{postgres} group.
@end table
@end deftp
@ -32539,113 +32598,6 @@ network or obtained a DHCP lease from dnsmasq.
@end table
@end deftp
@subsubheading ddclient Service
@cindex ddclient
The ddclient service described below runs the ddclient daemon, which takes
care of automatically updating DNS entries for service providers such as
@uref{https://dyn.com/dns/, Dyn}.
The following example show instantiates the service with its default
configuration:
@lisp
(service ddclient-service-type)
@end lisp
Note that ddclient needs to access credentials that are stored in a
@dfn{secret file}, by default @file{/etc/ddclient/secrets} (see
@code{secret-file} below). You are expected to create this file manually, in
an ``out-of-band'' fashion (you @emph{could} make this file part of the
service configuration, for instance by using @code{plain-file}, but it will be
world-readable @i{via} @file{/gnu/store}). See the examples in the
@file{share/ddclient} directory of the @code{ddclient} package.
@c %start of fragment
Available @code{ddclient-configuration} fields are:
@deftypevr {@code{ddclient-configuration} parameter} package ddclient
The ddclient package.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} integer daemon
The period after which ddclient will retry to check IP and domain name.
Defaults to @samp{300}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} boolean syslog
Use syslog for the output.
Defaults to @samp{#t}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} string mail
Mail to user.
Defaults to @samp{"root"}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} string mail-failure
Mail failed update to user.
Defaults to @samp{"root"}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} string pid
The ddclient PID file.
Defaults to @samp{"/var/run/ddclient/ddclient.pid"}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} boolean ssl
Enable SSL support.
Defaults to @samp{#t}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} string user
Specifies the user name or ID that is used when running ddclient
program.
Defaults to @samp{"ddclient"}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} string group
Group of the user who will run the ddclient program.
Defaults to @samp{"ddclient"}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} string secret-file
Secret file which will be appended to @file{ddclient.conf} file. This
file contains credentials for use by ddclient. You are expected to
create it manually.
Defaults to @samp{"/etc/ddclient/secrets.conf"}.
@end deftypevr
@deftypevr {@code{ddclient-configuration} parameter} list extra-options
Extra options will be appended to @file{ddclient.conf} file.
Defaults to @samp{'()}.
@end deftypevr
@c %end of fragment
@node VNC Services
@subsection VNC Services
@cindex VNC (virtual network computing)
@ -38650,6 +38602,94 @@ parameters, can be done as follow:
@end lisp
@end defvar
@subsubheading Cachefilesd Service
@cindex cachefilesd
@cindex fscache, file system caching (Linux)
The Cachefilesd service starts a daemon that caches network file system
data locally. It is especially useful for NFS and AFS shares, where it
reduces latencies for repeated access when reading files.
The daemon can be configured as follows:
@lisp
(service cachefilesd-service-type
(cachefilesd-configuration
(cache-directory "/var/cache/fscache")))
@end lisp
@defvar cachefilesd-service-type
The service type for starting @command{cachefilesd}. The value for this
service type is a @code{cachefilesd-configuration}, whose only required
field is @var{cache-directory}.
@end defvar
@c %start of fragment
@deftp {Data Type} cachefilesd-configuration
Available @code{cachefilesd-configuration} fields are:
@table @asis
@item @code{cachefilesd} (default: @code{cachefilesd}) (type: file-like)
The cachefilesd package to use.
@item @code{debug-output?} (default: @code{#f}) (type: boolean)
Print debugging output to stderr.
@item @code{use-syslog?} (default: @code{#t}) (type: boolean)
Log to syslog facility instead of stdout.
@item @code{scan?} (default: @code{#t}) (type: boolean)
Scan for cachable objects.
@item @code{cache-directory} (type: maybe-string)
Location of the cache directory.
@item @code{cache-name} (default: @code{"CacheFiles"}) (type: maybe-string)
Name of cache (keep unique).
@item @code{security-context} (type: maybe-string)
SELinux security context.
@item @code{pause-culling-for-block-percentage} (default: @code{7}) (type: maybe-non-negative-integer)
Pause culling when available blocks exceed this percentage.
@item @code{pause-culling-for-file-percentage} (default: @code{7}) (type: maybe-non-negative-integer)
Pause culling when available files exceed this percentage.
@item @code{resume-culling-for-block-percentage} (default: @code{5}) (type: maybe-non-negative-integer)
Start culling when available blocks drop below this percentage.
@item @code{resume-culling-for-file-percentage} (default: @code{5}) (type: maybe-non-negative-integer)
Start culling when available files drop below this percentage.
@item @code{pause-caching-for-block-percentage} (default: @code{1}) (type: maybe-non-negative-integer)
Pause further allocations when available blocks drop below this
percentage.
@item @code{pause-caching-for-file-percentage} (default: @code{1}) (type: maybe-non-negative-integer)
Pause further allocations when available files drop below this
percentage.
@item @code{log2-table-size} (default: @code{12}) (type: maybe-non-negative-integer)
Size of tables holding cullable objects in logarithm of base 2.
@item @code{cull?} (default: @code{#t}) (type: boolean)
Create free space by culling (consumes system load).
@item @code{trace-function-entry-in-kernel-module?} (default: @code{#f}) (type: boolean)
Trace function entry in the kernel module (for debugging).
@item @code{trace-function-exit-in-kernel-module?} (default: @code{#f}) (type: boolean)
Trace function exit in the kernel module (for debugging).
@item @code{trace-internal-checkpoints-in-kernel-module?} (default: @code{#f}) (type: boolean)
Trace internal checkpoints in the kernel module (for debugging).
@end table
@end deftp
@c %end of fragment
@cindex rasdaemon
@cindex Platform Reliability, Availability and Serviceability daemon
@subsubheading Rasdaemon Service
@ -44178,8 +44218,8 @@ font installation path (@file{~/.guix-home/profile/share/fonts}). If
you configure this service directly, be sure to include the above
directory.
A typical extension for adding an additional font directory and setting
a font as the default monospace font might look like this:
Here's how you'd extend it to include fonts installed with the Nix
package manager, and to prefer your favourite monospace font:
@lisp
(simple-service 'additional-fonts-service

8
etc/teams.scm.in
View file

@ -512,7 +512,7 @@ (define-member (person "Jonathan Brielmaier"
(define-member (person "Ludovic Courtès"
"ludo@gnu.org")
core home embedded bootstrap mentors)
core home bootstrap installer mentors)
(define-member (person "Andreas Enge"
"andreas@enge.fr")
@ -614,11 +614,15 @@ (define-member (person "Maxim Cournoyer"
"maxim.cournoyer@gmail.com")
gnome qt telephony)
(define-member (person "Katherine Cox-Buday"
"cox.katherine.e+guix@gmail.com")
emacs go lisp)
(define (find-team name)
(or (hash-ref %teams (string->symbol name))
(error (format #false
"no such team: ~a~%" name))))
"no such team: ~a~%" name))))
(define (find-team-by-scope files)
"Return the team(s) which scope matches at least one of the FILES, as list

15
gnu/local.mk
View file

@ -588,7 +588,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/squirrel.scm \
%D%/packages/ssh.scm \
%D%/packages/sssd.scm \
%D%/packages/stalonetray.scm \
%D%/packages/statistics.scm \
%D%/packages/stb.scm \
%D%/packages/stenography.scm \
@ -770,6 +769,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests.scm \
%D%/tests/audio.scm \
%D%/tests/base.scm \
%D%/tests/cachefilesd.scm \
%D%/tests/ci.scm \
%D%/tests/cups.scm \
%D%/tests/databases.scm \
@ -1056,7 +1056,6 @@ dist_patch_DATA = \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
%D%/packages/patches/ddclient-skip-test.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \
@ -1089,7 +1088,7 @@ dist_patch_DATA = \
%D%/packages/patches/elm-ghc9.2.patch \
%D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-reactor-static-files.patch \
%D%/packages/patches/elogind-revert-polkit-detection.patch \
%D%/packages/patches/elogind-fix-rpath.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \
@ -1137,6 +1136,7 @@ dist_patch_DATA = \
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
%D%/packages/patches/fbreader-curl-7.62.patch \
%D%/packages/patches/fbreader-fix-icon.patch \
%D%/packages/patches/fenics-dolfin-algorithm.patch \
%D%/packages/patches/fenics-dolfin-demo-init.patch \
%D%/packages/patches/fenics-dolfin-boost.patch \
@ -1373,6 +1373,7 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/heimdal-CVE-2022-45142.patch \
%D%/packages/patches/helm-fix-gcc-9-build.patch \
%D%/packages/patches/highlight-gui-data-dir.patch \
%D%/packages/patches/http-parser-CVE-2020-8287.patch \
%D%/packages/patches/htslib-for-stringtie.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
@ -1588,14 +1589,13 @@ dist_patch_DATA = \
%D%/packages/patches/maxima-defsystem-mkdir.patch \
%D%/packages/patches/maven-generate-component-xml.patch \
%D%/packages/patches/maven-generate-javax-inject-named.patch \
%D%/packages/patches/mcrl2-fix-1687.patch \
%D%/packages/patches/mcrl2-fix-counterexample.patch \
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
%D%/packages/patches/libsigrokdecode-python3.9-fix.patch \
%D%/packages/patches/maturin-no-cross-compile.patch \
%D%/packages/patches/mecab-variable-param.patch \
%D%/packages/patches/memtest86+-build-reproducibly.patch \
%D%/packages/patches/mercurial-hg-extension-path.patch \
@ -1684,7 +1684,6 @@ dist_patch_DATA = \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \
%D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \
%D%/packages/patches/openssh-hurd.patch \
%D%/packages/patches/openssh-trust-guix-store-directory.patch \
%D%/packages/patches/openresolv-restartcmd-guix.patch \
%D%/packages/patches/openrgb-unbundle-hueplusplus.patch \
@ -1779,6 +1778,7 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.patch \
%D%/packages/patches/plotutils-spline-test.patch \
%D%/packages/patches/po4a-partial-texinfo-menu-fix.patch \
%D%/packages/patches/polkit-disable-systemd.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \
@ -1913,12 +1913,13 @@ dist_patch_DATA = \
%D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
%D%/packages/patches/rustc-1.54.0-src.patch \
%D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \
%D%/packages/patches/rust-ring-0.16-missing-files.patch \
%D%/packages/patches/rust-ring-0.16-test-files.patch \
%D%/packages/patches/i3status-rust-enable-unstable-features.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
%D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \
%D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \

4
gnu/packages/accessibility.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz@gmail.com>
;;; Copyright © 2023 Ivan Gankevich <igankevich@capybaramail.xyz>
;;;
@ -212,7 +212,7 @@ (define-public florence
(inputs
(list libxml2
libglade
librsvg
(librsvg-for-system)
gstreamer
cairo
gtk+

9
gnu/packages/admin.scm
View file

@ -55,7 +55,7 @@
;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022, 2023 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Lu Hui <luhux76@gmail.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
@ -4025,6 +4025,11 @@ (define-public uwufetch
(delete 'configure)
(add-before 'build 'patch-source-paths
(lambda _
(substitute* "fetch.c"
(("grep")
#$(file-append grep "/bin/grep"))
(("awk")
#$(file-append gawk "/bin/awk")))
(substitute* "uwufetch.c"
(("(/usr(/local)?)(.*;)" all _ _ rest)
(string-append #$output rest)))))
@ -4033,6 +4038,8 @@ (define-public uwufetch
(lambda _
(mkdir-p (string-append #$output "/include")))))))
(inputs (list lshw
gawk
grep
;; viu XXX not yet packaged in Guix
xwininfo))
(home-page "https://github.com/TheDarkBug/uwufetch")

15
gnu/packages/audio.scm
View file

@ -37,7 +37,7 @@
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
;;; Copyright © 2022, 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
;;; Copyright © 2022 Andy Tai <atai@atai.org>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
@ -5936,14 +5936,14 @@ (define-public ableton-link
(define-public butt
(package
(name "butt")
(version "0.1.34")
(version "0.1.38")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/butt/butt/butt-"
version "/butt-" version ".tar.gz"))
(sha256
(base32
"0zd1g1673pv8z437y34fllxska8dzpd7mygpham35pzwpdyc5c1p"))
"10i3xpxzccdl4pidiyymw9cfavhy50yhn7xi5bd77y91f2903kp9"))
(modules '((guix build utils)))
(snippet
'(substitute* "src/butt.cpp"
@ -5966,9 +5966,10 @@ (define-public butt
(uri (string-append "https://danielnoethen.de/butt/butt-"
version "_manual.pdf"))
(sha256
(base32 "0kadqzzbk25n0aqxgbqhg4mq4hsbjq44phzcx5qj1b8847yzz8si"))))))
(base32 "04aixxqshfj11ja3ifh0zvywl2mqzmymppcd0xj8sv0j7whjibaq"))))))
(inputs
(list dbus
(list curl
dbus
flac
fltk
lame
@ -6253,7 +6254,7 @@ (define-public odio-sacd
(define-public qpwgraph
(package
(name "qpwgraph")
(version "0.4.5")
(version "0.5.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6262,7 +6263,7 @@ (define-public qpwgraph
(file-name (git-file-name name version))
(sha256
(base32
"06pgkma0i9dbir74cfhgnnkqjcq8z496by4lk1whqcj7j9ldbi2l"))))
"186c3s56py8xjasbp4380m9sqdba9mf7mppqz8hkli1nhbspbix9"))))
(build-system cmake-build-system)
(arguments (list #:tests? #f)) ;; no tests
(inputs (list alsa-lib

4
gnu/packages/backup.scm
View file

@ -1401,14 +1401,14 @@ (define-public vorta
(define-public grsync
(package
(name "grsync")
(version "1.3.0")
(version "1.3.1")
(source (origin
(method url-fetch)
(uri (string-append "http://www.opbyte.it/release/"
"grsync-" version ".tar.gz"))
(sha256
(base32
"1z1m782b50x348kgynzf753apy8yszkl31y32y1jsc055skcdixp"))))
"1ly6ng211wj9sc0la73jsz2lviwd7b4a7bhw16kmnbm6v8jhxk1k"))))
(build-system gnu-build-system)
(native-inputs (list intltool pkg-config))
(inputs (list gtk+))

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

@ -14,7 +14,7 @@
;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
;;;
;;; This file is part of GNU Guix.
;;;

6
gnu/packages/ci.scm
View file

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

4
gnu/packages/conky.scm
View file

@ -40,7 +40,7 @@ (define-public conky
(package
(name "conky")
(home-page "https://github.com/brndnmtthws/conky")
(version "1.19.2")
(version "1.19.3")
(source
(origin
(method git-fetch)
@ -49,7 +49,7 @@ (define-public conky
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "196wqr477fch1152cqmf11ckwrgkk2wmhl56ms6jk19hfs83d980"))))
(base32 "079s6icvcrryhj71qya4rnyc6pdjq488l0gjqrrblycgzppn1pas"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags

4
gnu/packages/cpp.scm
View file

@ -783,7 +783,7 @@ (define-public spscqueue
(define-public gperftools
(package
(name "gperftools")
(version "2.10")
(version "2.11")
(source
(origin
(method git-fetch)
@ -791,7 +791,7 @@ (define-public gperftools
(url "https://github.com/gperftools/gperftools")
(commit (string-append "gperftools-" version))))
(sha256
(base32 "0s9qhx940s8q6glc8sw74k5gs8hdhjfigq20zci92qawgm7zsicm"))
(base32 "1mwsa4y696m8zjya0k7xzr9vsgb24dq4aq13m21hb5ygy7nh47id"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments

4
gnu/packages/cran.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2019 Nicolò Balzarotti <anothersms@gmail.com>
;;; Copyright © 2019, 2020, 2021, 2022 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2019 Arne Babenhauserheide <arne_bab@web.de>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Todor Kondić <tk.code@protonmail.com>
;;; Copyright © 2020 Danjela Lura <danielaluraa@gmail.com>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
@ -29400,7 +29400,7 @@ (define-public r-rsvg
(properties `((upstream-name . "rsvg")))
(build-system r-build-system)
(inputs
(list librsvg zlib))
(list (librsvg-for-system) zlib))
(native-inputs
(list pkg-config r-knitr))
(home-page "https://github.com/jeroen/rsvg#readme")

241
gnu/packages/crates-gtk.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
@ -902,24 +902,25 @@ (define-public rust-gio-0.8
("rust-serial-test" ,rust-serial-test-0.1)
("rust-serial-test-derive" ,rust-serial-test-derive-0.1))))))
(define-public rust-gio-sys-0.15
(define-public rust-gio-sys-0.17
(package
(name "rust-gio-sys")
(version "0.15.10")
(source
(origin
(method url-fetch)
(uri (crate-uri "gio-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "13fgmc2xdzg9qk9l3nlp1bilwn6466mrqbiq4fhc9qkia93pl59j"))))
(version "0.17.10")
(source (origin
(method url-fetch)
(uri (crate-uri "gio-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1hr84vgpz1hbs9q7wgvpnwhbxwh9kim0z5aqv6v6ki0j1b1qgkqc"))))
(build-system cargo-build-system)
(arguments
`(;; FIXME: some GLib macros are not found
`(;; XXX: Tests are sensitive to the version of glib, even though
;; the library supports a wide range. Skip for now.
#:tests? #f
#:cargo-inputs
(("rust-glib-sys" ,rust-glib-sys-0.15)
("rust-gobject-sys" ,rust-gobject-sys-0.15)
(("rust-glib-sys" ,rust-glib-sys-0.17)
("rust-gobject-sys" ,rust-gobject-sys-0.17)
("rust-libc" ,rust-libc-0.2)
("rust-system-deps" ,rust-system-deps-6)
("rust-winapi" ,rust-winapi-0.3))
@ -944,6 +945,40 @@ (define-public rust-gio-sys-0.15
(description "This package provides FFI bindings to libgio-2.0.")
(license license:expat)))
(define-public rust-gio-sys-0.15
(package
(inherit rust-gio-sys-0.17)
(name "rust-gio-sys")
(version "0.15.10")
(source
(origin
(method url-fetch)
(uri (crate-uri "gio-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "13fgmc2xdzg9qk9l3nlp1bilwn6466mrqbiq4fhc9qkia93pl59j"))))
(arguments
`(;; FIXME: some GLib macros are not found
#:tests? #f
#:cargo-inputs
(("rust-glib-sys" ,rust-glib-sys-0.15)
("rust-gobject-sys" ,rust-gobject-sys-0.15)
("rust-libc" ,rust-libc-0.2)
("rust-system-deps" ,rust-system-deps-6)
("rust-winapi" ,rust-winapi-0.3))
#:cargo-development-inputs
(("rust-shell-words" ,rust-shell-words-1)
("rust-tempfile" ,rust-tempfile-3))
#:phases (modify-phases %standard-phases
(add-before 'check 'extend-include-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((gio-headers (search-input-directory
inputs "include/gio-unix-2.0")))
;; Tests rely on these headers.
(setenv "C_INCLUDE_PATH"
(string-append gio-headers ":"
(getenv "C_INCLUDE_PATH")))))))))))
(define-public rust-gio-sys-0.14
(package
(inherit rust-gio-sys-0.15)
@ -1030,8 +1065,56 @@ (define-public rust-gir-format-check-0.1
(description "File format checker in Rust.")
(license license:expat)))
(define-public rust-glib-0.17
(package
(name "rust-glib")
(version "0.17.10")
(source (origin
(method url-fetch)
(uri (crate-uri "glib" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0jqlipn9zixj8fpqlg45v0f06j2ghdz72cml2akcxlnlm1dx9ynk"))))
(build-system cargo-build-system)
(arguments
`(;; XXX: Tests are sensitive to the version of glib, even though
;; the library supports a wide range. Skip for now.
#:tests? #f
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-futures-channel" ,rust-futures-channel-0.3)
("rust-futures-core" ,rust-futures-core-0.3)
("rust-futures-executor" ,rust-futures-executor-0.3)
("rust-futures-task" ,rust-futures-task-0.3)
("rust-futures-util" ,rust-futures-util-0.3)
("rust-gio-sys" ,rust-gio-sys-0.17)
("rust-glib-macros" ,rust-glib-macros-0.17)
("rust-glib-sys" ,rust-glib-sys-0.17)
("rust-gobject-sys" ,rust-gobject-sys-0.17)
("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4)
("rust-memchr" ,rust-memchr-2)
("rust-once-cell" ,rust-once-cell-1)
("rust-smallvec" ,rust-smallvec-1)
("rust-thiserror" ,rust-thiserror-1))
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.4)
("rust-gir-format-check" ,rust-gir-format-check-0.1)
("rust-tempfile" ,rust-tempfile-3)
("rust-trybuild2" ,rust-trybuild2-1))))
(native-inputs
(list pkg-config))
(inputs
(list glib))
(home-page "https://gtk-rs.org/")
(synopsis "Rust bindings for the GLib library")
(description "Rust bindings for the GLib library")
(license license:expat)))
(define-public rust-glib-0.15
(package
(inherit rust-glib-0.17)
(name "rust-glib")
(version "0.15.12")
(source
@ -1041,7 +1124,6 @@ (define-public rust-glib-0.15
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0pahikbwxr3vafdrr5l2hnlhkf9xi4illryan0l59ayhp9pk1c7d"))))
(build-system cargo-build-system)
(arguments
`(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
#:tests? #f
@ -1062,15 +1144,7 @@ (define-public rust-glib-0.15
#:cargo-development-inputs
(("rust-futures-util" ,rust-futures-util-0.3)
("rust-gir-format-check" ,rust-gir-format-check-0.1)
("rust-tempfile" ,rust-tempfile-3))))
(native-inputs
(list pkg-config))
(inputs
(list glib))
(home-page "https://gtk-rs.org/")
(synopsis "Rust bindings for the GLib library")
(description "Rust bindings for the GLib library")
(license license:expat)))
("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-glib-0.14
(package
@ -1160,8 +1234,43 @@ (define-public rust-glib-0.9
#:cargo-development-inputs
(("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-glib-macros-0.17
(package
(name "rust-glib-macros")
(version "0.17.10")
(source (origin
(method url-fetch)
(uri (crate-uri "glib-macros" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"09nyh22nryip4i22mdrixzl4q0r5h5lxcn40mgqr30rk6y9wg9gc"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-heck" ,rust-heck-0.4)
("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
("rust-proc-macro-error" ,rust-proc-macro-error-1)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))
#:cargo-development-inputs
(("rust-glib" ,rust-glib-0.17)
("rust-once-cell" ,rust-once-cell-1)
("rust-trybuild2" ,rust-trybuild2-1))))
(native-inputs
(list pkg-config))
(inputs
(list glib))
(home-page "https://gtk-rs.org/")
(synopsis "Rust bindings for the GLib library, proc macros crate")
(description "Rust bindings for the GLib library, proc macros crate.")
(license license:expat)))
(define-public rust-glib-macros-0.15
(package
(inherit rust-glib-macros-0.17)
(name "rust-glib-macros")
(version "0.15.11")
(source
@ -1171,7 +1280,6 @@ (define-public rust-glib-macros-0.15
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5"))))
(build-system cargo-build-system)
(arguments
`(;; XXX: Circular dependency on rust-glib??
#:tests? #f
@ -1182,11 +1290,7 @@ (define-public rust-glib-macros-0.15
("rust-proc-macro-error" ,rust-proc-macro-error-1)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
(home-page "https://gtk-rs.org/")
(synopsis "Rust bindings for the GLib library, proc macros crate")
(description "Rust bindings for the GLib library, proc macros crate.")
(license license:expat)))
("rust-syn" ,rust-syn-1))))))
(define-public rust-glib-macros-0.14
(package
@ -1237,17 +1341,17 @@ (define-public rust-glib-macros-0.10
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))))
(define-public rust-glib-sys-0.15
(define-public rust-glib-sys-0.17
(package
(name "rust-glib-sys")
(version "0.15.10")
(version "0.17.10")
(source (origin
(method url-fetch)
(uri (crate-uri "glib-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg"))))
"1w64ppa12s9ky6gfdaqhq9w30ad6hskll812jb3sl2xsggmac2nq"))))
(build-system cargo-build-system)
(arguments
`(;; XXX: Tests are sensitive to the version of glib, even though
@ -1268,6 +1372,29 @@ (define-public rust-glib-sys-0.15
(description "This package provides FFI bindings to libglib-2.0.")
(license license:expat)))
(define-public rust-glib-sys-0.15
(package
(inherit rust-glib-sys-0.17)
(name "rust-glib-sys")
(version "0.15.10")
(source (origin
(method url-fetch)
(uri (crate-uri "glib-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg"))))
(arguments
`(;; XXX: Tests are sensitive to the version of glib, even though
;; the library supports a wide range. Skip for now.
#:tests? #f
#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-system-deps" ,rust-system-deps-6))
#:cargo-development-inputs
(("rust-shell-words" ,rust-shell-words-1)
("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-glib-sys-0.14
(package
(inherit rust-glib-sys-0.15)
@ -1335,25 +1462,24 @@ (define-public rust-glib-sys-0.9
(("rust-shell-words" ,rust-shell-words-0.1)
("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-gobject-sys-0.15
(define-public rust-gobject-sys-0.17
(package
(name "rust-gobject-sys")
(version "0.15.10")
(source
(origin
(method url-fetch)
(uri (crate-uri "gobject-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "02hyilvpi4hw4gr03z2plsbf1zicsfs5l0xxadqx3v3b4i2cwmqd"))))
(version "0.17.10")
(source (origin
(method url-fetch)
(uri (crate-uri "gobject-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ql0pcab6dxjapiglxcjaavbbh1sznyc2wj5q273b9j0fwqw6d6d"))))
(build-system cargo-build-system)
(arguments
`(;; FIXME: Constant value mismatch for G_TYPE_FUNDAMENTAL_MAX
;; Rust: "255"
;; C: "1020"
`(;; XXX: Tests are sensitive to the version of glib, even though
;; the library supports a wide range. Skip for now.
#:tests? #f
#:cargo-inputs
(("rust-glib-sys" ,rust-glib-sys-0.15)
(("rust-glib-sys" ,rust-glib-sys-0.17)
("rust-libc" ,rust-libc-0.2)
("rust-system-deps" ,rust-system-deps-6))
#:cargo-development-inputs
@ -1368,6 +1494,31 @@ (define-public rust-gobject-sys-0.15
(description "This package provides FFI bindings to libgobject-2.0.")
(license license:expat)))
(define-public rust-gobject-sys-0.15
(package
(inherit rust-gobject-sys-0.17)
(name "rust-gobject-sys")
(version "0.15.10")
(source
(origin
(method url-fetch)
(uri (crate-uri "gobject-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "02hyilvpi4hw4gr03z2plsbf1zicsfs5l0xxadqx3v3b4i2cwmqd"))))
(arguments
`(;; FIXME: Constant value mismatch for G_TYPE_FUNDAMENTAL_MAX
;; Rust: "255"
;; C: "1020"
#:tests? #f
#:cargo-inputs
(("rust-glib-sys" ,rust-glib-sys-0.15)
("rust-libc" ,rust-libc-0.2)
("rust-system-deps" ,rust-system-deps-6))
#:cargo-development-inputs
(("rust-shell-words" ,rust-shell-words-1)
("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-gobject-sys-0.14
(package
(inherit rust-gobject-sys-0.15)

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

File diff suppressed because it is too large Load diff

18
gnu/packages/databases.scm
View file

@ -1190,14 +1190,14 @@ (define-public galera
(define-public postgresql-15
(package
(name "postgresql")
(version "15.3")
(version "15.4")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0cnrk5jrwfqkcx8mlg761s60ninqrsxpzasf7xfbzzq03y4x9izz"))
"1yf8cfg9j2pfxh5lxfaq1ifbvrcvv2g5vjxnadk36ds4vi5mmv5s"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
@ -1265,27 +1265,27 @@ (define-public postgresql-14
(define-public postgresql-13
(package
(inherit postgresql-14)
(version "13.11")
(version "13.12")
(source (origin
(inherit (package-source postgresql-14))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"1yqbwnzgdgaim476smwkdj2jd6j92x9xqm2f1mknnmh3f9jgz4j9"))))))
"12r1kwjaclq2qn4qg3k6j0asrs4r0k0g1fkdpb3pnjsiwg7fv88d"))))))
(define-public postgresql-11
(package
(inherit postgresql-13)
(name "postgresql")
(version "11.20")
(version "11.21")
(source (origin
(inherit (package-source postgresql-13))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"1kmcnnc2nwjxv042b8bxbdxdgfksxvgmfhh4999rhzjays18hz1x"))))
"0l7qrwzwyiy5dwg6j7nnd9mq245sycc4gcv6a6r7gpfmf5s87c07"))))
(native-inputs
(modify-inputs (package-native-inputs postgresql-13)
(replace "docbook-xml" docbook-xml-4.2)))))
@ -1850,8 +1850,8 @@ (define-public sqitch
(define-public sqlcrush
;; Unfortunately, there is no proper upstream release and may never be.
(let ((commit "b5f6868f189566a26eecc78d0f0659813c1aa98a")
(revision "1"))
(let ((commit "502a583e97a84efdeb48e59f1bfe403daa9681ee")
(revision "2"))
(package
(name "sqlcrush")
(version (git-version "0.1.5" revision commit))
@ -1863,7 +1863,7 @@ (define-public sqlcrush
(file-name (git-file-name name version))
(sha256
(base32
"0x3wy40r93p0jv3nbwj9a77wa4ff697d13r0wffmm7q9h3mzsww8"))))
"0x2q4m9ryw68kifalnm3x4bv9v2xrc2ffsiap8m9wnw6lf1h05la"))))
(build-system python-build-system)
(inputs
(list python-cryptography python-psycopg2 python-pymysql

6
gnu/packages/dezyne.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,14 +32,14 @@ (define-module (gnu packages dezyne)
(define-public dezyne
(package
(name "dezyne")
(version "2.17.3")
(version "2.17.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://dezyne.org/download/dezyne/"
name "-" version ".tar.gz"))
(sha256
(base32 "0x2aqfvbxhiwxj6vm17g7dkxwj8skcs9pg3a3l1x9pxy7v22wxd7"))))
(base32 "15jhi17f0aqnlznvpf6lkz2y837xkzf8chi9rhhb55920vqf6cgg"))))
(inputs (list bash-minimal
guile-3.0-latest
guile-json-4

74
gnu/packages/disk.scm
View file

@ -1131,7 +1131,7 @@ (define-public libblockdev
(define-public rmlint
(package
(name "rmlint")
(version "2.10.1")
(version "2.10.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1140,48 +1140,44 @@ (define-public rmlint
(file-name (git-file-name name version))
(sha256
(base32
"15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"))))
"0sk4v1chnk2hvzi92svyf8qgamfs4fvial90qwx4a7dayxhkbsm4"))))
(build-system scons-build-system)
(arguments
`(#:scons ,scons-python2
#:scons-flags (list (string-append "--prefix=" %output)
(string-append "--actual-prefix=" %output))
#:tests? #f ; No tests?
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'scons-propagate-environment
(lambda* (#:key inputs #:allow-other-keys)
;; TODO: `rmlint --gui` fails with
;; "Failed to load shredder: No module named 'shredder'".
;; The GUI might also need extra dependencies, such as
;; python-gobject, python-cairo, dconf, librsvg, gtksourceview3.
(substitute* "lib/cmdline.c"
(("const char \\*commands\\[\\] = \\{\"python3\", \"python\", NULL\\};")
(string-append
"const char *commands[] = {\""
(assoc-ref inputs "python") "/bin/python"
"\", \"python\", NULL};")))
;; By design, SCons does not, by default, propagate
;; environment variables to subprocesses. See:
;; <http://comments.gmane.org/gmane.linux.distributions.nixos/4969>
;; Here, we modify the SConstruct file to arrange for
;; environment variables to be propagated.
(substitute* "SConstruct"
(("^env = Environment\\(.*\\)" all)
(string-append
all
"\nenv['ENV']=os.environ"))))))))
(list
#:scons scons-python2
#:scons-flags
#~(list (string-append "--prefix=" #$output)
(string-append "--actual-prefix=" #$output))
#:tests? #f ; no tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'scons-propagate-environment
(lambda* (#:key inputs #:allow-other-keys)
;; TODO: `rmlint --gui` fails with
;; "Failed to load shredder: No module named 'shredder'".
;; The GUI might also need extra dependencies, such as
;; python-gobject, python-cairo, dconf, librsvg, gtksourceview3.
(substitute* "lib/cmdline.c"
(("const char \\*commands\\[\\] = \\{\"python3\", \"python\", NULL\\};")
(string-append "const char *commands[] = {\""
(search-input-file inputs "/bin/python")
"\", \"python\", NULL};")))
;; By design, SCons does not, by default, propagate
;; environment variables to subprocesses. See:
;; <http://comments.gmane.org/gmane.linux.distributions.nixos/4969>
;; Here, we modify the SConstruct file to arrange for
;; environment variables to be propagated.
(substitute* "SConstruct"
(("^env = Environment\\(.*\\)" all)
(string-append all "\nenv['ENV']=os.environ"))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib:bin" ,glib "bin")
("python-sphinx" ,python-sphinx)))
(list `(,glib "bin") pkg-config python-sphinx))
(inputs
`(("python" ,python-wrapper)
("glib" ,glib)
("libelf" ,libelf)
("elfutils" ,elfutils)
("json-glib" ,json-glib)
("libblkid" ,util-linux "lib")))
(list elfutils
glib
json-glib
python-wrapper
`(,util-linux "lib")))
(home-page "https://rmlint.rtfd.org")
(synopsis "Remove duplicates and other lint from the file system")
(description "@command{rmlint} finds space waste and other broken things

4
gnu/packages/display-managers.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@ -421,7 +421,7 @@ (define-public lightdm-gtk-greeter
bash-minimal ;for wrap-program
gtk+
guile-3.0
librsvg
(librsvg-for-system)
libxklavier
lightdm
shared-mime-info))

71
gnu/packages/dns.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2018, 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@ -91,8 +91,7 @@ (define-module (gnu packages dns)
#:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial))
#:use-module (guix build-system meson))
(define-public cloudflare-cli
(let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")
@ -1067,72 +1066,6 @@ (define-public knot-resolver
license:cc0
license:lgpl2.0))))
(define-public ddclient
(package
(name "ddclient")
(version "3.10.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ddclient/ddclient")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0l87d72apwrg6ipc9gix5gv64d4hr1ykxmss8x4r8d8mgj6j8rf1"))
(modules '((guix build utils)))
(snippet
;; XXX: erroneous version value, this is fixed in master
#~(begin
(substitute* "configure.ac"
(("3.10.0_2") #$version))))
(patches (search-patches "ddclient-skip-test.patch"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake libtool
perl-test-warnings perl-test-mockmodule))
(inputs
(list inetutils ; logger
net-tools
bash-minimal ;for 'wrap-program'
perl
perl-digest-sha1
perl-io-socket-ssl
perl-io-socket-inet6 ;; XXX: this is likely to be removed in a future ddclient release
;; https://github.com/ddclient/ddclient/issues/461
perl-json))
(arguments
(list
#:configure-flags #~(list "--localstatedir=/var")
#:phases
#~(modify-phases %standard-phases
(replace 'install
(lambda _
;; XXX: Do not create /var
(invoke "make" "localstatedir=/tmp/discard" "install")))
(add-after 'wrap 'wrap-ddclient
(lambda* (#:key inputs #:allow-other-keys)
(wrap-program (string-append #$output "/bin/ddclient")
`("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:))
`("PATH" prefix ,(map (lambda (x)
(string-append (assoc-ref inputs x) "/bin"))
'("inetutils" "net-tools")))))))))
(native-search-paths
(list $SSL_CERT_DIR $SSL_CERT_FILE))
(home-page "https://ddclient.net/")
(synopsis "Address updating utility for dynamic DNS services")
(description "This package provides a client to update dynamic IP
addresses with several dynamic DNS service providers, such as
@uref{https://www.dyndns.com/account/login.html,DynDNS.com}.
This makes it possible to use a fixed hostname (such as myhost.dyndns.org) to
access a machine with a dynamic IP address.
The client supports both dynamic and (near) static services, as well as MX
record and alternative name management. It caches the address, and only
attempts the update when it has changed.")
(license license:gpl2+)))
(define-public hnsd
(package
(name "hnsd")

4
gnu/packages/dunst.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@ -69,7 +69,7 @@ (define-public dunst
which))
(inputs
(list dbus
librsvg ; for svg support
(librsvg-for-system) ; for svg support
glib
cairo
pango

3
gnu/packages/ebook.scm
View file

@ -454,7 +454,8 @@ (define-public fbreader
(sha256
(base32
"0c0s4silpax74kwfz3dfmzn4lkv6jsyb800vfak166vii0hvbv3d"))
(patches (search-patches "fbreader-curl-7.62.patch"))))
(patches (search-patches "fbreader-curl-7.62.patch"
"fbreader-fix-icon.patch"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)

6
gnu/packages/education.scm
View file

@ -116,7 +116,7 @@ (define-public gcompris
":" (or (getenv "CPATH") ""))))))))
(inputs
`(("gtk+" ,gtk+-2)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libxml2" ,libxml2)
("sdl-mixer" ,sdl-mixer)
("sqlite" ,sqlite)
@ -876,7 +876,7 @@ (define-public t4k-common
(inputs
`(("font-andika" ,font-sil-andika)
("libpng" ,libpng)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libxml2" ,libxml2)
("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net sdl-pango)))))
(home-page "https://github.com/tux4kids/t4kcommon")
@ -932,7 +932,7 @@ (define-public tuxmath
(native-inputs
(list pkg-config))
(inputs
`(("librsvg" ,librsvg)
`(("librsvg" ,(librsvg-for-system))
("libxml2" ,libxml2)
("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net sdl-pango)))
("t4k-common" ,t4k-common)))

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

@ -9052,6 +9052,30 @@ (define-public emacs-math-symbol-lists
@code{company-math}.")
(license license:gpl3+)))
(define-public emacs-math-preview
(package
(name "emacs-math-preview")
(version "5.1.1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://gitlab.com/matsievskiysv/math-preview")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ni08900p0pbajw143iw0b7a62qiqcm9b6jy7pqgpn437vydjx1z"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-dash emacs-s))
(home-page "https://gitlab.com/matsievskiysv/math-preview")
(synopsis "Preview TeX math equations inline using MathJax")
(description
"Emacs math-preview uses MathJax for displaying TeX, MathML and AsciiMath
math inline in Emacs buffers.")
(license license:gpl3+)))
(define-public emacs-company-coq
(package
(name "emacs-company-coq")
@ -23891,7 +23915,7 @@ (define-public emacs-mbsync
(define-public emacs-ibrowse
(package
(name "emacs-ibrowse")
(version "0.1.8")
(version "0.2.2")
(source
(origin
(method git-fetch)
@ -23900,9 +23924,9 @@ (define-public emacs-ibrowse
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya"))))
(base32 "1dm46k67smg2m33c6n68blpw2mw7fx1ymq81kv54jjlpmv3xrdsf"))))
(build-system emacs-build-system)
(inputs (list sqlite))
(inputs (list emacs-websocket sqlite))
(home-page "https://git.sr.ht/~ngraves/ibrowse.el")
(synopsis "Interact with your browser from emacs")
(description "This package provides some commands to act on the browser

2
gnu/packages/engineering.scm
View file

@ -3223,7 +3223,7 @@ (define-public pcb2gcode
gerbv
glibmm
gtkmm-2
librsvg))
(librsvg-for-system)))
(native-inputs
(list autoconf automake libtool pkg-config))
(home-page "https://github.com/pcb2gcode/pcb2gcode")

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

@ -1725,7 +1725,12 @@ (define-public dbxfs
(sha256
(base32
"1vzfhw3z2r0rb6s0qdzirh3pl7rv1z8xmxa0z5h7h1wqhpl05ai7"))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch"))
(snippet
#~(begin (use-modules (guix build utils))
;; Don't check for package updates.
(substitute* "dbxfs/main.py"
(("if version") "if false"))))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ; tests requires safefs

4
gnu/packages/fonts.scm
View file

@ -1858,7 +1858,7 @@ (define-public font-iosevka-comfy
(define-public font-sarasa-gothic
(package
(name "font-sarasa-gothic")
(version "0.41.4")
(version "0.41.6")
(source
(origin
(method url-fetch)
@ -1866,7 +1866,7 @@ (define-public font-sarasa-gothic
"/releases/download/v" version
"/sarasa-gothic-ttc-" version ".7z"))
(sha256
(base32 "0rqw6wrr55alsld8a9vk5g6n7zyivfh2zpw4my72qz3nfp448fs2"))))
(base32 "1l238rx9nw6acxy5k5b7bjd8br8cnivdlyly7r20w1b36gscl878"))))
(build-system font-build-system)
(arguments
`(#:phases (modify-phases %standard-phases

132
gnu/packages/freedesktop.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -339,7 +339,7 @@ (define-public libglib-testing
(define-public malcontent
(package
(name "malcontent")
(version "0.8.0")
(version "0.11.1")
(source
(origin
(method git-fetch)
@ -348,7 +348,7 @@ (define-public malcontent
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3"))))
(base32 "0g622ig5ffrzk9184xff3lardk7rnmkvj8y5g6h6s41bfh51b71m"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -359,25 +359,26 @@ (define-public malcontent
(lambda _
(substitute* "libmalcontent/tests/app-filter.c"
(("g_test_add_func \\(\"/app-filter/appinfo\", test_app_filter_appinfo\\);")
""))
#t)))))
"")))))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("gtk+:bin" ,gtk+ "bin")
("itstool" ,itstool)
("libglib-testing" ,libglib-testing)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)))
(list desktop-file-utils
gettext-minimal
`(,glib "bin")
gobject-introspection
`(,gtk "bin")
itstool
libglib-testing
libxml2
pkg-config))
(inputs
(list accountsservice
appstream
appstream-glib
dbus
flatpak
glib
gtk+
gtk
libadwaita
libostree
linux-pam
polkit))
@ -644,7 +645,7 @@ (define-public libxdg-basedir
(define-public elogind
(package
(name "elogind")
(version "246.10")
(version "252.9")
(source (origin
(method git-fetch)
(uri (git-reference
@ -653,25 +654,30 @@ (define-public elogind
(file-name (git-file-name name version))
(sha256
(base32
"16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq"))
(patches (search-patches
"elogind-revert-polkit-detection.patch"))))
"049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
(patches (search-patches "elogind-fix-rpath.patch"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
,#~(let* ((out #$output)
(sysconf (string-append out "/etc"))
(libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d"))
(dbus-data (string-append out "/share/dbus-1"))
(dbuspolicy (string-append dbus-data "/system.d"))
(dbussessionservice (string-append dbus-data "/services"))
(dbussystemservice (string-append dbus-data
"/system-services"))
(dbusinterfaces (string-append dbus-data "/interfaces"))
#$@(if (not (target-riscv64?))
#~((kexec-tools #$(this-package-input "kexec-tools")))
#~())
#~((kexec-tools #$(this-package-input "kexec-tools")))
#~())
(shadow #$(this-package-input "shadow"))
(shepherd #$(this-package-input "shepherd"))
(halt-path (string-append shepherd "/sbin/halt"))
#$@(if (not (target-riscv64?))
#~((kexec-path (string-append kexec-tools "/sbin/kexec")))
#~())
#~((kexec-path (string-append kexec-tools "/sbin/kexec")))
#~())
(nologin-path (string-append shadow "/sbin/nologin"))
(poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot")))
@ -680,12 +686,15 @@ (define-public elogind
(string-append "-Dsysconfdir=" sysconf)
(string-append "-Drootlibexecdir=" libexec)
(string-append "-Ddbuspolicydir=" dbuspolicy)
(string-append "-Ddbussessionservicedir=" dbussessionservice)
(string-append "-Ddbussystemservicedir=" dbussystemservice)
(string-append "-Ddbus-interfaces-dir=" dbusinterfaces)
(string-append "-Dc_link_args=-Wl,-rpath=" libexec)
(string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
(string-append "-Dhalt-path=" halt-path)
#$@(if (not (target-riscv64?))
#~((string-append "-Dkexec-path=" kexec-path))
#~())
#~((string-append "-Dkexec-path=" kexec-path))
#~())
(string-append "-Dpoweroff-path=" poweroff-path)
(string-append "-Dreboot-path=" reboot-path)
(string-append "-Dnologin-path=" nologin-path)
@ -704,21 +713,28 @@ (define-public elogind
;; XXX There is no run-time setting to set this per-process, only a
;; build-time, hard-coded list of global directories.
(lambda _
(substitute* (list "src/login/elogind-dbus.c"
"src/sleep/sleep.c")
(substitute* (list "src/login/logind-core.c"
"src/login/logind-dbus.c"
"src/sleep/sleep.c"
"src/shared/sleep-config.c")
(("PKGSYSCONFDIR") "\"/etc/elogind\""))))
(add-after 'unpack 'adjust-tests
(lambda _
;; Skip the following test, which depends on users such as 'root'
;; existing in the build environment.
(invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g"
"-i" "src/test/meson.build")
;; Skip the user-util tests, which depends on users such as
;; 'root' existing in the build environment.
(substitute* "src/test/meson.build"
((".*'test-user-util.c'.*") "")
((".*'test-cgroup.c'.*") ""))
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
(substitute* "src/test/test-copy.c"
(("/usr/lib/os-release")
"/etc/passwd"))
"/etc/passwd")
;; Skip the copy_holes test, which fails for unknown reasons
;; (see: https://github.com/elogind/elogind/issues/261).
(("TEST_RET\\(copy_holes).*" all)
(string-append all " return 77;\n")))
;; Use a shebang that works in the build container.
(substitute* "src/test/test-exec-util.c"
(("#!/bin/sh")
@ -743,41 +759,37 @@ (define-public elogind
;; loopback device, but that fails because /sys is unavailable.
(substitute* "src/libelogind/sd-device/test-sd-device-thread.c"
((".*sd_device_new_from_syspath.*/sys/class/net/lo.*")
"return 77;"))
;; Most of these tests require cgroups or an actual live
;; logind system so that it can flicker the monitor, etc.
;; Just skip it until a more narrow selection can be made.
(substitute* "src/libelogind/sd-login/test-login.c"
(("test_login\\(\\);")
"return 77;"))))
(add-after 'unpack 'change-pid-file-path
(lambda _
(substitute* "src/login/elogind.c"
(("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\"")))))))
(native-inputs
`(("docbook-xml" ,docbook-xml-4.5)
("docbook-xml-4.2" ,docbook-xml-4.2)
("docbook-xsl" ,docbook-xsl)
("gettext" ,gettext-minimal)
("gperf" ,gperf)
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("m4" ,m4)
("pkg-config" ,pkg-config)
("python" ,python)
("xsltproc" ,libxslt)))
(list docbook-xml-4.5
docbook-xml-4.2
docbook-xsl
gettext-minimal
gperf
libxml2 ;for XML_CATALOG_FILES
m4
pkg-config
python
python-jinja2
libxslt))
(inputs
(append
(if (not (target-riscv64?))
(list kexec-tools)
'())
(list linux-pam
libcap
shadow ; for 'nologin'
shepherd ; for 'halt' and 'reboot', invoked
; when pressing the power button
dbus
eudev
acl))) ; to add individual users to ACLs on /dev nodes
(if (not (target-riscv64?))
(list kexec-tools)
'())
(list linux-pam
libcap
`(,util-linux "lib") ;for 'libmount'
shadow ;for 'nologin'
shepherd ;for 'halt' and 'reboot', invoked
;when pressing the power button
dbus
eudev
acl))) ; to add individual users to ACLs on /dev nodes
(home-page "https://github.com/elogind/elogind")
(synopsis "User, seat, and session management service")
(description "Elogind is the systemd project's \"logind\" service,

4
gnu/packages/fvwm.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@ -67,7 +67,7 @@ (define-public fvwm
(inputs
(list fribidi
libpng
librsvg
(librsvg-for-system)
libxcursor
libxext
libxft

51
gnu/packages/games.scm
View file

@ -1160,7 +1160,7 @@ (define-public cockatrice
(define-public corsix-th
(package
(name "corsix-th")
(version "0.66")
(version "0.67")
(source
(origin
(method git-fetch)
@ -1169,29 +1169,28 @@ (define-public corsix-th
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sgsvhqgiq6v1v5am7ghja8blhlrj0y1arvq6xq1j5fwa7c59ihs"))))
(base32 "14996kbrwdrd0gpz19il2i4p650qdhjw8v8ka3aigk6pl4kda3sq"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-binary
(lambda _
;; Set Lua module paths and default MIDI soundfont on startup.
(let* ((out (assoc-ref %outputs "out"))
(fluid (assoc-ref %build-inputs "fluid-3"))
(lua-version ,(version-major+minor (package-version lua)))
(lua-cpath
(map (lambda (lib)
(string-append
(assoc-ref %build-inputs (string-append "lua-" lib))
"/lib/lua/" lua-version "/?.so"))
'("filesystem" "lpeg"))))
(wrap-program (string-append out "/bin/corsix-th")
`("LUA_CPATH" ";" = ,lua-cpath)
`("SDL_SOUNDFONTS" ":" suffix
(,(string-append fluid "/share/soundfonts/FluidR3Mono_GM.sf3")))))
#t)))
#:tests? #f)) ; TODO need busted package to run tests
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'wrap-binary
(lambda _
;; Set Lua module paths and default MIDI soundfont on startup.
(let* ((fluid #$(this-package-input "fluid-3"))
(lua-version #$(version-major+minor (package-version lua)))
(lua-cpath
(map (lambda (lib)
(string-append
(assoc-ref %build-inputs (string-append "lua-" lib))
"/lib/lua/" lua-version "/?.so"))
'("filesystem" "lpeg"))))
(wrap-program (string-append #$output "/bin/corsix-th")
`("LUA_CPATH" ";" = ,lua-cpath)
`("SDL_SOUNDFONTS" ":" suffix
(,(string-append fluid "/share/soundfonts/FluidR3Mono_GM.sf3"))))))))
#:tests? #f)) ; TODO need busted package to run tests
;; Omit Lua-Socket dependency to disable automatic updates.
(inputs
(list ffmpeg
@ -3740,7 +3739,7 @@ (define-public xboard
(assoc-ref inputs "chess")
"/bin/gnuchessx"))))))))
(inputs
(list alsa-utils chess gtk+-2 librsvg))
(list alsa-utils chess gtk+-2 (librsvg-for-system)))
(native-inputs
(list texinfo pkg-config))
(home-page "https://www.gnu.org/software/xboard/")
@ -5166,7 +5165,7 @@ (define-public pioneers
(("\"beep\"")
(string-append "\"" (assoc-ref inputs "beep") "/bin/beep\"")))
#t)))))
(inputs (list avahi beep gtk+ librsvg))
(inputs (list avahi beep gtk+ (librsvg-for-system)))
(native-inputs (list intltool itstool libxml2 pkg-config))
(synopsis "Board game inspired by The Settlers of Catan")
(description "Pioneers is an emulation of the board game The Settlers of
@ -5815,7 +5814,7 @@ (define-public tuxpaint
("fribidi" ,fribidi)
("gettext" ,gettext-minimal)
("libpng" ,libpng)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libpaper" ,libpaper)
("netpbm" ,netpbm)
("sdl" ,(sdl-union (list sdl sdl-mixer sdl-ttf sdl-image)))))
@ -7755,7 +7754,7 @@ (define-public colobot
(base32
"1s86cd36rwkff329mb1ay1wi5qqyi35564ppgr3f4qqz9wj9vs2m"))))
("gettext" ,gettext-minimal)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("po4a" ,po4a)
("python" ,python-wrapper)))
(inputs

2
gnu/packages/genealogy.scm
View file

@ -63,7 +63,7 @@ (define-public gramps
gtk+
gtkspell3
graphviz
librsvg
(librsvg-for-system)
osm-gps-map
pango
python-bsddb3

12
gnu/packages/geo.scm
View file

@ -685,15 +685,16 @@ (define-public librttopo
(define-public libspatialite
(package
(name "libspatialite")
(version "5.0.1")
(version "5.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.gaia-gis.it/gaia-sins/libspatialite-"
(uri (string-append "https://www.gaia-gis.it/gaia-sins/"
"libspatialite-sources/libspatialite-"
version ".tar.gz"))
(sha256
(base32
"164y82rw2lrp5glfc0rkn7n6xvx5dvlgmh7bb7815067251wkjzf"))))
"102hc18fvwr1kw8aap53zqi8r0l52b8wa00lvlbf1zys979jvgj3"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@ -2275,14 +2276,15 @@ (define-public shapelib
(define-public spatialite-tools
(package
(name "spatialite-tools")
(version "5.0.1")
(version "5.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.gaia-gis.it/gaia-sins/"
"spatialite-tools-sources/"
"spatialite-tools-" version ".tar.gz"))
(sha256
(base32 "070p6pg541wvwb28wkn7k0z1qdyirik2qc2jpj4pf0vzx02w414n"))))
(base32 "1dc3hnqa9ns0ycsac6wyl96pi052y7rrf233lq7sk708ghv30c6z"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))

6
gnu/packages/gettext.scm
View file

@ -240,11 +240,13 @@ (define-public po4a
(version "0.69")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mquinson/po4a/releases/download/v"
(uri (string-append "https://github.com/mquinson/po4a"
"/releases/download/v"
version "/po4a-" version ".tar.gz"))
(sha256
(base32
"15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w"))))
"15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w"))
(patches (search-patches "po4a-partial-texinfo-menu-fix.patch"))))
(build-system perl-build-system)
(arguments
(list

21
gnu/packages/gnome.scm
View file

@ -384,7 +384,6 @@ (define-public libcloudproviders-minimal
(define-public libcloudproviders
(package/inherit libcloudproviders-minimal
(name "libcloudproviders")
(version "0.3.1")
(outputs (cons "doc" (package-outputs libcloudproviders-minimal)))
(arguments
(substitute-keyword-arguments (package-arguments libcloudproviders-minimal)
@ -567,7 +566,7 @@ (define-public libdmapsharing
vala))
(inputs
(list avahi
librsvg
(librsvg-for-system)
libgee
gst-plugins-base
gtk+))
@ -871,7 +870,7 @@ (define-public gnome-photos
libjpeg-turbo
libportal
libpng
librsvg
(librsvg-for-system)
python-pygobject
rest
tracker
@ -4381,7 +4380,7 @@ (define-public drawing
python))
(inputs
(list bash-minimal
librsvg
(librsvg-for-system)
gsettings-desktop-schemas
gtk+
pango
@ -6734,7 +6733,7 @@ (define-public totem
(define-public rhythmbox
(package
(name "rhythmbox")
(version "3.4.6")
(version "3.4.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/rhythmbox/"
@ -6742,7 +6741,7 @@ (define-public rhythmbox
"rhythmbox-" version ".tar.xz"))
(sha256
(base32
"0d5hbsdk2p8w567mfzy4kk8xn4d227hrbyy857li3r2mrq884mpr"))))
"0zps1k72n7yycw6djgilgdacwdi993xqh1sh9x9lr9n17z0mcv9g"))))
(build-system meson-build-system)
(arguments
(list
@ -6802,7 +6801,7 @@ (define-public rhythmbox
libpeas
libsecret
libmtp
libsoup-minimal-2
libsoup-minimal
libxml2
lirc
pango
@ -9109,7 +9108,7 @@ (define-public gnome-control-center
libgtop
libnma
libpwquality
librsvg ;for loading SVG files
(librsvg-for-system) ;for loading SVG files
libsecret
libxml2
libwacom
@ -10987,7 +10986,7 @@ (define-public gnome-system-monitor
gtk+
gtkmm-3
libhandy
librsvg
(librsvg-for-system)
libxml2
libwnck))
(home-page "https://wiki.gnome.org/Apps/SystemMonitor")
@ -11772,7 +11771,7 @@ (define-public gthumb
("libheif" ,libheif)
("libjpeg" ,libjpeg-turbo)
("libraw" ,libraw)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libtiff" ,libtiff)
("libwebp" ,libwebp)))
(home-page "https://wiki.gnome.org/Apps/Gthumb")
@ -12468,7 +12467,7 @@ (define-public glabels
("itstool" ,itstool)
("pkg-config" ,pkg-config)))
(inputs
(list gtk+ librsvg libxml2))
(list gtk+ (librsvg-for-system) libxml2))
(arguments
`(#:configure-flags '("CFLAGS=-fcommon")))
(home-page "https://glabels.org/")

39
gnu/packages/golang.scm
View file

@ -3261,6 +3261,23 @@ (define-public go-gopkg-in-square-go-jose-v2
Encryption, JSON Web Signature, and JSON Web Token standards.")
(license license:asl2.0)))
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
(name "go-github-com-go-jose-go-jose-v3")
(version "3.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-jose/go-jose")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5"))))
(arguments
(list #:import-path "github.com/go-jose/go-jose/v3"))))
(define-public go-gopkg.in-tomb.v2
(let ((commit "d5d1b5820637886def9eef33e03a27a9f166942c")
(revision "0"))
@ -9572,6 +9589,28 @@ (define-public go-github-com-coreos-go-oidc
@code{go-golang-org-x-oauth2} package.")
(license license:asl2.0)))
(define-public go-github-com-coreos-go-oidc-v3
(package
(inherit go-github-com-coreos-go-oidc)
(name "go-github-com-coreos-go-oidc-v3")
(version "3.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/coreos/go-oidc")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
(arguments
(list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
#:import-path "github.com/coreos/go-oidc/v3/oidc"
#:unpack-path "github.com/coreos/go-oidc/v3"))
(propagated-inputs
(list go-github-com-go-jose-go-jose-v3
go-golang-org-x-oauth2))))
(define-public go-github-com-coreos-go-semver
(package
(name "go-github-com-coreos-go-semver")

4
gnu/packages/gpodder.scm
View file

@ -50,7 +50,7 @@ (define-module (gnu packages gpodder)
(define-public gpodder
(package
(name "gpodder")
(version "3.11.0")
(version "3.11.1")
(source
(origin
(method git-fetch)
@ -58,7 +58,7 @@ (define-public gpodder
(url "https://github.com/gpodder/gpodder")
(commit version)))
(sha256
(base32 "1387n0kgpan869c09smq5jnc3316vz8majl9bw01bw7cxg4vss3p"))
(base32 "121cb8qz4rp6602lpbi6m2vqx3ar1cw2s4z4r7nr5qaxb0q3gk9n"))
(file-name (git-file-name name version))
(patches (search-patches "gpodder-disable-updater.patch"))))
(build-system python-build-system)

2
gnu/packages/graphics.scm
View file

@ -1397,7 +1397,7 @@ (define-public openscenegraph
`(("giflib" ,giflib)
("libjpeg" ,libjpeg-turbo) ; required for the JPEG texture plugin.
("jasper" ,jasper)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libxrandr" ,libxrandr)
("ffmpeg" ,ffmpeg-4)
("mesa" ,mesa)))

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

@ -3046,7 +3046,7 @@ (define-public guile-picture-language
(propagated-inputs
(list guile-cairo guile-rsvg))
(native-inputs
(list autoconf automake librsvg pkg-config texinfo))
(list autoconf automake (librsvg-for-system) pkg-config texinfo))
(home-page "https://git.elephly.net/software/guile-picture-language.git")
(synopsis "Picture language for Guile")
(description
@ -3844,7 +3844,7 @@ (define-public guile-jtd
(define-public guile-png
(package
(name "guile-png")
(version "0.6.0")
(version "0.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3853,7 +3853,7 @@ (define-public guile-png
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0i0q2h4kfp1mj5m3wnz2hk6z895001j38s5vkbhkdxf05cjvwkky"))))
"0nkim662lb48y8n5hik8rrj76600v2inwaxwnfpdny7h2j0yq1wm"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
@ -5345,7 +5345,7 @@ (define-public guile-gitlab
(define-public guile-smc
(package
(name "guile-smc")
(version "0.6.0")
(version "0.6.2")
(source
(origin
(method git-fetch)
@ -5355,7 +5355,7 @@ (define-public guile-smc
(file-name (string-append name "-" version))
(sha256
(base32
"15b8m30kjl46p44xjd65vv1bv60hy130zfskkcsrj10fzahyk9zd"))))
"11083lj048ab5zsdgwpkshxi8v5nfdr7kvmmslszbi7lq2pwfqig"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings

4
gnu/packages/image-processing.scm
View file

@ -754,7 +754,7 @@ (define-public vips
libgsf
libjpeg-turbo
libpng
librsvg
(librsvg-for-system)
libtiff
libxml2
libwebp
@ -906,7 +906,7 @@ (define-public nip2
libxml2
libexif
libjpeg-turbo ;required by vips.pc
librsvg
(librsvg-for-system)
fftw
libgsf
imagemagick

19
gnu/packages/image.scm
View file

@ -1432,6 +1432,7 @@ (define-public libwebp
(package
(name "libwebp")
(version "1.2.4")
(replacement libwebp/fixed)
(source
(origin
;; No tarballs are provided for >0.6.1.
@ -1470,6 +1471,22 @@ (define-public libwebp
channels.")
(license license:bsd-3)))
(define libwebp/fixed
(package
(inherit libwebp)
(name "libwebp")
(version "1.3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://chromium.googlesource.com/webm/libwebp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1aas6gwy7kfcq34cil781kcsl286khh9grwcx7k4d2n1g7zcpl3m"))))))
(define-public libmng
(package
(name "libmng")
@ -2571,7 +2588,7 @@ (define-public mypaint
("gettext" ,gettext-minimal)))
(inputs
(list gtk+
librsvg
(librsvg-for-system)
hicolor-icon-theme
libmypaint
mypaint-brushes

4
gnu/packages/imagemagick.scm
View file

@ -213,7 +213,7 @@ (define-public perl-image-magick
(define-public graphicsmagick
(package
(name "graphicsmagick")
(version "1.3.38")
(version "1.3.40")
(source
(origin
(method url-fetch)
@ -226,7 +226,7 @@ (define-public graphicsmagick
"/GraphicsMagick-" version ".tar.xz")))
(sha256
(base32
"0x96wcspcqmkcy7jagfifgq2iamcf0ql9swvn6f2n79mb7dxj36n"))))
"0ikpza74p00hrs4z2cgykf7vhlqnzzkhaidjlcjppiw99sfimp4p"))))
(build-system gnu-build-system)
(arguments
(list

2
gnu/packages/java.scm
View file

@ -1579,7 +1579,6 @@ (define-public jbr11
(synopsis "JetBrains Java Runtime")
(description "This package provides a Java runtime environment for
and Java development kit. It supports enhanced class redefinition (DCEVM),
features optional JCEF, a framework for embedding Chromium-based browsers,
includes a number of improvements in font rendering, keyboards support,
windowing/focus subsystems, HiDPI, accessibility, and performance,
provides better desktop integration and bugfixes not yet present in
@ -1614,7 +1613,6 @@ (define-public jbr17
(synopsis "JetBrains Java Runtime")
(description "This package provides a Java runtime environment for
and Java development kit. It supports enhanced class redefinition (DCEVM),
features optional JCEF, a framework for embedding Chromium-based browsers,
includes a number of improvements in font rendering, keyboards support,
windowing/focus subsystems, HiDPI, accessibility, and performance,
provides better desktop integration and bugfixes not yet present in

2
gnu/packages/language.scm
View file

@ -181,7 +181,7 @@ (define-public nimf
m17n-lib
qtbase-5
librime
librsvg
(librsvg-for-system)
wayland
wayland-protocols
libx11

35
gnu/packages/linux.scm
View file

@ -487,7 +487,7 @@ (define (%upstream-linux-source version hash)
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-6.4-version "6.4.9")
(define-public linux-libre-6.4-version "6.4.10")
(define-public linux-libre-6.4-gnu-revision "gnu")
(define deblob-scripts-6.4
(linux-libre-deblob-scripts
@ -497,7 +497,7 @@ (define deblob-scripts-6.4
(base32 "1rwm09anyn4py1g877f9vh6ya86y2hfvlqx51bpa53dci5k0b0ds")))
(define-public linux-libre-6.4-pristine-source
(let ((version linux-libre-6.4-version)
(hash (base32 "17ycanx738bgxg5wn536kbad4zzvj5ngygp9qhvz76draaca5f5q")))
(hash (base32 "0fgjym6y0zj7wz1byqhxmv3pc3wq412vm1dxbj4gv23pm6r3y2wq")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.4)))
@ -505,7 +505,7 @@ (define-public linux-libre-6.4-pristine-source
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-6.1-version "6.1.44")
(define-public linux-libre-6.1-version "6.1.45")
(define-public linux-libre-6.1-gnu-revision "gnu")
(define deblob-scripts-6.1
(linux-libre-deblob-scripts
@ -515,12 +515,12 @@ (define deblob-scripts-6.1
(base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11")))
(define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version)
(hash (base32 "19d1fdvdp8lc5mvlcawd8hcpzjh7pdr5gq6fczhjl20xw4gx8l9f")))
(hash (base32 "14piy4cwv18a0yqp4gkrvr51z4zccyhab29n9ybxinkxdqwl68xx")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.1)))
(define-public linux-libre-5.15-version "5.15.125")
(define-public linux-libre-5.15-version "5.15.126")
(define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15
(linux-libre-deblob-scripts
@ -530,12 +530,12 @@ (define deblob-scripts-5.15
(base32 "1c3lm0j401lv2lk39dmr4mlf5ic173snm7cc0cckl6czyvxr5ysy")))
(define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version)
(hash (base32 "1izyv1ibiy4dapwb8745dshfbb9b6xqyz77l6mhkmlkcnx33h3qm")))
(hash (base32 "0vzdncrvwqxzjkpgf3gjxvl8iwz92szfyzc33cayx28ghjwsmx5d")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.189")
(define-public linux-libre-5.10-version "5.10.190")
(define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
@ -545,12 +545,12 @@ (define deblob-scripts-5.10
(base32 "0nnp46mn32yk436swd2qh34igmzinfgkwvbzp3lqyy45f06hbc2j")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "1jcqj0yh8k81a02y8wq1psy109w9s0r5j5zgm8gmf5ylw5m520sc")))
(hash (base32 "15zmz9pg91gph2dhigjf1z3w6gkv1kwslki5dpzhgzs03pq3swi9")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.252")
(define-public linux-libre-5.4-version "5.4.253")
(define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
@ -560,12 +560,12 @@ (define deblob-scripts-5.4
(base32 "0sw67b2pk3lng4y67diqqnhxaggnp3nbkx8dxc5fs27rinfxr4m1")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "0rw2b1rr3rb5498rv1zmj0ml3p67awrvd2ch66kp80wl4dsmhy1s")))
(hash (base32 "1rr6mnkbw6gwdm9bqjhf4z2xqr458fn2qdv5b4mgm65a15gvmchz")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.290")
(define-public linux-libre-4.19-version "4.19.291")
(define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
@ -575,12 +575,12 @@ (define deblob-scripts-4.19
(base32 "1425mhkfxn18vxn05bb4h3li7x1jl7l1hf1zi8xhnqv3wa31h9wl")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1kqflbf78aamnbdc2v973qk9ymignl1cy6q0rpw865brgm5y59cz")))
(hash (base32 "0cxmq8mrkw179jb8sqvad3dskllwn579g2lxcjn21jyqsf85nwz6")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.321")
(define-public linux-libre-4.14-version "4.14.322")
(define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
@ -590,7 +590,7 @@ (define deblob-scripts-4.14
(base32 "1faagsj4i31z2bp83hflx3q9vrddjnn37a3ah2b47iaplva7z1nd")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "058p6ba24gx0q1fxyf5gnbnl49r82iaz97z01h7c4z2lgba2pqyh")))
(hash (base32 "1r71g5p0cnbi0nixv91nyhv24dqmvh49rqb2lnbhsdq81fqm8ssm")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
@ -5022,7 +5022,9 @@ (define-public perf
python-2 ;'perf' links against libpython
elfutils
libiberty ;used alongside BDF for symbol demangling
libtraceevent
libunwind ;better stack walking
libtraceevent
numactl ;for 'perf bench numa mem'
;; Documentation.
libxml2 ;for $XML_CATALOG_FILES
@ -9265,7 +9267,7 @@ (define-public inputattach
(define-public pipewire
(package
(name "pipewire")
(version "0.3.70")
(version "0.3.77")
(source (origin
(method git-fetch)
(uri (git-reference
@ -9274,7 +9276,7 @@ (define-public pipewire
(file-name (git-file-name name version))
(sha256
(base32
"1n74rrbwymm89ri4daa4v092f4b81wrak4vg685xfz2wl89p64n6"))))
"11jdd9ljm6967cdp97qqf5fa02ad69kdgk3212ap5gfndky2h43m"))))
(build-system meson-build-system)
(arguments
(list
@ -9299,6 +9301,7 @@ (define-public pipewire
gstreamer
jack-2
ldacbt
libcamera
libfdk
libfreeaptx
libsndfile

4
gnu/packages/lua.scm
View file

@ -1190,7 +1190,7 @@ (define-public emilua
(define-public fennel
(package
(name "fennel")
(version "1.3.0")
(version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1199,7 +1199,7 @@ (define-public fennel
(file-name (git-file-name name version))
(sha256
(base32
"1g22y0bpw1ads6bmsr946fw1m5xxvlvb1hdym3f3k3fziislwwhd"))))
"12zm3rd0vvkqazv1cv5bhwk6igsj18im2qakqw7cf4a20rc9wpmx"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags #~(list (string-append "PREFIX="

6
gnu/packages/lxqt.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2022 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net>
@ -909,7 +909,7 @@ (define-public obconf-qt
(inputs
(list imlib2
libsm
librsvg
(librsvg-for-system)
libxft
libxml2
openbox
@ -1078,7 +1078,7 @@ (define-public lxqt-archiver
(license license:gpl2+)))
(define-public lxqt-connman-applet
;; since the main developers didn't release any version yet, their
;; since the main developers didn't release any version yet, their
;; latest commit on `master` branch at the moment used for this version.
(let ((commit "db1618d58fd3439142c4e44b24cba0dbb68b7141")
(revision "0"))

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

@ -408,7 +408,7 @@ (define-public guile-aiscm-next
(deprecated-package "guile-aiscm-next" guile-aiscm))
(define-public llama-cpp
(let ((commit "3cd8dde0d1357b7f11bdd25c45d5bf5e97e284a0")
(let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb")
(revision "0"))
(package
(name "llama-cpp")
@ -421,7 +421,7 @@ (define-public llama-cpp
(commit (string-append "master-" (string-take commit 7)))))
(file-name (git-file-name name version))
(sha256
(base32 "0i7c92cxqs31xklrn688978kk29agivgxjgvsb45wzm65gc6hm5c"))))
(base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p"))))
(build-system cmake-build-system)
(arguments
(list
@ -449,18 +449,13 @@ (define (make-script script)
(chmod (string-append bin script) #o555)))
(mkdir-p bin)
(make-script "convert-pth-to-ggml")
(make-script "convert-gptq-to-ggml")
(make-script "quantize.py")
(substitute* (string-append bin "quantize.py")
(("os\\.getcwd\\(\\), quantize_script_binary")
(string-append "\"" bin "\", quantize_script_binary"))))))
(make-script "convert-lora-to-ggml")
(make-script "convert"))))
(add-after 'install-python-scripts 'wrap-python-scripts
(assoc-ref python:%standard-phases 'wrap))
(replace 'install
(lambda _
(let ((bin (string-append #$output "/bin/")))
(install-file "bin/quantize" bin)
(copy-file "bin/main" (string-append bin "llama"))))))))
(copy-file "bin/main" (string-append #$output "/bin/llama")))))))
(inputs (list python))
(propagated-inputs
(list python-numpy python-pytorch python-sentencepiece))
@ -4422,7 +4417,7 @@ (define-public python-pyro-api
(define-public python-pyro-ppl
(package
(name "python-pyro-ppl")
(version "1.8.1")
(version "1.8.6")
;; The sources on pypi don't include tests.
(source
(origin
@ -4432,7 +4427,7 @@ (define-public python-pyro-ppl
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0ns20mr8qgjshzbplrfzaz1xhb9ldbgvrj2rzlsxvns2bi1ddyl5"))))
(base32 "0n1vsih99pvswcaygdxkc6kq6r48ny130z6ca8pp3281396r2ykw"))))
(build-system python-build-system)
(arguments
`(#:phases

61
gnu/packages/mail.scm
View file

@ -69,9 +69,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages mail)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages admin)
#:use-module (gnu packages aspell)
#:use-module (gnu packages autotools)
@ -97,6 +95,7 @@ (define-module (gnu packages mail)
#:use-module (gnu packages emacs)
#:use-module (gnu packages enchant)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gawk)
@ -104,15 +103,14 @@ (define-module (gnu packages mail)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages flex)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages kerberos)
@ -133,8 +131,8 @@ (define-module (gnu packages mail)
#:use-module (gnu packages nettle)
#:use-module (gnu packages networking)
#:use-module (gnu packages ninja)
#:use-module (gnu packages openldap)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages openldap)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
@ -149,15 +147,15 @@ (define-module (gnu packages mail)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ragel)
#:use-module (gnu packages regex)
#:use-module (gnu packages rdf)
#:use-module (gnu packages readline)
#:use-module (gnu packages regex)
#:use-module (gnu packages ruby)
#:use-module (gnu packages rust-apps)
#:use-module (gnu packages search)
#:use-module (gnu packages serialization)
#:use-module (gnu packages samba)
#:use-module (gnu packages screen)
#:use-module (gnu packages search)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tcl)
@ -169,29 +167,30 @@ (define-module (gnu packages mail)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix deprecation)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system go)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system guile)
#:use-module (guix build-system emacs)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
#:use-module (guix deprecation)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define-public abook
(package
@ -4548,7 +4547,7 @@ (define-public python-imaplib2
(define-public rspamd
(package
(name "rspamd")
(version "3.5")
(version "3.6")
(source
(origin
(method git-fetch)
@ -4556,24 +4555,24 @@ (define-public rspamd
(url "https://github.com/rspamd/rspamd")
(commit version)))
(sha256
(base32 "1d45vhs66r6ig5mvmx52i7c2b638y2zc7wgv3lx0pq7dqgjxxsyz"))
(base32 "1ra18c3wczbdqrg9p69k04smjskjkdpxcfff9ff4yi7pmqjaxr8s"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DENABLE_LUAJIT=ON"
"-DLOCAL_CONFDIR=/etc/rspamd")))
(inputs
(list openssl
(list file
glib
ragel
luajit
sqlite
file
icu4c
libsodium
luajit
openssl
pcre2
zlib
perl
libsodium))
ragel
sqlite
zlib))
(native-inputs
(list pkg-config))
(synopsis "Spam filtering system")

4
gnu/packages/mastodon.scm
View file

@ -87,7 +87,7 @@ (define-public toot
(define-public tuba
(package
(name "tuba")
(version "0.3.2")
(version "0.4.1")
(source
(origin
(method git-fetch)
@ -96,7 +96,7 @@ (define-public tuba
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1xhyz6wi17g4m76lr6qc75q4xnnw7c3dh3d04dg8m5gzk6j0y89x"))))
(base32 "0v2ihp1dkp13jklp3kysv4blflhx3w0hwcyink4mb7hwsaqy0xnm"))))
(build-system meson-build-system)
(arguments
(list

6
gnu/packages/maths.scm
View file

@ -6555,17 +6555,15 @@ (define-public elemental
(define-public mcrl2
(package
(name "mcrl2")
(version "202206.0")
(version "202206.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.mcrl2.org/download/release/mcrl2-"
version ".tar.gz"))
(patches (search-patches "mcrl2-fix-1687.patch"
"mcrl2-fix-counterexample.patch"))
(sha256
(base32
"0alpck09pbvwk4axqmrvcjmsabsn20yayq5b3apq284n0hcbf01q"))))
"1rbfyw47bi31qla1sa4fd1npryb5kbdr0vijmdc2gg1zhpqfv0ia"))))
(inputs
(list boost glu mesa qtbase-5))
(build-system cmake-build-system)

100
gnu/packages/mc.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018–2021, 2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,6 +21,7 @@
(define-module (gnu packages mc)
#:use-module (gnu packages aspell)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages glib)
@ -32,69 +33,82 @@ (define-module (gnu packages mc)
#:use-module (gnu packages)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages))
(define-public mc
(package
(name "mc")
(version "4.8.29")
(version "4.8.30")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.osuosl.org/pub/midnightcommander/mc-"
version ".tar.xz"))
(sha256
(base32 "1m0aai4paxpcf3lw1dd94zyxc7wd0ysmfwpibg50q62q9yws7n01"))))
(base32 "1py7jm620lsas7rcv5j69608gdshmp25d9gx958hr5sb2jr3rg2y"))))
(build-system gnu-build-system)
(arguments
(list
#:configure-flags
#~(list "--with-screen=ncurses"
"--enable-aspell"
"--disable-configure-args" ; don't keep superfluous references
(string-append "PERL_FOR_BUILD=" ; to build .hlp files
#$(this-package-native-input "perl") "/bin/perl")
(string-append "PERL=" ; for run-time helpers, mainly VFS
#$(this-package-input "perl") "/bin/perl"))
#:phases
#~(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-file-names
(lambda* (#:key inputs #:allow-other-keys)
;; The following commands are all invoked at run time.
(substitute*
(list "lib/utilunix.c"
"src/filemanager/ext.c"
"src/usermenu.c"
"src/vfs/fish/fish.c"
;; This file hard-codes other shells, but they're never
;; tried after mc's first choice (bash) is found.
"lib/shell.c")
(("/bin/(ba|)sh" file)
(search-input-file inputs file)))
(substitute* "src/filemanager/ext.c"
;; Look up in $PATH at run time, rather than hard-coding now.
(("/bin/(rm)" command)
command))
(substitute* "misc/mcedit.menu.in"
;; These are script templates. Don't embed store file names.
(("#! /bin/([[:alnum:]]*)" _ file)
(string-append "#!/usr/bin/env " file)))
;; The following commands are all invoked at build time.
(substitute* "tests/src/vfs/extfs/helpers-list/Makefile.in"
(("/bin/sh")
(which "sh")))))
(add-before 'check 'fix-tests
(lambda _
;; Don't expect a UID or GID of ‘0’ in the build environment.
(with-directory-excursion "tests/src/vfs/extfs/helpers-list/data"
(substitute* (list "rpm.custom.output"
"rpm.glib.output")
((" 0 0") "<<uid>> <<gid>>")))
;; XXX ERROR:mc_realpath.c:99:realpath_test: assertion failed
;; (resolved_path == data->expected_string): ("" == "/usr/bin")
(substitute* "tests/lib/mc_realpath.c"
(("/usr/bin") "/")
(("usr/bin") "/")))))))
(native-inputs (list perl pkg-config))
(inputs (list aspell
bash-minimal
check
glib
gpm
libssh2
ncurses
perl
unzip))
(arguments
`(#:configure-flags
'("--with-screen=ncurses" "--enable-aspell")
#:phases
(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-FHS-file-names
(lambda _
;; Patch files to refer to executables in the store or $PATH.
(substitute* "misc/mcedit.menu.in"
(("#! /bin/sh") (string-append "#!" (which "sh")))
(("/bin/bash") (which "bash")))
(substitute* "misc/ext.d/misc.sh.in"
(("/bin/cat") "cat"))
(substitute* (list "lib/utilunix.c"
"src/usermenu.c"
"src/vfs/fish/fish.c"
"tests/src/vfs/extfs/helpers-list/Makefile.in")
(("/bin/sh") (which "sh")))
(substitute* "src/filemanager/ext.c"
(("/bin/rm") "rm")
(("/bin/sh") (which "sh")))
;; There are other /bin/<shell>s hard-coded in this file, but they
;; are never tried after bash (mc's first choice) is found.
(substitute* "lib/shell.c"
(("/bin/bash") (which "bash")))
#t))
(add-before 'check 'fix-tests
(lambda _
;; Don't expect a UID or GID of ‘0’ in the build environment.
(with-directory-excursion "tests/src/vfs/extfs/helpers-list/data"
(substitute* (list "rpm.custom.output"
"rpm.glib.output")
((" 0 0") "<<uid>> <<gid>>")))
;; XXX ERROR:mc_realpath.c:99:realpath_test: assertion failed
;; (resolved_path == data->expected_string): ("" == "/usr/bin")
(substitute* "tests/lib/mc_realpath.c"
(("/usr/bin") "/")
(("usr/bin") "/"))
#t)))))
(home-page "https://www.midnight-commander.org")
(properties
`((release-monitoring-url . "https://ftp.osuosl.org/pub/midnightcommander/")))

2
gnu/packages/messaging.scm
View file

@ -1372,7 +1372,7 @@ (define-public dino
at-spi2-core
bash-minimal
cairo
librsvg
(librsvg-for-system)
glib
glib-networking
gpgme

16
gnu/packages/mpd.scm
View file

@ -615,7 +615,7 @@ (define-public mpdevil
(define-public mympd
(package
(name "mympd")
(version "10.3.3")
(version "11.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -624,13 +624,21 @@ (define-public mympd
(file-name (git-file-name name version))
(sha256
(base32
"1n8z3rscrw7k097q5z1d59mrryy7b8m0zdfhi767a1qpa121m8if"))))
"0n6dyy6znzicm5v9mkcghm3lwi6zwysnpr0drvacqprr0r5l596a"))))
(build-system cmake-build-system)
(arguments
(list
#:configure-flags
#~(list "-DMYMPD_STRIP_BINARY=OFF") ; handled by 'strip phase
#:tests? #f)) ; no test target
#~(list "-DMYMPD_BUILD_TESTING=ON"
;; Handled by 'strip' phase.
"-DMYMPD_STRIP_BINARY=OFF")
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; The following test requires network connectivity.
(invoke "ctest" "--exclude-regex" "test_http_client")))))))
(native-inputs (list jq perl pkg-config))
(inputs (list flac libid3tag lua openssl pcre2))
(home-page "https://jcorporation.github.io/")

18
gnu/packages/music.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2018, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
@ -752,7 +752,7 @@ (define-public denemo
gtk+
gtksourceview-3
guile-2.0
librsvg
(librsvg-for-system)
libsndfile
libxml2
lilypond
@ -3780,7 +3780,7 @@ (define-public pianobar
(define-public picard
(package
(name "picard")
(version "2.8.5")
(version "2.9")
(source (origin
(method url-fetch)
(uri (string-append
@ -3788,7 +3788,7 @@ (define-public picard
"picard/picard-" version ".tar.gz"))
(sha256
(base32
"1kjl7iqgvvrv7mygsb7491cz872gm334489nyj0v8b79bxnzghdi"))))
"0afiziaq49sq1dx5r3qis4ymhhkrqlrkfnb6f7gcksj0kwljvsw9"))))
(build-system python-build-system)
(arguments
(list
@ -3805,7 +3805,13 @@ (define-public picard
(("pyfpcalc")
(string-append
"pyfpcalc', '"
(assoc-ref inputs "chromaprint") "/bin/fpcalc"))))))))
(assoc-ref inputs "chromaprint") "/bin/fpcalc")))))
(add-before 'check 'delete-failing-test
(lambda _
;; FIXME: This test fails in build environment.
;; util/pipe.read_from_pipe:244: pipe reader exception:
;; ERROR: Pipe doesn't exist
(delete-file "test/test_util_pipe.py"))))))
(native-inputs
(list gettext-minimal python-dateutil))
(inputs
@ -7217,7 +7223,7 @@ (define-public quodlibet
gtksourceview-4 ; undo, redo, multiline text fields
hicolor-icon-theme
keybinder-3.0 ; keybindings outside of GNOME
librsvg
(librsvg-for-system)
libsoup-minimal-2
python
python-cheetah

98
gnu/packages/networking.scm
View file

@ -14,7 +14,7 @@
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2020, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
@ -350,47 +350,45 @@ (define-public lcsync
(define-public libcamera
(package
(name "libcamera")
(version "0.0.0-1")
(version "0.1.0")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "git://linuxtv.org/libcamera.git")
(commit "10be87fa7c3bfb097b21ca3d469c67e40c333f7e")))
(url "https://git.libcamera.org/libcamera/libcamera.git")
(commit (string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "0qgirhlalmk9f9v6piwz50dr2asb64rvbb9zb1vix7y9zh7m11by"))))
(base32 "06dj3dpfbayj61015n5kffin2g3hyys11ra0px2g4hmrznvdkhc9"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(outputs '("out" "doc" "gst" "tools"))
(arguments
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags
(list
"-Dv4l2=true"
;; XXX: Requires bundled pybind11.
"-Dpycamera=disabled")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "test/meson.build"
(("\\['list-cameras', 'list-cameras.cpp'\\],")
"")
;; TODO: Why do the gstreamer tests fail.
(("^subdir\\('gstreamer'\\)")
""))))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share"))
(rename-file
(string-append out "/share/doc")
(string-append doc "/share/doc"))))))))
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags
#~(list (string-append "-Dbindir="
(assoc-ref %outputs "tools") "/bin")
"-Dtest=true" "-Dv4l2=true"
;; XXX: Requires bundled pybind11.
"-Dpycamera=disabled")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'move-doc-and-gst
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(gst (assoc-ref outputs "gst")))
(mkdir-p (string-append doc "/share"))
(rename-file (string-append out "/share/doc")
(string-append doc "/share/doc"))
(mkdir-p (string-append gst "/lib"))
(rename-file
(string-append out "/lib/gstreamer-1.0")
(string-append gst "/lib/gstreamer-1.0"))))))))
(native-inputs
(list graphviz ;for 'dot'
(list googletest
graphviz ;for 'dot'
doxygen
pkg-config
python-wrapper
@ -961,7 +959,7 @@ (define-public blueman
(inputs
(list bluez
dbus
librsvg
(librsvg-for-system)
glib
gtk+
iproute
@ -4617,6 +4615,42 @@ (define-public vnstat
of system resources regardless of network traffic rate.")
(license license:gpl2+)))
(define-public dnstracer
(package
(name "dnstracer")
(version "1.10")
(source (origin
(method url-fetch)
(uri (string-append "http://www.mavetju.org/download/"
name "-" version ".tar.bz2"))
(sha256
(base32
"089bmrjnmsga2n0r4xgw4bwbf41xdqsnmabjxhw8lngg2pns1kb4"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;no test suite
#:make-flags #~(list (string-append "PREFIX=" #$output)
(string-append "CC=" #$(cc-for-target)))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile
(lambda _
(substitute* "Makefile"
(("\\$\\{PREFIX}/man")
"${PREFIX}/share/man")
(("^install:.*" all)
(string-append
all
"\tinstall -d ${BINPREFIX}\n"
"\tinstall -d ${MANPREFIX}\n")))))
(delete 'configure))))
(native-inputs (list perl)) ;for pod2man
(home-page "http://www.mavetju.org/unix/dnstracer.php")
(synopsis "Trace a chain of DNS servers to the source")
(description "@command{dnstracer} determines where a given Domain Name
Server (DNS) gets its information from, and follows the chain of DNS servers
back to the servers which know the data.")
(license license:bsd-2)))
(define-public dropwatch
(package
(name "dropwatch")

112
gnu/packages/noweb.scm
View file

@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages noweb)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
@ -27,7 +28,7 @@ (define-module (gnu packages noweb)
(define-public noweb
(package
(name "noweb")
(version "2.12")
(version "2.13")
(source
(origin
(method git-fetch)
@ -37,63 +38,62 @@ (define-public noweb
"_")))))
(file-name (git-file-name name version))
(sha256
(base32 "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"))))
(base32 "0fwngh7zl9mrjz966pskhi4zvk26j6vsm85x99df9194nv51drq8"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bind-early
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(substitute* (list "src/lib/nwmtime"
"src/shell/htmltoc")
(("exec perl ")
(format #f "exec ~a " (which "perl"))))
(substitute* "src/shell/noweb"
((" cpif ")
(format #f " ~a/cpif " bin)))
#t)))
(add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/texmf/tex/latex"))
#t)))
(add-after 'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(cu (assoc-ref inputs "coreutils"))
(du (assoc-ref inputs "diffutils")))
(with-directory-excursion out
(for-each (lambda (prog)
(substitute* prog
(("nawk") (which "awk"))))
(append (map (lambda (x)
(string-append "bin/" x))
'("noweb" "nountangle"
"noroots" "noroff"
"noindex"))
(map (lambda (x)
(string-append "lib/" x))
'("btdefn" "emptydefn" "noidx"
"pipedocs" "toascii" "tohtml"
"toroff" "totex" "unmarkup"))))
(substitute* "bin/cpif"
(("^PATH=.*$")
(string-append "PATH=" cu "/bin:" du "/bin\n"))))
#t)))
(replace 'configure
(lambda _
;; Jump in the source.
(chdir "src")
#t)))
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "BIN=" out "/bin")
(string-append "LIB=" out "/lib")
(string-append "MAN=" out "/share/man")
(string-append "TEXINPUTS=" out
"/share/texmf/tex/latex")))
#:tests? #f)) ; no tests
(list
#:make-flags
#~(list (string-append "BIN=" #$output "/bin")
(string-append "LIB=" #$output "/lib")
(string-append "MAN=" #$output "/share/man")
(string-append "TEXINPUTS=" #$output
"/share/texmf/tex/latex"))
#:modules
'((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory
(lambda _
(chdir "src")))
(add-after 'enter-source-directory 'bind-early
(lambda _
(substitute* (list "lib/nwmtime"
"shell/htmltoc")
(("exec perl ")
(string-append "exec " (which "perl") " ")))
(substitute* "shell/noweb"
((" cpif ")
(string-append " " #$output "/bin/cpif ")))))
(delete 'configure) ; no configure script
(add-before 'install 'create-latex-directory
(lambda _
(mkdir-p (string-append #$output "/share/texmf/tex/latex"))))
(add-after 'install 'refer-to-inputs
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion #$output
(for-each (lambda (program)
(substitute* program
(("nawk")
(search-input-file inputs "bin/awk"))))
(append (map (cut string-append "bin/" <>)
'("noweb" "nountangle"
"noroots" "noroff"
"noindex"))
(map (cut string-append "lib/" <>)
'("btdefn" "emptydefn" "noidx"
"pipedocs" "toascii" "tohtml"
"toroff" "totex" "unmarkup"))))
(substitute* "bin/cpif"
(("^PATH=.*$")
(string-append "PATH="
(dirname (search-input-file
inputs"bin/basename")) ":"
(dirname (search-input-file
inputs "bin/cmp"))
"\n")))))))
#:tests? #f)) ; no tests
(inputs
(list perl))
(home-page "https://www.cs.tufts.edu/~nr/noweb/")

54
gnu/packages/ntp.scm
View file

@ -47,38 +47,41 @@ (define-module (gnu packages ntp)
(define-public chrony
(package
(name "chrony")
(version "4.3")
(version "4.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.tuxfamily.org/chrony/"
"chrony-" version ".tar.gz"))
(sha256
(base32 "0148bgzymdigkjs66fihrqw98g1yf6vgy40nlajqkw35m24sh3cx"))))
(base32 "123h2a9rpc6wbvnysvhl5pmckvynzrnqay7l00i18azrvbk0gyza"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build utils)
(guix build gnu-build-system))
#:configure-flags
(list "--enable-scfilter"
"--with-sendmail=sendmail"
"--with-user=chrony")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'stay-inside-out
;; Simply setting CHRONYVARDIR to something nonsensical at install
;; time would result in nonsense file names in man pages.
(lambda _
(substitute* "Makefile.in"
(("mkdir -p \\$\\(DESTDIR\\)\\$\\(CHRONYVARDIR\\)") ":"))))
(add-after 'install 'install-more-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(for-each (cut install-file <> doc)
(list "README" "FAQ"))
(copy-recursively "examples" (string-append doc "/examples"))))))))
(list
#:modules
'((srfi srfi-26)
(guix build utils)
(guix build gnu-build-system))
#:configure-flags
#~(list "--enable-scfilter"
"--with-sendmail=sendmail"
"--with-user=chrony")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'stay-inside-out
;; Simply setting CHRONYVARDIR to something nonsensical at install
;; time would result in nonsense file names in man pages.
(lambda _
(substitute* "Makefile.in"
(("mkdir -p \\$\\(DESTDIR\\)\\$\\(CHRONYVARDIR\\)") ":"))))
(add-after 'install 'install-more-documentation
(lambda _
(let* ((doc (string-append #$output "/share/doc/"
#$name "-" #$version)))
(for-each (cut install-file <> doc)
(list "README" "FAQ"))
(copy-recursively "examples"
(string-append doc "/examples"))))))))
(native-inputs
(list pkg-config))
(inputs
@ -139,8 +142,7 @@ (define-public ntp
libevent
;; Build with POSIX capabilities support on GNU/Linux. This allows
;; 'ntpd' to run as non-root (when invoked with '-u'.)
(if (string-suffix? "-linux"
(or (%current-target-system) (%current-system)))
(if (target-linux?)
(list libcap)
'())))
(arguments

4
gnu/packages/openbox.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@ -102,7 +102,7 @@ (define-public obconf
("openbox" ,openbox)
("startup-notification" ,startup-notification)
("libsm" ,libsm)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libxft" ,libxft)))
(native-inputs
`(("gettext" ,gettext-minimal)

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

@ -22,6 +22,7 @@
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1141,6 +1142,7 @@ (define-public conda
python-boto3
python-conda-package-handling
python-cytoolz
python-mock
python-pluggy
python-pycosat
python-pytest

43
gnu/packages/patches/ddclient-skip-test.patch
View file

@ -1,43 +0,0 @@
From e5657802025f238b39581534f3b4d408565c8943 Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Sun, 5 Feb 2023 21:05:00 +0000
Subject: [PATCH] Disable sandbox incompatible tests.
See: https://github.com/ddclient/ddclient/issues/465
---
t/get_ip_from_if.pl | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/t/get_ip_from_if.pl b/t/get_ip_from_if.pl
index 6f08e5d..d78c3d0 100644
--- a/t/get_ip_from_if.pl
+++ b/t/get_ip_from_if.pl
@@ -39,25 +39,4 @@ subtest "get_ip_from_interface tests" => sub {
}
};
-subtest "Get default interface and IP for test system" => sub {
- my $interface = ddclient::get_default_interface(4);
- if ($interface) {
- isnt($interface, "lo", "Check for loopback 'lo'");
- isnt($interface, "lo0", "Check for loopback 'lo0'");
- my $ip1 = ddclient::get_ip_from_interface("default", 4);
- my $ip2 = ddclient::get_ip_from_interface($interface, 4);
- is($ip1, $ip2, "Check IPv4 from default interface");
- ok(ddclient::is_ipv4($ip1), "Valid IPv4 from get_ip_from_interface($interface)");
- }
- $interface = ddclient::get_default_interface(6);
- if ($interface) {
- isnt($interface, "lo", "Check for loopback 'lo'");
- isnt($interface, "lo0", "Check for loopback 'lo0'");
- my $ip1 = ddclient::get_ip_from_interface("default", 6);
- my $ip2 = ddclient::get_ip_from_interface($interface, 6);
- is($ip1, $ip2, "Check IPv6 from default interface");
- ok(ddclient::is_ipv6($ip1), "Valid IPv6 from get_ip_from_interface($interface)");
- }
-};
-
done_testing();
--
2.38.1

60
gnu/packages/patches/elogind-fix-rpath.patch Normal file
View file

@ -0,0 +1,60 @@
Retrieved from https://github.com/elogind/elogind/issues/258
From: Mark Hindley <mark@hindley.org.uk>
Date: Wed, 24 May 2023 10:39:41 +0100
Subject: Fixup_executable_rpath
./meson.build sets
install_rpath : rootlibexecdir
however src/shared/meson.build sets
libshared = shared_library(
[snip]
install_dir : rootpkglibdir
)
---
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 694a2fd..a575f69 100644
--- a/meson.build
+++ b/meson.build
@@ -2903,7 +2903,7 @@ executable('elogind',
dependencies : [threads,
libacl,
libudev],
- install_rpath : rootlibexecdir,
+ install_rpath : rootpkglibdir,
install : true,
install_dir : rootlibexecdir)
@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
link_with : [libshared],
dependencies : [threads,
libudev],
- install_rpath : rootlibexecdir,
+ install_rpath : rootpkglibdir,
install : true,
install_dir : rootbindir)
public_programs += [exe]
@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
include_directories : includes,
link_with : [libshared],
dependencies : [threads],
- install_rpath : rootlibexecdir,
+ install_rpath : rootpkglibdir,
install : true,
install_dir : rootbindir)
public_programs += [exe]
@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
libshared],
dependencies: [libacl,
libudev],
- install_rpath : rootlibexecdir,
+ install_rpath : rootpkglibdir,
install : true,
install_dir : rootlibexecdir)
#endif // 0

41
gnu/packages/patches/elogind-revert-polkit-detection.patch
View file

@ -1,41 +0,0 @@
From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001
From: Sven Eden <sven.eden@prydeworx.com>
Date: Mon, 8 Mar 2021 08:40:08 +0100
Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed"
This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e.
Removing polkit support with -Dpolkit=auto when libpolkit is not
installed, removes the whole interface. This makes it impossible to
add polkit support as a runtime dependency.
Bug: #167
Closes: #206
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
---
meson.build | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/meson.build b/meson.build
index 2dd05db3c..f38551f55 100644
--- a/meson.build
+++ b/meson.build
@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps
message('Old polkit detected, will install pkla files')
install_polkit_pkla = true
endif
-#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167
- if not libpolkit.found()
- if want_polkit != 'auto'
- error('Polkit requested but libpolkit was not found.')
- endif
- install_polkit = false
- want_polkit = false
- endif
-#endif // 1
endif
conf.set10('ENABLE_POLKIT', install_polkit)
--
2.33.1

29
gnu/packages/patches/fbreader-fix-icon.patch Normal file
View file

@ -0,0 +1,29 @@
Author: Danny Milosavljevic <dannym+a@scratchpost.org>
Date: 2023-08-15
--- orig/jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/desktop 2023-08-14 23:56:03.092567740 +0200
+++ jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/desktop 2023-08-14 23:56:59.936213278 +0200
@@ -25,5 +25,5 @@
StartupNotify=true
Terminal=false
Type=Application
-Icon=FBReader.png
+Icon=FBReader
Categories=Office;Viewer;Literature;
--- orig/jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/Makefile 2023-08-14 23:56:03.092567740 +0200
+++ jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/Makefile 2023-08-15 00:23:19.046691430 +0200
@@ -10,6 +10,14 @@
@install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop
@install -d $(DESTDIR)$(IMAGEDIR)
@install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png
+ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps
+ @install -m 0644 ../data/icons/application/16x16.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/FBReader.png
+ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps
+ @install -m 0644 ../data/icons/application/32x32.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/FBReader.png
+ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps
+ @install -m 0644 ../data/icons/application/48x48.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/FBReader.png
+ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps
+ @install -m 0644 ../data/icons/application/64x64.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/FBReader.png
@install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml
@install -m 0644 ../data/default/keymap.desktop.xml $(SHARE_FBREADER)/default/keymap.xml
@install -m 0644 ../data/default/styles.desktop.xml $(SHARE_FBREADER)/default/styles.xml

51
gnu/packages/patches/highlight-gui-data-dir.patch Normal file
View file

@ -0,0 +1,51 @@
This patch distinguishes between the data directory path for GUI and the one
for non-GUI by allowing to set the former path.
highlight package has two outputs: out and gui. Both outputs have files which
will be in the same directory /share/highlight/ without this patch (see also
install and install-gui tasks in makefile). In the gui's data directory,
there are GUI specific files in /share/highlight/gui-files/{l10n,ext}/.
diff --git a/src/gui-qt/main.cpp b/src/gui-qt/main.cpp
index 4700dc1..3567745 100644
--- a/src/gui-qt/main.cpp
+++ b/src/gui-qt/main.cpp
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
QTranslator translator;
-#ifdef DATA_DIR
- translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(DATA_DIR).arg(QLocale::system().name()));
+#ifdef GUI_DATA_DIR
+ translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(GUI_DATA_DIR).arg(QLocale::system().name()));
#else
translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(QDir::currentPath()).arg(QLocale::system().name()));
#endif
diff --git a/src/gui-qt/mainwindow.cpp b/src/gui-qt/mainwindow.cpp
index 3a21ad2..f060431 100644
--- a/src/gui-qt/mainwindow.cpp
+++ b/src/gui-qt/mainwindow.cpp
@@ -2131,8 +2131,8 @@ QString MainWindow::getDistFileFilterPath(){
#ifdef Q_OS_OSX
return QCoreApplication::applicationDirPath()+"/../Resources/gui_files/ext/fileopenfilter.conf";
#else
- #ifdef DATA_DIR
- return QString(DATA_DIR) + "/gui_files/ext/fileopenfilter.conf";
+ #ifdef GUI_DATA_DIR
+ return QString(GUI_DATA_DIR) + "/gui_files/ext/fileopenfilter.conf";
#else
return QDir::currentPath()+"/gui_files/ext/fileopenfilter.conf";
#endif
diff --git a/src/makefile b/src/makefile
index b1d7988..2963105 100644
--- a/src/makefile
+++ b/src/makefile
@@ -118,7 +118,7 @@ gui-qt: highlight-gui
highlight-gui: libhighlight.a ${GUI_OBJECTS}
cd gui-qt && \
- ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
+ ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" GUI_DATA_DIR=\\\"${GUI_DATA_DIR}\\\" ' && \
$(MAKE)
$(OBJECTFILES) : makefile

55
gnu/packages/patches/maturin-no-cross-compile.patch Normal file
View file

@ -0,0 +1,55 @@
Remove dependencies on xwin and zig. We're not offering cross-compilation
options using these crates.
diff --git a/Cargo.toml b/Cargo.toml
index 6cbdca3..22ea5ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,16 +76,6 @@ version = "0.1.4"
[dependencies.cargo-options]
version = "0.6.0"
-[dependencies.cargo-xwin]
-version = "0.14.3"
-optional = true
-default-features = false
-
-[dependencies.cargo-zigbuild]
-version = "0.16.10"
-optional = true
-default-features = false
-
[dependencies.cargo_metadata]
version = "0.15.3"
@@ -310,8 +300,6 @@ version = "4.3.0"
[features]
cli-completion = ["dep:clap_complete_command"]
cross-compile = [
- "zig",
- "xwin",
]
default = [
"full",
@@ -330,7 +318,6 @@ log = ["tracing-subscriber"]
native-tls = [
"dep:native-tls",
"ureq?/native-tls",
- "cargo-xwin?/native-tls",
"dep:rustls-pemfile",
]
password-storage = [
@@ -340,7 +327,6 @@ password-storage = [
rustls = [
"dep:rustls",
"ureq?/tls",
- "cargo-xwin?/rustls-tls",
"dep:rustls-pemfile",
]
scaffolding = [
@@ -358,5 +344,3 @@ upload = [
"wild",
"dep:dirs",
]
-xwin = ["cargo-xwin"]
-zig = ["cargo-zigbuild"]

337
gnu/packages/patches/mcrl2-fix-1687.patch
View file

@ -1,337 +0,0 @@
Taken from upstream:
https://github.com/mCRL2org/mCRL2/commit/f38998be5198236bc5bf5a957b0e132d6d6d8bee
Fixes bug in ltsconvert:
https://listserver.tue.nl/pipermail/mcrl2-users/2022-June/000395.html
From f38998be5198236bc5bf5a957b0e132d6d6d8bee Mon Sep 17 00:00:00 2001
From: Jan Friso Groote <J.F.Groote@tue.nl>
Date: Tue, 28 Jun 2022 12:27:47 +0200
Subject: [PATCH] Solved bug report #1687
Hidden actions were not properly recognized in ltsconvert. Multiactions
that were partly hidden compared with the default action label, and had
to be compared with a tau-action. This caused multiple tau-actions to be
listed in the list of actions of an lts, and this caused other tools to
go astray.
The code to rename actions has completely be rewritten.
This should solve #1687.
A test have been added.
---
libraries/lts/include/mcrl2/lts/lts.h | 95 ++++++++++++++++++++++---
libraries/lts/test/lts_test.cpp | 61 ++++++++--------
tools/release/ltsconvert/ltsconvert.cpp | 3 +-
3 files changed, 116 insertions(+), 43 deletions(-)
diff --git a/libraries/lts/include/mcrl2/lts/lts.h b/libraries/lts/include/mcrl2/lts/lts.h
index 095031e7c..8562eb900 100644
--- a/libraries/lts/include/mcrl2/lts/lts.h
+++ b/libraries/lts/include/mcrl2/lts/lts.h
@@ -25,6 +25,7 @@
#include <algorithm>
#include <cassert>
#include <set>
+#include <map>
#include "mcrl2/lts/transition.h"
#include "mcrl2/lts/lts_type.h"
@@ -482,40 +483,112 @@ class lts: public LTS_BASE
return;
}
+ std::map<labels_size_type, labels_size_type> action_rename_map;
for (labels_size_type i=0; i< num_action_labels(); ++i)
{
ACTION_LABEL_T a=action_label(i);
a.hide_actions(tau_actions);
- if (a==ACTION_LABEL_T())
+ if (a==ACTION_LABEL_T::tau_action())
{
- m_hidden_label_set.insert(i);
+ if (i!=const_tau_label_index)
+ {
+ m_hidden_label_set.insert(i);
+ }
}
else if (a!=action_label(i))
{
- set_action_label(i,a);
+ /* In this the action_label i is changed by the tau_actions but not renamed to tau.
+ We check whether a maps onto another action label index. If yes, it is added to
+ the rename map, and we explicitly rename transition labels with this label afterwards.
+ If no, we rename the action label.
+ */
+ bool found=false;
+ for (labels_size_type j=0; !found && j< num_action_labels(); ++j)
+ {
+ if (a==action_label(j))
+ {
+ if (i!=j)
+ {
+ action_rename_map[i]=j;
+ }
+ found=true;
+ }
+ }
+ if (!found) // a!=action_label(j) for any j, then rename action_label(i) to a.
+ {
+ set_action_label(i,a);
+ }
+ }
+ }
+
+ if (action_rename_map.size()>0) // Check whether there are action labels that must be renamed, and
+ {
+ for(transition& t: m_transitions)
+ {
+ auto i = action_rename_map.find(t.label());
+ if (i!=action_rename_map.end())
+ {
+ t=transition(t.from(),i->second,t.to());
+ }
}
}
}
- /** \brief Apply the recorded actions that are renamed to internal actions to the lts.
- * \details After hiding actions, it checks whether action labels are
- * equal and merges actions with the same labels in the lts.
+ /** \brief Rename the hidden actions in the lts.
+ * \details Multiactions can be partially renamed. I.e. a|b becomes a if b is hidden.
+ * In such a case the new action a is mapped onto an existing action a; if such
+ * a label a does not exist, the action a|b is renamed to a.
* \param[in] tau_actions Vector with strings indicating which actions must be
* transformed to tau's */
- void apply_hidden_actions(void)
+ void apply_hidden_actions(const std::vector<std::string>& tau_actions)
{
- if (m_hidden_label_set.size()>0) // Check whether there is something to rename.
+ if (tau_actions.size()==0)
+ {
+ return;
+ }
+
+ std::map<labels_size_type, labels_size_type> action_rename_map;
+ for (labels_size_type i=0; i< num_action_labels(); ++i)
+ {
+ ACTION_LABEL_T a=action_label(i);
+ a.hide_actions(tau_actions);
+#ifndef NDEBUG
+ ACTION_LABEL_T b=a;
+ b.hide_actions(tau_actions);
+ assert(a==b); // hide_actions applied twice yields the same result as applying it once.
+#endif
+ bool found=false;
+ for (labels_size_type j=0; !found && j< num_action_labels(); ++j)
+ {
+ if (a==action_label(j))
+ {
+ if (i!=j)
+ {
+ action_rename_map[i]=j;
+ }
+ found=true;
+ }
+ }
+ if (!found) // a!=action_label(j) for any j, then rename action_label(i) to a.
+ {
+ set_action_label(i,a);
+ }
+ }
+
+
+ if (action_rename_map.size()>0) // Check whether there is something to rename.
{
for(transition& t: m_transitions)
{
- if (m_hidden_label_set.count(t.label()))
+ auto i = action_rename_map.find(t.label());
+ if (i!=action_rename_map.end())
{
- t=transition(t.from(),tau_label_index(),t.to());
+ t=transition(t.from(),i->second,t.to());
}
}
- m_hidden_label_set.clear(); // Empty the hidden label set.
}
}
+
/** \brief Checks whether this LTS has state values associated with its states.
* \retval true if the LTS has state information;
* \retval false otherwise.
diff --git a/libraries/lts/test/lts_test.cpp b/libraries/lts/test/lts_test.cpp
index 5840393d9..ad69f6275 100644
--- a/libraries/lts/test/lts_test.cpp
+++ b/libraries/lts/test/lts_test.cpp
@@ -149,7 +149,7 @@ static void reduce_lts_in_various_ways(const std::string& test_description,
BOOST_CHECK(is_deterministic(l));
}
-static void reduce_simple_loop()
+BOOST_AUTO_TEST_CASE(reduce_simple_loop)
{
std::string SIMPLE_AUT =
"des (0,2,2)\n"
@@ -173,7 +173,7 @@ static void reduce_simple_loop()
reduce_lts_in_various_ways("Simple loop", SIMPLE_AUT, expected);
}
-static void reduce_simple_loop_with_tau()
+BOOST_AUTO_TEST_CASE(reduce_simple_loop_with_tau)
{
std::string SIMPLE_AUT =
"des (0,2,2)\n"
@@ -200,7 +200,7 @@ static void reduce_simple_loop_with_tau()
/* The example below was encountered by David Jansen. The problem is that
* for branching bisimulations the tau may supersede the b, not leading to the
* necessary splitting into two equivalence classes. */
-static void tricky_example_for_branching_bisimulation()
+BOOST_AUTO_TEST_CASE(tricky_example_for_branching_bisimulation)
{
std::string TRICKY_BB =
"des (0,3,2)\n"
@@ -226,7 +226,7 @@ static void tricky_example_for_branching_bisimulation()
}
-static void reduce_abp()
+BOOST_AUTO_TEST_CASE(reduce_abp)
{
std::string ABP_AUT =
"des (0,92,74)\n"
@@ -342,7 +342,7 @@ static void reduce_abp()
// Peterson's protocol has the interesting property that the number of states modulo branching bisimulation
// differs from the number of states modulo weak bisimulation, as observed by Rob van Glabbeek.
-static void reduce_peterson()
+BOOST_AUTO_TEST_CASE(reduce_peterson)
{
std::string PETERSON_AUT =
"des (0,59,35)\n"
@@ -423,7 +423,7 @@ static void reduce_peterson()
reduce_lts_in_various_ways("Peterson protocol", PETERSON_AUT, expected);
}
-static void test_reachability()
+BOOST_AUTO_TEST_CASE(test_reachability)
{
std::string REACH =
"des (0,4,5) \n"
@@ -449,7 +449,7 @@ static void test_reachability()
// The example below caused failures in the GW mlogn branching bisimulation
// algorithm when cleaning the code up.
-static void failing_test_groote_wijs_algorithm()
+BOOST_AUTO_TEST_CASE(failing_test_groote_wijs_algorithm)
{
std::string GWLTS =
"des(0,29,10)\n"
@@ -511,7 +511,7 @@ static void failing_test_groote_wijs_algorithm()
// It has not been implemented fully. The problem is that it is difficult to
// prescribe the order in which refinements have to be done.
-static void counterexample_jk_1(std::size_t k)
+void counterexample_jk_1(std::size_t k)
{
// numbering scheme of states:
// states 0..k-1 are the blue squares
@@ -571,7 +571,7 @@ static void counterexample_jk_1(std::size_t k)
// In the meantime, the bug is corrected: this is why the first part of the
// algorithm now follows a much simpler line than previously.
-static void counterexample_postprocessing()
+BOOST_AUTO_TEST_CASE(counterexample_postprocessing)
{
std::string POSTPROCESS_AUT =
"des(0,33,13)\n"
@@ -634,7 +634,7 @@ static void counterexample_postprocessing()
test_lts("postprocessing problem (branching bisimulation signature [Blom/Orzan 2003])",l,expected_label_count, expected_state_count, expected_transition_count);
}
-static void regression_delete_old_bb_slice()
+BOOST_AUTO_TEST_CASE(regression_delete_old_bb_slice)
{
std::string POSTPROCESS_AUT =
"des(0,163,100)\n"
@@ -824,7 +824,7 @@ static void regression_delete_old_bb_slice()
test_lts("regression test for GJKW bug (branching bisimulation signature [Blom/Orzan 2003])",l,expected_label_count, expected_state_count, expected_transition_count);
}
-void is_deterministic_test1()
+BOOST_AUTO_TEST_CASE(is_deterministic_test1)
{
std::string automaton =
"des(0,2,2)\n"
@@ -837,7 +837,7 @@ void is_deterministic_test1()
BOOST_CHECK(is_deterministic(l_det));
}
-void is_deterministic_test2()
+BOOST_AUTO_TEST_CASE(is_deterministic_test2)
{
std::string automaton =
"des(0,2,2)\n"
@@ -850,24 +850,25 @@ void is_deterministic_test2()
BOOST_CHECK(!is_deterministic(l_det));
}
-void test_is_deterministic()
+BOOST_AUTO_TEST_CASE(hide_actions1)
{
- is_deterministic_test1();
- is_deterministic_test2();
-}
+ std::string automaton =
+ "des (0,4,3)\n"
+ "(0,\"<state>\",1)\n"
+ "(1,\"return|hello\",2)\n"
+ "(1,\"return\",2)\n"
+ "(2,\"world\",1)\n";
+
+ std::istringstream is(automaton);
+ lts::lts_aut_t l;
+ l.load(is);
+ std::vector<std::string>hidden_actions(1,"hello");
+ l.apply_hidden_actions(hidden_actions);
+ reduce(l,lts::lts_eq_bisim);
+ std::size_t expected_label_count = 5;
+ std::size_t expected_state_count = 3;
+ std::size_t expected_transition_count = 3;
+ test_lts("regression test for GJKW bug (branching bisimulation [Jansen/Groote/Keiren/Wijs 2019])",l,expected_label_count, expected_state_count, expected_transition_count);
+
-BOOST_AUTO_TEST_CASE(test_main)
-{
- reduce_simple_loop();
- reduce_simple_loop_with_tau();
- tricky_example_for_branching_bisimulation();
- reduce_abp();
- reduce_peterson();
- test_reachability();
- test_is_deterministic();
- failing_test_groote_wijs_algorithm();
- counterexample_jk_1(3);
- counterexample_postprocessing();
- regression_delete_old_bb_slice();
- // TODO: Add groote wijs branching bisimulation and add weak bisimulation tests. For the last Peterson is a good candidate.
}
diff --git a/tools/release/ltsconvert/ltsconvert.cpp b/tools/release/ltsconvert/ltsconvert.cpp
index 231deabe2..5645d31d1 100644
--- a/tools/release/ltsconvert/ltsconvert.cpp
+++ b/tools/release/ltsconvert/ltsconvert.cpp
@@ -123,8 +123,7 @@ class ltsconvert_tool : public input_output_tool
LTS_TYPE l;
l.load(tool_options.infilename);
- l.record_hidden_actions(tool_options.tau_actions);
- l.apply_hidden_actions();
+ l.apply_hidden_actions(tool_options.tau_actions);
if (tool_options.check_reach)
{
--
2.35.1

32
gnu/packages/patches/mcrl2-fix-counterexample.patch
View file

@ -1,32 +0,0 @@
Taken from upstream:
https://github.com/mCRL2org/mCRL2/commit/435421429dde9dcc5956e8a978597111a3947ec1
Fixes bug in ltscompare:
https://listserver.tue.nl/pipermail/mcrl2-users/2022-June/000396.html
From 435421429dde9dcc5956e8a978597111a3947ec1 Mon Sep 17 00:00:00 2001
From: Maurice Laveaux <m.laveaux@tue.nl>
Date: Wed, 29 Jun 2022 10:27:58 +0200
Subject: [PATCH] Write counterexample's structured output trace on single
line.
---
libraries/lts/include/mcrl2/lts/detail/counter_example.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libraries/lts/include/mcrl2/lts/detail/counter_example.h b/libraries/lts/include/mcrl2/lts/detail/counter_example.h
index c339cfde4..ca3967768 100644
--- a/libraries/lts/include/mcrl2/lts/detail/counter_example.h
+++ b/libraries/lts/include/mcrl2/lts/detail/counter_example.h
@@ -139,7 +139,7 @@ class counter_example_constructor
if (m_structured_output)
{
std::cout << m_name << ": ";
- result.save("", mcrl2::lts::trace::tfPlain); // Write to stdout.
+ result.save("", mcrl2::lts::trace::tfLine); // Write to stdout.
}
else
{
--
2.35.1

30
gnu/packages/patches/openssh-hurd.patch
View file

@ -1,30 +0,0 @@
Author: Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Not upstreamed.
From 1ddae040d67e9a4ebcc3e1b95af1bff12c0f086b Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Date: Tue, 7 Apr 2020 17:41:05 +0200
Subject: [PATCH] Build fix for the Hurd.
* gss-serv.c (ssh_gssapi_acquire_cred): Use HOST_NAME_MAX instead of
MAXHOSTNAMELEN.
---
gss-serv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gss-serv.c b/gss-serv.c
index 1d47870e7..22081c6f1 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -107,7 +107,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
gss_create_empty_oid_set(&status, &oidset);
gss_add_oid_set_member(&status, ctx->oid, &oidset);
- if (gethostname(lname, MAXHOSTNAMELEN)) {
+ if (gethostname(lname, HOST_NAME_MAX)) {
gss_release_oid_set(&status, &oidset);
return (-1);
}
--
2.26.0

242
gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch Normal file
View file

@ -0,0 +1,242 @@
Submitted upstream: https://github.com/mquinson/po4a/pull/437
From 43db5c0b14ec2a8ba44d338bce024df87256457b Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 27 Jul 2023 17:44:49 -0400
Subject: [PATCH] lib: Texinfo: Translate partial menu node names.
Fixes <https://issues.guix.gnu.org/64881>.
* lib/Locale/Po4a/Texinfo.pm (translate_buffer_menuentry): Refine
regexp, so that it matches menu entries lacking a description.
Only call 'translate_buffer' on the description if it was provided.
* t/fmt/texinfo/partialmenus.trans: New file.
* t/fmt/texinfo/partialmenus.texi: Likewise.
* t/fmt/texinfo/partialmenus.pot: Likewise.
* t/fmt/texinfo/partialmenus.po: Likewise.
* t/fmt/texinfo/partialmenus.norm: Likewise.
* t/fmt-texinfo.t: Register the new 'partialmenus' test.
---
lib/Locale/Po4a/Texinfo.pm | 7 +++---
t/fmt-texinfo.t | 2 +-
t/fmt/texinfo/partialmenus.norm | 21 +++++++++++++++++
t/fmt/texinfo/partialmenus.po | 40 ++++++++++++++++++++++++++++++++
t/fmt/texinfo/partialmenus.pot | 40 ++++++++++++++++++++++++++++++++
t/fmt/texinfo/partialmenus.texi | 14 +++++++++++
t/fmt/texinfo/partialmenus.trans | 21 +++++++++++++++++
7 files changed, 141 insertions(+), 4 deletions(-)
create mode 100644 t/fmt/texinfo/partialmenus.norm
create mode 100644 t/fmt/texinfo/partialmenus.po
create mode 100644 t/fmt/texinfo/partialmenus.pot
create mode 100644 t/fmt/texinfo/partialmenus.texi
create mode 100644 t/fmt/texinfo/partialmenus.trans
diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm
index b4750699..1c3a4bae 100644
--- a/lib/Locale/Po4a/Texinfo.pm
+++ b/lib/Locale/Po4a/Texinfo.pm
@@ -336,7 +336,7 @@ sub translate_buffer_menuentry {
my $translated_buffer = "";
- if ( $buffer =~ m/^(.*?)(::)\s+(.*)$/s
+ if ( $buffer =~ m/^(.*?)(::)(?:\s+(.*))?$/s
or $buffer =~ m/^(.*?: .*?)(\.)\s+(.*)$/s )
{
my ( $name, $sep, $description ) = ( $1, $2, $3 );
@@ -347,8 +347,9 @@ sub translate_buffer_menuentry {
$translated_buffer .= ' ' x ( $menu_sep_width - 1 - $l );
$l = $menu_sep_width - 1;
}
- ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env );
-
+ if ($description) {
+ ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env );
+ }
# Replace newlines with space for proper wrapping
# See https://github.com/mquinson/po4a/issues/122
$t =~ s/\n/ /sg;
diff --git a/t/fmt-texinfo.t b/t/fmt-texinfo.t
index 4b067e43..d9ed5df3 100644
--- a/t/fmt-texinfo.t
+++ b/t/fmt-texinfo.t
@@ -10,7 +10,7 @@ use Testhelper;
my @tests;
-for my $test (qw(longmenu comments tindex)) {
+for my $test (qw(longmenu partialmenus comments tindex)) {
push @tests,
{
'format' => 'texinfo',
diff --git a/t/fmt/texinfo/partialmenus.norm b/t/fmt/texinfo/partialmenus.norm
new file mode 100644
index 00000000..99240682
--- /dev/null
+++ b/t/fmt/texinfo/partialmenus.norm
@@ -0,0 +1,21 @@
+\input texinfo
+@c ===========================================================================
+@c
+@c This file was generated with po4a. Translate the source file.
+@c
+@c ===========================================================================
+
+
+@c These menus do not contain a description, which used to cause a
+@c Texinfo menu entry to not be translated.
+@menu
+* A menu entry without any description:: A menu entry without any
+ description
+* Optional menu name: The menu node:: Optional menu name: The menu node
+@end menu
+
+@node A menu entry without any description
+@chapter A menu entry without any description
+
+@node The menu node
+@chapter Optional menu name
diff --git a/t/fmt/texinfo/partialmenus.po b/t/fmt/texinfo/partialmenus.po
new file mode 100644
index 00000000..31a14443
--- /dev/null
+++ b/t/fmt/texinfo/partialmenus.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2023-07-27 17:29-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: chapter
+#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11
+#, no-wrap
+msgid "A menu entry without any description"
+msgstr "A MENU ENTRY WITHOUT ANY DESCRIPTION"
+
+#. type: menuentry
+#: partialmenus.texi:8
+msgid "Optional menu name: The menu node"
+msgstr "OPTIONAL MENU NAME: THE MENU NODE"
+
+#. type: node
+#: partialmenus.texi:13
+#, no-wrap
+msgid "The menu node"
+msgstr "THE MENU NODE"
+
+#. type: chapter
+#: partialmenus.texi:14
+#, no-wrap
+msgid "Optional menu name"
+msgstr "OPTIONAL MENU NAME"
diff --git a/t/fmt/texinfo/partialmenus.pot b/t/fmt/texinfo/partialmenus.pot
new file mode 100644
index 00000000..0379f805
--- /dev/null
+++ b/t/fmt/texinfo/partialmenus.pot
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2023-08-16 09:47-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: chapter
+#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11
+#, no-wrap
+msgid "A menu entry without any description"
+msgstr ""
+
+#. type: menuentry
+#: partialmenus.texi:8
+msgid "Optional menu name: The menu node"
+msgstr ""
+
+#. type: node
+#: partialmenus.texi:13
+#, no-wrap
+msgid "The menu node"
+msgstr ""
+
+#. type: chapter
+#: partialmenus.texi:14
+#, no-wrap
+msgid "Optional menu name"
+msgstr ""
diff --git a/t/fmt/texinfo/partialmenus.texi b/t/fmt/texinfo/partialmenus.texi
new file mode 100644
index 00000000..f8663a2b
--- /dev/null
+++ b/t/fmt/texinfo/partialmenus.texi
@@ -0,0 +1,14 @@
+\input texinfo
+
+@c These menus do not contain a description, which used to cause a
+@c Texinfo menu entry to not be translated.
+@menu
+* A menu entry without any description::
+* Optional menu name: The menu node::
+@end menu
+
+@node A menu entry without any description
+@chapter A menu entry without any description
+
+@node The menu node
+@chapter Optional menu name
diff --git a/t/fmt/texinfo/partialmenus.trans b/t/fmt/texinfo/partialmenus.trans
new file mode 100644
index 00000000..0ef742a1
--- /dev/null
+++ b/t/fmt/texinfo/partialmenus.trans
@@ -0,0 +1,21 @@
+\input texinfo
+@c ===========================================================================
+@c
+@c This file was generated with po4a. Translate the source file.
+@c
+@c ===========================================================================
+
+
+@c These menus do not contain a description, which used to cause a
+@c Texinfo menu entry to not be translated.
+@menu
+* A MENU ENTRY WITHOUT ANY DESCRIPTION:: A MENU ENTRY WITHOUT ANY
+ DESCRIPTION
+* OPTIONAL MENU NAME: THE MENU NODE:: OPTIONAL MENU NAME: THE MENU NODE
+@end menu
+
+@node A MENU ENTRY WITHOUT ANY DESCRIPTION
+@chapter A MENU ENTRY WITHOUT ANY DESCRIPTION
+
+@node THE MENU NODE
+@chapter OPTIONAL MENU NAME
base-commit: 5b1cd768afdf4e9445812c5d43428495a0fde3c6
--
2.41.0

48
gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
View file

@ -1,48 +0,0 @@
Subject: nettle-sys: clear out "vendored" feature cruft from build.rs
From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor <dkg@fifthhorseman.net>
https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5
https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/
--- a/Cargo.toml 2019-10-23 13:08:07.000000000 -0400
+++ b/Cargo.toml 2019-10-23 14:08:46.644064014 -0400
@@ -29,12 +29,9 @@
version = "0.51.1"
default-features = false
-[build-dependencies.nettle-src]
-version = "3.5.1-0"
-optional = true
-
[build-dependencies.pkg-config]
version = "0.3"
[features]
vendored = ["nettle-src"]
+nettle-src = []
diff --git a/build.rs b/build.rs
index 44f7af3..ede4b2f 100644
--- a/build.rs
+++ b/build.rs
@@ -1,7 +1,5 @@
extern crate bindgen;
extern crate pkg_config;
-#[cfg(feature = "vendored")]
-extern crate nettle_src;
use std::env;
use std::fs;
@@ -36,14 +34,6 @@ fn main() {
println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
- #[cfg(feature = "vendored")]
- {
- let artifacts = nettle_src::Build::new().build();
- println!("cargo:vendored=1");
- env::set_var("PKG_CONFIG_PATH",
- artifacts.lib_dir().join("pkgconfig"));
- }
-
let nettle = pkg_config::probe_library("nettle hogweed").unwrap();
let mode = match env::var_os("NETTLE_STATIC") {

2293
gnu/packages/patches/rust-ring-0.16-missing-files.patch Normal file
View file

File diff suppressed because it is too large Load diff

54
gnu/packages/patches/rust-ring-0.16-test-files.patch Normal file
View file

@ -0,0 +1,54 @@
This file exists in the upstream repository at the commit which
corresponds to the ring-0.16.20 release, but was excluded from the
release tarball.
---
tests/ed25519_verify_tests.txt | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 tests/ed25519_verify_tests.txt
diff --git a/tests/ed25519_verify_tests.txt b/tests/ed25519_verify_tests.txt
new file mode 100644
index 0000000..74c94b3
--- /dev/null
+++ b/tests/ed25519_verify_tests.txt
@@ -0,0 +1,34 @@
+# BoringSSL TEST(Ed25519Test Malleability)
+
+# Control; S is in range.
+MESSAGE = 54657374
+SIG = 7c38e026f29e14aabd059a0f2db8b0cd783040609a8be684db12f82a27774ab07a9155711ecfaf7f99f277bad0c6ae7e39d4eef676573336a5c51eb6f946b30d
+PUB = 7d4d0e7f6153a69b6242b522abbee685fda4420f8834b108c3bdae369ef549fa
+Result = P
+
+# Same as above, but with the order L added to S so it is out of range.
+# BoringSSL commit 472ba2c2dd52d06a657a63b7fbf02732a6649d21
+MESSAGE = 54657374
+SIG = 7c38e026f29e14aabd059a0f2db8b0cd783040609a8be684db12f82a27774ab067654bce3832c2d76f8f6f5dafc08d9339d4eef676573336a5c51eb6f946b31d
+PUB = 7d4d0e7f6153a69b6242b522abbee685fda4420f8834b108c3bdae369ef549fa
+Result = F
+
+
+# BoringSSL commit 3094902fcdc2db2cc832fa854b9a6a8be383926c
+MESSAGE = 124e583f8b8eca58bb29c271b41d36986bbc45541f8e51f9cb0133eca447601e
+SIG = dac119d6ca87fc59ae611c157048f4d4fc932a149dbe20ec6effd1436abf83ea05c7df0fef06147241259113909bc71bd3c53ba4464ffcad3c0968f2ffffff0f
+PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
+Result = P
+
+# Control. Same key as above; same message and signature as below, except S is in range.
+PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
+MESSAGE = 6a0bc2b0057cedfc0fa2e3f7f7d39279b30f454a69dfd1117c758d86b19d85e0
+SIG = 0971f86d2c9c78582524a103cb9cf949522ae528f8054dc20107d999be673ff4f58ac9d20ec563133cabc6230b1db8625f8446639ede46ad4df4053000000000
+Result = P
+
+# Same key as above, but S is out of range.
+# BoringSSL commit 472ba2c2dd52d06a657a63b7fbf02732a6649d21
+PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
+MESSAGE = 6a0bc2b0057cedfc0fa2e3f7f7d39279b30f454a69dfd1117c758d86b19d85e0
+SIG = 0971f86d2c9c78582524a103cb9cf949522ae528f8054dc20107d999be673ff4e25ebf2f2928766b1248bec6e91697775f8446639ede46ad4df4053000000010
+Result = F
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

2
gnu/packages/pdf.scm
View file

@ -1040,7 +1040,7 @@ (define-public xournalpp
(inputs
(list alsa-lib
gtk+
librsvg
(librsvg-for-system)
libsndfile
libxml2
libzip

65
gnu/packages/photo.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016-2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
@ -617,7 +617,7 @@ (define-public photoflare
(define-public entangle
(package
(name "entangle")
(version "3.0")
(version "3.0") ; delete the 'build-with-meson-0.60 phase when updating
(source
(origin
(method git-fetch)
@ -629,34 +629,39 @@ (define-public entangle
(base32 "1pdmgxjdb3xlcqsaz7l8qzj5f7g7nwzhsrgid8929bm36d49cgc7"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))
#t))
(add-after 'install 'wrap-gi-python
;; Make GTK find files needed by plugins.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/entangle")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(list
#:glib-or-gtk? #t
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'build-with-meson-0.60
;; Work around ‘ERROR: Function does not take positional arguments.’.
(lambda _
(substitute* "src/meson.build"
(("^i18n\\.merge_file.*" match)
(string-append match " data_dirs:")))))
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))))
(add-after 'install 'wrap-gi-python
;; Make GTK find files needed by plugins.
(lambda* (#:key inputs #:allow-other-keys)
(let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append #$output "/bin/entangle")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
(native-inputs
`(("cmake" ,cmake)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("perl" ,perl)
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)))
(list cmake
gettext-minimal
`(,glib "bin")
gobject-introspection
gtk-doc
itstool
libxml2
perl
pkg-config))
(inputs
(list gdk-pixbuf
gexiv2
@ -791,7 +796,7 @@ (define-public rawtherapee
libiptcdata
libjpeg-turbo
libpng
librsvg
(librsvg-for-system)
libsigc++
libtiff
zlib))

135
gnu/packages/pretty-print.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,7 +52,8 @@ (define-module (gnu packages pretty-print)
#:use-module (gnu packages lua)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages swig))
#:use-module (gnu packages swig)
#:use-module (gnu packages qt))
(define-public a2ps
(package
@ -350,55 +352,96 @@ (define-public source-highlight
(define-public highlight
(package
(name "highlight")
(version "3.62")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.andre-simon.de/zip/highlight-"
version ".tar.bz2"))
(sha256
(base32 "088di7qxd6b2r22qljllhnly0r9a0lfnwnfqswjn23s09awjbl6p"))))
(version "4.7")
(outputs (list "out" "gui"))
(source (origin
(method url-fetch)
(uri (string-append "http://www.andre-simon.de/zip/highlight-"
version ".tar.bz2"))
(sha256
(base32
"1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1"))
(patches (search-patches "highlight-gui-data-dir.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags
(let ((confdir (string-append %output "/share/highlight/config/")))
(list (string-append "PREFIX=" %output)
(string-append "HL_CONFIG_DIR=" confdir)
(string-append "conf_dir=" confdir)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-after 'unpack 'fix-search-for-lua
(lambda _
(substitute* "src/makefile"
(("(LUA_PKG_NAME=).*" _ assignment)
(string-append assignment "lua-" ,(version-major+minor
(package-version lua))
"\n")))
(substitute* "extras/swig/makefile"
(("lua") (string-append "lua-" ,(version-major+minor
(package-version lua)))))
#t))
(add-after 'install 'install-perl-bindings
(lambda* (#:key outputs #:allow-other-keys)
(let* ((perldir (string-append (assoc-ref outputs "out")
"/lib/perl5/site_perl/"
,(package-version perl)))
(autodir (string-append perldir "/auto/highlight")))
(with-directory-excursion "extras/swig"
(invoke "make" "perl")
(invoke "perl" "-I" "." "testmod.pl")
(install-file "highlight.pm" perldir)
(install-file "highlight.so" autodir))
#t))))))
(inputs
(list lua boost perl))
(native-inputs
(list pkg-config swig))
(list #:tests? #f ;no tests
#:make-flags #~(let ((confdir (string-append %output
"/share/highlight/config/")))
(list (string-append "PREFIX=" %output)
(string-append "HL_CONFIG_DIR=" confdir)
(string-append "conf_dir=" confdir)))
#:phases #~(modify-phases %standard-phases
(delete 'configure) ;no configure script
(add-after 'unpack 'fix-search-for-lua
(lambda _
(let ((ver #$(version-major+minor (package-version
lua))))
(substitute* "src/makefile"
(("(LUA_PKG_NAME=).*" _ assignment)
(string-append assignment "lua-" ver "\n")))
(substitute* "src/gui-qt/highlight.pro"
(("(PKGCONFIG \\+= lua)" _ assignment)
(string-append assignment "-" ver)))
(substitute* "extras/swig/makefile"
(("lua")
(string-append "lua-" ver))))))
(add-after 'build 'build-gui
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(data (string-append out
"/share/highlight/"))
(conf (string-append out "/etc/highlight/"))
(doc (string-append out
"/share/doc/highlight/"))
(gui (assoc-ref outputs "gui"))
(gui-data (string-append gui
"/share/highlight/")))
;; modified version of gui task in makefile
(invoke "make"
"-C"
"./src"
"-f"
"./makefile"
(string-append "HL_DATA_DIR=" data)
(string-append "HL_CONFIG_DIR=" conf)
(string-append "HL_DOC_DIR=" doc)
(string-append "GUI_DATA_DIR=" gui-data)
"gui-qt"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(invoke "make" "install"
(string-append "PREFIX=" out)))))
(add-after 'install 'install-perl-bindings
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(data (string-append out
"/share/highlight/"))
(conf (string-append out "/etc/highlight/"))
(perldir (string-append out
"/lib/perl5/site_perl/"
#$(package-version perl)))
(autodir (string-append perldir
"/auto/highlight")))
(with-directory-excursion "extras/swig"
(invoke "make" "perl"
(string-append "hl_data_dir=" data)
(string-append "hl_conf_dir=" conf))
(invoke "perl" "-I" "." "testmod.pl")
(install-file "highlight.pm" perldir)
(install-file "highlight.so" autodir)))))
(add-after 'install 'install-gui
(lambda* (#:key outputs #:allow-other-keys)
(let ((gui (assoc-ref outputs "gui")))
(mkdir-p (string-append gui "/bin"))
(invoke "make" "install-gui"
(string-append "PREFIX=" gui))))))))
(inputs (list lua boost perl qtbase-5))
(native-inputs (list pkg-config swig))
(home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php")
(synopsis "Convert code to documents with syntax highlighting")
(description "Highlight converts source code to HTML, XHTML, RTF, LaTeX,
(description
"Highlight converts source code to HTML, XHTML, RTF, LaTeX,
TeX, SVG, BBCode and terminal escape sequences with colored syntax
highlighting. Language definitions and color themes are customizable.")
(license gpl3+)))

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

@ -476,14 +476,14 @@ (define-public python-certifi
(define-public python-cryptography-vectors
(package
(name "python-cryptography-vectors")
(version "40.0.1")
(version "40.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32
"0hd0ppss5xg0kzf36q8cdaxh1xw8ry4k7jkianlf832xbdmp0q44"))))
"16hcprw919f2rl3jipsy2996bnsz170inway3lishqi30xwqf6x8"))))
(build-system python-build-system)
(home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package")
@ -495,14 +495,14 @@ (define-public python-cryptography-vectors
(define-public python-cryptography
(package
(name "python-cryptography")
(version "40.0.1")
(version "40.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32
"0wilrilfcyl78caxcpna2k3aya6qamppwv4j35262pz9n7wg40r8"))))
"16awbsm13vdksm98dybwvmpy2y1l636bq7g0s93scksrp0r0sg63"))))
(build-system pyproject-build-system)
(arguments
(list
@ -557,11 +557,6 @@ (define-public python-cryptography-rust
(guix build utils)
(srfi srfi-1)
(ice-9 match))
;; XXX: Building the test objects appear to fail due to a missing link
;; directive to Python's shared library (e.g.: "ld:
;; cryptography_rust.c950d742-cgu.11:(.text._ZN3...+0x57): undefined
;; reference to `PyLong_FromLong'").
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
@ -579,12 +574,18 @@ (define-public python-cryptography-rust
(apply (assoc-ref %standard-phases 'configure)
(append args
(list #:inputs (alist-delete "source" inputs))))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; As seen in tox.ini
(invoke "cargo" "test" "--no-default-features"))))
(add-after 'install 'install-shared-library
(lambda _
(install-file "target/release/libcryptography_rust.so"
(string-append #$output "/lib")))))
#:cargo-inputs
`(("rust-asn1-0.13" ,rust-asn1-0.13)
("rust-cc" ,rust-cc-1)
("rust-chrono-0.4" ,rust-chrono-0.4)
("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1)
("rust-once-cell-1" ,rust-once-cell-1)
@ -592,9 +593,7 @@ (define-public python-cryptography-rust
("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9)
("rust-ouroboros-0.15" ,rust-ouroboros-0.15)
("rust-pem-1" ,rust-pem-1)
("rust-pyo3-0.15" ,rust-pyo3-0.15))
#:cargo-development-inputs
`(("rust-cc" ,rust-cc-1))))
("rust-pyo3-0.15" ,rust-pyo3-0.15))))
(native-inputs (list pkg-config python python-cffi))
;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs
;; doesn't honor propagated-inputs.

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

@ -23251,17 +23251,15 @@ (define-public python-setuptools-git
(define-public python-setuptools-rust
(package
(name "python-setuptools-rust")
(version "1.1.2")
(version "1.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "setuptools-rust" version))
(sha256
(base32 "1lb57qx1azklgzmalflq960agvwci4bwddw0zvlc9zy00fsvkbd0"))))
(build-system python-build-system)
(base32 "0qi274r0fcnvxa8vs8vyhcknnzhq8pd0ig5zk1wmjc63x96p6vn8"))))
(build-system pyproject-build-system)
(arguments '(#:tests? #f)) ;no tests
(native-inputs
(list python-setuptools-scm))
(propagated-inputs
(list python-semantic-version python-typing-extensions))
(home-page "https://github.com/PyO3/setuptools-rust")

116
gnu/packages/rdesktop.scm
View file

@ -31,19 +31,29 @@ (define-module (gnu packages rdesktop)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
#:use-module (gnu packages docbook)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages mp3)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
@ -137,3 +147,109 @@ (define-public freerdp
functionality, and Windows Portable Runtime (WinPR), a portable implementation
of parts of the Windows API.")
(license license:asl2.0)))
(define-public xrdp
(package
(name "xrdp")
(version "0.9.22.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/neutrinolabs/xrdp/releases/download/v"
version "/xrdp-" version ".tar.gz"))
(sha256
(base32
"1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
(build-system gnu-build-system)
(inputs (list check
fuse-2
imlib2
lame
libjpeg-turbo
libx11
libxfixes
libxml2
libxpm
libxrandr
libxslt
libxt
linux-pam
openssl
pixman
python
python-libxml2))
(native-inputs (list bison
flex
gettext-minimal
intltool
nasm
pkg-config
pixman))
(arguments
(list #:configure-flags #~(list "--enable-strict-locations=yes"
"--enable-fuse=yes"
"--enable-mp3lame=yes"
"--enable-pixman=yes"
"--enable-imlib2=yes"
"--enable-pam-config=unix"
"--enable-ipv6=yes")))
(home-page "https://www.xrdp.org")
(synopsis "Remote Desktop Protocol (RDP) server")
(description
"Xrdp provides a graphical login to remote machines using
Microsoft Remote Desktop Protocol (RDP). Xrdp accepts connections from a
variety of RDP clients:
@itemize
@item FreeRDP
@item rdesktop
@item KRDC
@item NeutrinoRDP
@item Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
@item Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC).
@end itemize")
(license license:asl2.0)))
(define-public xorgxrdp
(package
(name "xorgxrdp")
(version "0.9.19")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
version "/xorgxrdp-" version ".tar.gz"))
(sha256
(base32
"0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))
(build-system gnu-build-system)
(inputs (list check
imlib2
libx11
libxfixes
libxfont2
libxml2
libxpm
libxrandr
libxslt
libxt
pixman
xdpyinfo
xorg-server
xrdp))
(native-inputs (list nasm
intltool
pkg-config
pixman))
(arguments
(list #:configure-flags #~(list "--enable-strict-locations=yes"
(string-append "XRDP_CFLAGS=-I"
#$(this-package-input
"xrdp") "/common"))))
(home-page "https://github.com/neutrinolabs/xorgxrdp")
(synopsis "Xorg drivers for xrdp")
(description
"xorgxrdp is a collection of modules to be used with a pre-existing X.Org
install to make the X server act like X11rdp. Unlike X11rdp, you don't have to
recompile the whole X Window System. Instead, additional modules are installed
to a location where the existing Xorg installation would pick them.")
(license license:x11)))

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

@ -41,6 +41,7 @@
(define-module (gnu packages rust-apps)
#:use-module (guix build-system cargo)
#:use-module (guix build-system pyproject)
#:use-module (guix deprecation)
#:use-module (guix download)
#:use-module (guix gexp)
@ -74,6 +75,8 @@ (define-module (gnu packages rust-apps)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages rust)
#:use-module (gnu packages tls)
@ -520,6 +523,11 @@ (define-public fd
(setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1")
(setenv "JEMALLOC_OVERRIDE"
(string-append jemalloc "/lib/libjemalloc.so")))))
(add-after 'unpack 'adjust-feature-flags
(lambda _
;; unstable-grouped was stablized in rust-clap 4.2.0
(substitute* "Cargo.toml"
((".*unstable-grouped.*") ""))))
(add-after 'install 'install-extra
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@ -729,6 +737,168 @@ (define-public i3status-rust
bar. It is also compatible with sway.")
(license license:gpl3)))
(define-public maturin
(package
(name "maturin")
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (crate-uri "maturin" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0asdljd396kdsvnx9kbsr5s0x6w73b59kdpx732333dhm13qgn03"))
(patches (search-patches "maturin-no-cross-compile.patch"))))
(build-system cargo-build-system)
(arguments
`(#:modules ((guix build cargo-build-system)
((guix build pyproject-build-system) #:prefix py:)
(guix build utils))
#:imported-modules ((guix build cargo-build-system)
(guix build cargo-utils)
,@%pyproject-build-system-modules)
#:install-source? #f
#:cargo-test-flags
'("--release" "--"
;; Not all files are included.
"--skip=build_options::test::test_find_bridge_bin"
"--skip=build_options::test::test_find_bridge_cffi"
"--skip=build_options::test::test_find_bridge_pyo3"
"--skip=build_options::test::test_find_bridge_pyo3_abi3"
"--skip=build_options::test::test_find_bridge_pyo3_feature"
"--skip=metadata::test::test_implicit_readme"
"--skip=metadata::test::test_merge_metadata_from_pyproject_dynamic_license_test"
"--skip=metadata::test::test_merge_metadata_from_pyproject_toml"
"--skip=metadata::test::test_merge_metadata_from_pyproject_toml_with_customized_python_source_dir"
"--skip=pyproject_toml::tests::test_warn_missing_maturin_version")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-base64" ,rust-base64-0.21)
("rust-bytesize" ,rust-bytesize-1)
("rust-cargo-config2" ,rust-cargo-config2-0.1)
("rust-cargo-options" ,rust-cargo-options-0.6)
;("rust-cargo-xwin" ,rust-cargo-xwin-0.14)
;("rust-cargo-zigbuild" ,rust-cargo-zigbuild-0.16)
("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
("rust-cbindgen" ,rust-cbindgen-0.24)
("rust-cc" ,rust-cc-1)
("rust-clap" ,rust-clap-4)
("rust-clap-complete-command" ,rust-clap-complete-command-0.5)
("rust-configparser" ,rust-configparser-3)
("rust-console" ,rust-console-0.15)
("rust-dialoguer" ,rust-dialoguer-0.10)
("rust-dirs" ,rust-dirs-5)
("rust-dunce" ,rust-dunce-1)
("rust-fat-macho" ,rust-fat-macho-0.4)
("rust-flate2" ,rust-flate2-1)
("rust-fs-err" ,rust-fs-err-2)
("rust-glob" ,rust-glob-0.3)
("rust-goblin" ,rust-goblin-0.6)
("rust-ignore" ,rust-ignore-0.4)
("rust-indexmap" ,rust-indexmap-1)
("rust-itertools" ,rust-itertools-0.10)
("rust-keyring" ,rust-keyring-2)
("rust-lddtree" ,rust-lddtree-0.3)
("rust-minijinja" ,rust-minijinja-0.34)
("rust-multipart" ,rust-multipart-0.18)
("rust-native-tls" ,rust-native-tls-0.2)
("rust-normpath" ,rust-normpath-1)
("rust-once-cell" ,rust-once-cell-1)
("rust-pep440-rs" ,rust-pep440-rs-0.3)
("rust-pep508-rs" ,rust-pep508-rs-0.2)
("rust-platform-info" ,rust-platform-info-2)
("rust-pyproject-toml" ,rust-pyproject-toml-0.6)
("rust-python-pkginfo" ,rust-python-pkginfo-0.5)
("rust-regex" ,rust-regex-1)
("rust-rustc-version" ,rust-rustc-version-0.4)
("rust-rustls" ,rust-rustls-0.20)
("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
("rust-same-file" ,rust-same-file-1)
("rust-semver" ,rust-semver-1)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-sha2" ,rust-sha2-0.10)
("rust-tar" ,rust-tar-0.4)
("rust-target-lexicon" ,rust-target-lexicon-0.12)
("rust-tempfile" ,rust-tempfile-3)
("rust-textwrap" ,rust-textwrap-0.16)
("rust-thiserror" ,rust-thiserror-1)
("rust-time" ,rust-time-0.3)
("rust-toml" ,rust-toml-0.7)
("rust-toml-edit" ,rust-toml-edit-0.19)
("rust-tracing" ,rust-tracing-0.1)
("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
("rust-ureq" ,rust-ureq-2)
("rust-url" ,rust-url-2)
("rust-wild" ,rust-wild-2)
("rust-zip" ,rust-zip-0.6))
#:cargo-development-inputs
(("rust-indoc" ,rust-indoc-2)
("rust-pretty-assertions" ,rust-pretty-assertions-1)
("rust-rustversion" ,rust-rustversion-1)
("rust-time" ,rust-time-0.3)
("rust-trycmd" ,rust-trycmd-0.14)
("rust-which" ,rust-which-4))
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-python-module
(lambda _
;; Match the features from the cargo-build-system and Cargo.toml.
(setenv "MATURIN_SETUP_ARGS" "--features=default")
((assoc-ref py:%standard-phases 'build))))
;; We can't use the pyproject install phase because maturin is a
;; binary, not a python script.
(add-after 'install 'install-python-module
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(wheel (car (find-files "dist" "\\.whl$")))
(site-dir (py:site-packages inputs outputs))
(pyversion
(string-append "python"
(py:python-version
(assoc-ref inputs "python-wrapper")))))
(invoke "python" "-m" "zipfile" "-e" wheel site-dir)
(mkdir-p (string-append out "/bin"))
(for-each delete-file
(find-files (string-append out "/lib/" pyversion)
"^maturin$")))))
(add-after 'install 'install-completions
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share"))
(maturin (string-append out "/bin/maturin")))
;; TODO? fig, nushell, powershell
(mkdir-p (string-append share "/bash-completion/completions"))
(with-output-to-file
(string-append share "/bash-completion/completions/maturin")
(lambda _ (invoke maturin "completions" "bash")))
(mkdir-p (string-append share "/fish/vendor_completions.d"))
(with-output-to-file
(string-append share "/fish/vendor_completions.d/maturin.fish")
(lambda _ (invoke maturin "completions" "fish")))
(mkdir-p (string-append share "/zsh/site-functions"))
(with-output-to-file
(string-append share "/zsh/site-functions/_maturin")
(lambda _ (invoke maturin "completions" "zsh")))
(mkdir-p (string-append share "/elvish/lib"))
(with-output-to-file
(string-append share "/elvish/lib/maturin")
(lambda _ (invoke maturin "completions" "elvish")))))))))
(propagated-inputs
(list python-tomli))
(native-inputs
(list perl
python-wheel
python-wrapper
python-setuptools-rust))
(home-page "https://github.com/pyo3/maturin")
(synopsis "Build and publish crates and python packages")
(description
"Build and publish crates with @code{pyo3}, @code{rust-cpython} and
@code{cffi} bindings as well as rust binaries as python packages.")
(license (list license:expat license:asl2.0))))
(define-public ripgrep
(package
(name "ripgrep")
@ -1099,19 +1269,6 @@ (define-public rust-cbindgen-0.23
(base32
"006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))
(define-public rust-cbindgen-0.20
(package
(inherit rust-cbindgen-0.24)
(name "rust-cbindgen")
(version "0.20.0")
(source (origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1p67vvjkxh07yfizfkvm6bjlv2bywrnl57hshcsz9h2x2qxrgqsi"))))))
(define-public rust-cbindgen-0.19
(package
(inherit rust-cbindgen)
@ -1144,36 +1301,6 @@ (define-public rust-cbindgen-0.19
(native-inputs
(list python-cython))))
(define-public rust-cbindgen-0.17
(package
(inherit rust-cbindgen)
(name "rust-cbindgen")
(version "0.17.0")
(source (origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1f40hxj6h7wqmsj8dzxjm3m421hjqpz2m5zxasbn8kgnr6scykvl"))))
(arguments
`(#:cargo-inputs
(("rust-clap" ,rust-clap-2)
("rust-heck" ,rust-heck-0.3)
("rust-indexmap" ,rust-indexmap-1)
("rust-log" ,rust-log-0.4)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-syn" ,rust-syn-1)
("rust-tempfile" ,rust-tempfile-3)
("rust-toml" ,rust-toml-0.5))
#:cargo-development-inputs
(("rust-serial-test" ,rust-serial-test-0.5))))
(native-inputs
(list python-cython))))
(define-public rust-cbindgen-0.16
(package
(inherit rust-cbindgen)
@ -1203,63 +1330,6 @@ (define-public rust-cbindgen-0.16
#:cargo-development-inputs
(("rust-serial-test" ,rust-serial-test-0.5))))))
(define-public rust-cbindgen-0.15
(package
(inherit rust-cbindgen)
(name "rust-cbindgen")
(version "0.15.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0dgf49zij9rxnf0lv4k5gcmx1mxcz16czkk6q63anz0xp8ds3xhx"))))
(arguments
`(#:tests? #false ;missing files
#:cargo-inputs
(("rust-clap" ,rust-clap-2)
("rust-heck" ,rust-heck-0.3)
("rust-indexmap" ,rust-indexmap-1)
("rust-log" ,rust-log-0.4)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-syn" ,rust-syn-1)
("rust-tempfile" ,rust-tempfile-3)
("rust-toml" ,rust-toml-0.5))))))
(define-public rust-cbindgen-0.14
(package
(inherit rust-cbindgen)
(name "rust-cbindgen")
(version "0.14.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ppwqbzydxlg9a24lynzfk60xrvqw4k31mpz1wrk6lbf88zf8nxi"))))))
(define-public rust-cbindgen-0.12
(package
(inherit rust-cbindgen)
(name "rust-cbindgen")
(version "0.12.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m"))))))
(define-public sniffglue
(package
(name "sniffglue")
@ -1869,7 +1939,7 @@ (define-public rust-analyzer
(define-public rust-cargo-c
(package
(name "rust-cargo-c")
(version "0.9.16+cargo-0.68")
(version "0.9.18+cargo-0.69")
(source
(origin
(method url-fetch)
@ -1878,12 +1948,12 @@ (define-public rust-cargo-c
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0k2sw67dx06b45qpvckbhz00kn2ingd89y53pwlzky72hnzv075v"))))
"191d0813g4m2g1c1h8ykgrfp00blkbds6pg3zl044iyxaclng29h"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-cargo" ,rust-cargo-0.68)
("rust-cargo" ,rust-cargo-0.69)
("rust-cargo-util" ,rust-cargo-util-0.2)
("rust-cbindgen" ,rust-cbindgen-0.24)
("rust-cc" ,rust-cc-1)
@ -1896,7 +1966,7 @@ (define-public rust-cargo-c
("rust-serde" ,rust-serde-1)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-toml" ,rust-toml-0.6))))
("rust-toml" ,rust-toml-0.7))))
(native-inputs
(list pkg-config))
(inputs

17
gnu/packages/rust.scm
View file

@ -705,7 +705,7 @@ (define rust-1.68
(rust-bootstrapped-package
rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk"))
;;; Note: Only the latest versions of Rust are supported and tested. The
;;; Note: Only the latest version of Rust is supported and tested. The
;;; intermediate rusts are built for bootstrapping purposes and should not
;;; be relied upon. This is to ease maintenance and reduce the time
;;; required to build the full Rust bootstrap chain.
@ -713,7 +713,7 @@ (define rust-1.68
;;; Here we take the latest included Rust, make it public, and re-enable tests
;;; and extra components such as rustfmt.
(define-public rust
(let ((base-rust rust-1.67))
(let ((base-rust rust-1.68))
(package
(inherit base-rust)
(outputs (cons "rustfmt" (package-outputs base-rust)))
@ -807,7 +807,7 @@ (define-public rust
;; We skip the test since it's drastically unlikely Guix's
;; packaging will introduce a bug here.
(lambda _
(delete-file "src/test/ui/parser/shebang/sneaky-attrib.rs")))
(delete-file "tests/ui/parser/shebang/sneaky-attrib.rs")))
(add-after 'unpack 'patch-process-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
@ -831,6 +831,17 @@ (define-public rust
((file) file))
(("fn ctrl_c_kills_everyone")
"#[ignore]\nfn ctrl_c_kills_everyone"))))
(add-after 'unpack 'adjust-rpath-values
;; This adds %output:out to rpath, allowing us to install utilities in
;; different outputs while reusing the shared libraries.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "src/bootstrap/builder.rs"
((" = rpath.*" all)
(string-append all
" "
"rustflags.arg(\"-Clink-args=-Wl,-rpath="
out "/lib\");\n"))))))
(add-after 'configure 'add-gdb-to-config
(lambda* (#:key inputs #:allow-other-keys)
(let ((gdb (assoc-ref inputs "gdb")))

2
gnu/packages/scheme.scm
View file

@ -21,7 +21,7 @@
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.

615
gnu/packages/sequoia.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,49 +21,43 @@ (define-module (gnu packages sequoia)
#:use-module (guix build-system cargo)
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages base) ; glibc
#:use-module (gnu packages check) ;; python-pytest
#:use-module (gnu packages crates-io)
#:use-module (gnu packages libffi) ;; python-cffi
#:use-module (gnu packages llvm)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build) ;python-setuptools
#:use-module (gnu packages rust)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls))
(define-public rust-sequoia-autocrypt-0.23
(define-public rust-sequoia-autocrypt-0.25
(package
(name "rust-sequoia-autocrypt")
(version "0.23.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "sequoia-autocrypt" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0skj0dv15341v470g6w5pggsl0iy27qb8h24rr8k6rq7vxdjxl7g"))))
(version "0.25.0")
(source (origin
(method url-fetch)
(uri (crate-uri "sequoia-autocrypt" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0796mn8kwrpfc8qzliwyyy62mrg2w0j6ax8929jwrkibvwy2axi2"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-base64" ,rust-base64-0.13)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-crypto-features
(lambda _
(substitute* "Cargo.toml"
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line))))))))
`(#:features '("sequoia-openpgp/crypto-nettle")
#:cargo-inputs
(("rust-base64" ,rust-base64-0.13)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
#:cargo-development-inputs
(("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
(native-inputs
(list clang pkg-config))
(inputs
(list gmp nettle))
(home-page "https://sequoia-pgp.org/")
(synopsis "Deal with Autocrypt encoded data")
(description "This crate implements low-level functionality like encoding
@ -71,91 +65,136 @@ (define-public rust-sequoia-autocrypt-0.23
than just headers; it requires tight integration with the MUA.")
(license license:lgpl2.0+)))
(define-public rust-sequoia-ipc-0.26
(define-public rust-sequoia-cert-store-0.3
(package
(name "rust-sequoia-cert-store")
(version "0.3.2")
(source (origin
(method url-fetch)
(uri (crate-uri "sequoia-cert-store" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0gmkqn2f23i2xwjwmnaj3dx9l4ir74dyylkw1qsxawxd95i8dk02"))))
(build-system cargo-build-system)
(arguments
`(#:features '("sequoia-openpgp/crypto-nettle")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-crossbeam" ,rust-crossbeam-0.8)
("rust-dirs" ,rust-dirs-5)
("rust-num-cpus" ,rust-num-cpus-1)
("rust-once-cell" ,rust-once-cell-1)
("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1)
("rust-rayon" ,rust-rayon-1)
("rust-rusqlite" ,rust-rusqlite-0.29)
("rust-sequoia-net" ,rust-sequoia-net-0.27)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-smallvec" ,rust-smallvec-1)
("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-1))
#:cargo-development-inputs
(("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-tempfile" ,rust-tempfile-3))))
(native-inputs
(list clang pkg-config))
(inputs
(list gmp nettle openssl sqlite))
(home-page "https://sequoia-pgp.org/")
(synopsis "Certificate database interface")
(description "This package provides a certificate database interface.")
(license license:lgpl2.0+)))
(define-public rust-sequoia-ipc-0.30
(package
(name "rust-sequoia-ipc")
(version "0.26.0")
(version "0.30.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "sequoia-ipc" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0xyhz55g1igzjw46f667kqmbbk7pgqy2zf5p13zspr6bwv39s1yk"))))
(base32 "1fgqjwaw9rz74y394i3n2a6y2vvy0214daamzswn5ahidhycm3x3"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-buffered-reader" ,rust-buffered-reader-1)
("rust-capnp-rpc" ,rust-capnp-rpc-0.13)
("rust-ctor" ,rust-ctor-0.1)
("rust-dirs" ,rust-dirs-2)
("rust-fs2" ,rust-fs2-0.4)
("rust-futures" ,rust-futures-0.3)
("rust-lalrpop" ,rust-lalrpop-0.19)
("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-memsec" ,rust-memsec-0.6)
("rust-rand" ,rust-rand-0.7)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-socket2" ,rust-socket2-0.3)
("rust-tempfile" ,rust-tempfile-3)
("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-0.2)
("rust-tokio-util" ,rust-tokio-util-0.3)
("rust-winapi" ,rust-winapi-0.3))
#:cargo-development-inputs
(("rust-clap" ,rust-clap-2)
("rust-quickcheck" ,rust-quickcheck-0.9))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-crypto-features
(lambda _
(substitute* "Cargo.toml"
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line))))))))
`(#:features '("sequoia-openpgp/crypto-nettle")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-buffered-reader" ,rust-buffered-reader-1)
("rust-capnp-rpc" ,rust-capnp-rpc-0.14)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
("rust-ctor" ,rust-ctor-0.1)
("rust-dirs" ,rust-dirs-4)
("rust-fs2" ,rust-fs2-0.4)
("rust-futures" ,rust-futures-0.3)
("rust-lalrpop" ,rust-lalrpop-0.19)
("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-memsec" ,rust-memsec-0.6)
("rust-rand" ,rust-rand-0.8)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-socket2" ,rust-socket2-0.4)
("rust-tempfile" ,rust-tempfile-3)
("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-1)
("rust-tokio-util" ,rust-tokio-util-0.7)
("rust-winapi" ,rust-winapi-0.3))
#:cargo-development-inputs
(("rust-clap" ,rust-clap-3)
("rust-quickcheck" ,rust-quickcheck-1)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-tokio" ,rust-tokio-1))))
(native-inputs
(list clang pkg-config))
(inputs
(list nettle))
(home-page "https://sequoia-pgp.org/")
(synopsis "Interprocess communication infrastructure for Sequoia")
(description "Interprocess communication infrastructure for Sequoia")
(license license:lgpl2.0+)))
(define-public rust-sequoia-net-0.23
(define-public rust-sequoia-net-0.27
(package
(name "rust-sequoia-net")
(version "0.23.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "sequoia-net" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "05gv053zqnb00mrai5hva3i4909hn77bnh4z1g4b29cw5qb52cbl"))))
(version "0.27.0")
(source (origin
(method url-fetch)
(uri (crate-uri "sequoia-net" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0gyk5765hi3s05l64a744f9a4vynfisja92l51az9dpqgfkiw3wn"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
`(#:features '("sequoia-openpgp/crypto-nettle")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-base64" ,rust-base64-0.13)
("rust-futures-util" ,rust-futures-util-0.3)
("rust-http" ,rust-http-0.2)
("rust-hyper" ,rust-hyper-0.13)
("rust-hyper-tls" ,rust-hyper-tls-0.4)
("rust-hyper" ,rust-hyper-0.14)
("rust-hyper-tls" ,rust-hyper-tls-0.5)
("rust-libc" ,rust-libc-0.2)
("rust-native-tls" ,rust-native-tls-0.2)
("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-tempfile" ,rust-tempfile-3)
("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-1)
("rust-trust-dns-client" ,rust-trust-dns-client-0.22)
("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.22)
("rust-url" ,rust-url-2)
("rust-zbase32" ,rust-zbase32-0.1))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-crypto-features
(lambda _
(substitute* "Cargo.toml"
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line))))))))
#:cargo-development-inputs
(("rust-hyper" ,rust-hyper-0.14)
("rust-rand" ,rust-rand-0.8)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
(native-inputs
(list clang pkg-config))
(inputs
(list gmp nettle openssl))
(home-page "https://sequoia-pgp.org/")
(synopsis "Discover and publish OpenPGP certificates over the network")
(description "This package provides a crate to access keyservers using the
@ -165,75 +204,86 @@ (define-public rust-sequoia-net-0.23
(define-public rust-sequoia-openpgp-1
(package
(name "rust-sequoia-openpgp")
(version "1.6.0")
(version "1.16.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "sequoia-openpgp" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1mdprsijszkg2j6jk1iq7q1z9yikq598y12m5zbv94fs37xlx3qm"))
(modules '((guix build utils)))
(snippet
;; Remove dependencies on rust-crypto and win32-cng
'(let* ((other-crypto-pkgs
(list ;; rust-crypto
"aes" "block-modes" "block-padding" "blowfish" "cast5"
"cipher" "des" "digest" "eax" "ed25519-dalek"
"generic-array" "idea" "md-5" "num-bigint-dig" "rand"
"ripemd160" "rsa" "sha-1" "sha2" "twofish" "typenum"
"x25519-dalek" "p256" "rand_core" "rand_core" "ecdsa"
;; win32-cng
"eax" "winapi" "win-crypto-ng" "ed25519-dalek"
"num-bigint-dig"))
(pkgs-pattern (pk (string-join
(list "^\\[dependencies\\.("
(string-join other-crypto-pkgs "|")
")\\]")
""))))
(substitute* "Cargo.toml"
((pkgs-pattern line name) (string-append "[off." name "]"))
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line))
(("^\\[(target\\.\"cfg\\(windows\\))" line name)
(string-append "[off." name)))))))
(base32 "1z0xl7hnm1p51pyhwdqyzcnl2dhzfjnvssz7hi15ps1hk4zzzvrh"))))
(build-system cargo-build-system)
(native-inputs
(list clang pkg-config))
(inputs
(list gmp nettle))
(arguments
`(#:skip-build? #t
`(#:features '("crypto-nettle")
#:cargo-test-flags
(list "--release" "--"
;; TODO: Figure out how this test is supposed to fail.
"--skip=parse::test::panic_on_short_zip")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-backtrace" ,rust-backtrace-0.3)
("rust-base64" ,rust-base64-0.13)
(("rust-aes" ,rust-aes-0.8)
("rust-anyhow" ,rust-anyhow-1)
("rust-base64" ,rust-base64-0.21)
("rust-block-padding" ,rust-block-padding-0.3)
("rust-blowfish" ,rust-blowfish-0.9)
("rust-botan" ,rust-botan-0.10)
("rust-buffered-reader" ,rust-buffered-reader-1)
("rust-bzip2" ,rust-bzip2-0.4)
("rust-cast5" ,rust-cast5-0.11)
("rust-cfb-mode" ,rust-cfb-mode-0.8)
("rust-chrono" ,rust-chrono-0.4)
("rust-cipher" ,rust-cipher-0.4)
("rust-des" ,rust-des-0.8)
("rust-digest" ,rust-digest-0.10)
("rust-dyn-clone" ,rust-dyn-clone-1)
("rust-eax" ,rust-eax-0.5)
("rust-ecb" ,rust-ecb-0.1)
("rust-ecdsa" ,rust-ecdsa-0.16)
("rust-ed25519" ,rust-ed25519-1)
("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
("rust-flate2" ,rust-flate2-1)
("rust-idna" ,rust-idna-0.2)
("rust-itertools" ,rust-itertools-0.10)
("rust-generic-array" ,rust-generic-array-0.14)
("rust-getrandom" ,rust-getrandom-0.2)
("rust-idea" ,rust-idea-0.5)
("rust-idna" ,rust-idna-0.3)
("rust-lalrpop" ,rust-lalrpop-0.19)
("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
("rust-lazy-static" ,rust-lazy-static-1) ;; 1.4.0
("rust-libc" ,rust-libc-0.2) ;; 0.2.66
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-md-5" ,rust-md-5-0.10)
("rust-memsec" ,rust-memsec-0.6)
("rust-nettle" ,rust-nettle-7)
("rust-plotters" ,rust-plotters-0.3)
("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
("rust-once-cell" ,rust-once-cell-1)
("rust-openssl" ,rust-openssl-0.10)
("rust-openssl-sys" ,rust-openssl-sys-0.9)
("rust-p256" ,rust-p256-0.13)
("rust-rand" ,rust-rand-0.7)
("rust-rand" ,rust-rand-0.7)
("rust-rand" ,rust-rand-0.8)
("rust-rand-core" ,rust-rand-core-0.6)
("rust-regex" ,rust-regex-1)
("rust-regex-syntax" ,rust-regex-syntax-0.6)
("rust-ripemd" ,rust-ripemd-0.1)
("rust-rsa" ,rust-rsa-0.9)
("rust-sha-1" ,rust-sha-1-0.10)
("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.2)
("rust-sha2" ,rust-sha2-0.10)
("rust-thiserror" ,rust-thiserror-1)
("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
("rust-twofish" ,rust-twofish-0.7)
("rust-typenum" ,rust-typenum-1)
("rust-win-crypto-ng" ,rust-win-crypto-ng-0.5)
("rust-winapi" ,rust-winapi-0.3)
("rust-x25519-dalek-ng" ,rust-x25519-dalek-ng-1)
("rust-xxhash-rust" ,rust-xxhash-rust-0.8))
#:cargo-development-inputs
;; keep the development-inputs to allow running tests easily
(("rust-criterion" ,rust-criterion-0.3)
("rust-quickcheck" ,rust-quickcheck-0.9)
("rust-rand" ,rust-rand-0.7)
("rust-rpassword" ,rust-rpassword-5))))
(("rust-criterion" ,rust-criterion-0.4)
("rust-quickcheck" ,rust-quickcheck-1)
("rust-rand" ,rust-rand-0.8)
("rust-rpassword" ,rust-rpassword-6))))
(home-page "https://sequoia-pgp.org/")
(synopsis "OpenPGP data types and associated machinery")
(description "This crate aims to provide a complete implementation of
@ -281,6 +331,40 @@ (define-public rust-sequoia-openpgp-0.9
("rust-sequoia-rfc2822" ,rust-sequoia-rfc2822-0.9)
("rust-time" ,rust-time-0.1))))))
(define-public rust-sequoia-policy-config-0.6
(package
(name "rust-sequoia-policy-config")
(version "0.6.0")
(source (origin
(method url-fetch)
(uri (crate-uri "sequoia-policy-config" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0x42h22kng4dsbfr0a6zdf2j9bcq14r0yr6xdw6rrggj139lazbm"))))
(build-system cargo-build-system)
(arguments
`(#:features '("sequoia-openpgp/crypto-nettle")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-chrono" ,rust-chrono-0.4)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-serde" ,rust-serde-1)
("rust-thiserror" ,rust-thiserror-1)
("rust-toml" ,rust-toml-0.5))
#:cargo-development-inputs
(("rust-assert-cmd" ,rust-assert-cmd-2)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
(native-inputs
(list clang pkg-config))
(inputs
(list gmp nettle))
(home-page "https://sequoia-pgp.org/")
(synopsis "Configure Sequoia using a configuration file")
(description "Configure Sequoia using a configuration file.")
(license license:lgpl2.0+)))
(define-public rust-sequoia-rfc2822-0.9
(package
(name "rust-sequoia-rfc2822")
@ -309,48 +393,103 @@ (define-public rust-sequoia-rfc2822-0.9
rules are rather complex. This crate implements the whole grammar." )
(license license:gpl3)))
(define-public rust-sequoia-wot-0.8
(package
(name "rust-sequoia-wot")
(version "0.8.1")
(source (origin
(method url-fetch)
(uri (crate-uri "sequoia-wot" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0rcp7ndjpdd4dkryhkkhakc8axbj93c1gr9qxxksdvrik803alfg"))))
(build-system cargo-build-system)
(arguments
`(#:features '("sequoia-openpgp/crypto-nettle")
#:cargo-test-flags
(list "--release" "--"
;; Not all files included.
"--skip=gpg_trust_roots")
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-4)
("rust-clap-complete" ,rust-clap-complete-4)
("rust-clap-mangen" ,rust-clap-mangen-0.2)
("rust-crossbeam" ,rust-crossbeam-0.8)
("rust-dot-writer" ,rust-dot-writer-0.1)
("rust-enumber" ,rust-enumber-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-num-cpus" ,rust-num-cpus-1)
("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1)
("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6)
("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-1))
#:cargo-development-inputs
(("rust-assert-cmd" ,rust-assert-cmd-2)
("rust-predicates" ,rust-predicates-2)
("rust-quickcheck" ,rust-quickcheck-1)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-tempfile" ,rust-tempfile-3))))
(inputs
(list nettle openssl sqlite))
(native-inputs
(list clang pkg-config))
(home-page "https://sequoia-pgp.org/")
(synopsis "Implementation of OpenPGP's web of trust")
(description "An implementation of OpenPGP's web of trust.")
(license license:lgpl2.0+)))
(define-public sequoia-sq
(package
(name "sequoia-sq")
(version "0.25.0")
(version "0.30.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "sequoia-sq" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0j26vpp98i7zwwhqsvwj0zknj4s0s0ilfqpynj1vgd5laanhyr0d"))))
(base32 "0l3mlhvh93b8s1853gyzzfh1dznjdhbsbyxxcm3bbyxmkyr74wkd"))))
(build-system cargo-build-system)
(inputs
(list nettle openssl))
(list nettle openssl sqlite))
(native-inputs
(list clang pkg-config))
(arguments
`(#:tests? #f ;; tests require data-files not provided in the package
`(#:tests? #f ; `(dyn std::fmt::Display + 'static)` cannot be sent between threads safely
#:install-source? #f
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-buffered-reader" ,rust-buffered-reader-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2)
("rust-clap" ,rust-clap-2)
("rust-itertools" ,rust-itertools-0.9)
("rust-rpassword" ,rust-rpassword-5)
("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.23)
("rust-sequoia-net" ,rust-sequoia-net-0.23)
("rust-clap" ,rust-clap-4)
("rust-clap-complete" ,rust-clap-complete-4)
("rust-clap-mangen" ,rust-clap-mangen-0.2)
("rust-dirs" ,rust-dirs-5)
("rust-dot-writer" ,rust-dot-writer-0.1)
("rust-itertools" ,rust-itertools-0.10)
("rust-rpassword" ,rust-rpassword-6)
("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.25)
("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3)
("rust-sequoia-net" ,rust-sequoia-net-0.27)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-sequoia-wot" ,rust-sequoia-wot-0.8)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-subplot-build" ,rust-subplot-build-0.7)
("rust-tempfile" ,rust-tempfile-3)
("rust-term-size" ,rust-term-size-0.3)
("rust-tokio" ,rust-tokio-0.2))
("rust-tokio" ,rust-tokio-1))
#:cargo-development-inputs
(("rust-assert-cli" ,rust-assert-cli-0.6))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-crypto-features
(lambda _
(substitute* "Cargo.toml"
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line))))))))
(("rust-assert-cmd" ,rust-assert-cmd-2)
("rust-fehler" ,rust-fehler-1)
("rust-predicates" ,rust-predicates-2)
("rust-subplotlib" ,rust-subplotlib-0.7))))
(home-page "https://sequoia-pgp.org/")
(synopsis "Command-line frontend for Sequoia OpenPGP")
(description "This package provides the command-line frontend for Sequoia
@ -362,37 +501,28 @@ (define-public sequoia-sq
(define-public sequoia-sqv
(package
(name "sequoia-sqv")
(version "1.0.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "sequoia-sqv" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0nrfjn64fm038x5dssipf7jxi27z741m5n5a7zsa9768zab1hr9d"))))
(base32 "0vzqahx7dk1wh2vp7lbzjgah8v7fqpvdf0dq0dydi9695ffm99lc"))))
(build-system cargo-build-system)
(inputs
(list nettle openssl))
(native-inputs
(list clang pkg-config))
(arguments
`(#:tests? #f ;; tests require data-files not provided in the package
#:install-source? #f
`(#:install-source? #f
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2)
("rust-clap" ,rust-clap-2)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
#:cargo-development-inputs
(("rust-assert-cli" ,rust-assert-cli-0.6))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-crypto-features
(lambda _
(substitute* "Cargo.toml"
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line))))))))
(("rust-assert-cli" ,rust-assert-cli-0.6))))
(home-page "https://sequoia-pgp.org/")
(synopsis "Simple OpenPGP signature verification program")
(description "@code{sqv} verifies detached OpenPGP signatures. It is a
@ -402,150 +532,75 @@ (define-public sequoia-sqv
This Guix package is built to use the nettle cryptographic library.")
(license license:lgpl2.0+)))
(define (sequoia-package-origin version)
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/sequoia-pgp/sequoia.git")
(commit (string-append "openpgp/v" version))))
(sha256
(base32 "1cq1xgvllbpii5hfl3wlia2ayznpvhv8lq8g8ygwxga86ijg98lq"))
(file-name (git-file-name "sequoia" version))
(patches (search-patches "libsequoia-remove-store.patch"
"libsequoia-fix-ffi-Makefile.patch"))))
(define-public libsequoia
(define-public sequoia-wot
(package
(name "libsequoia")
(version "0.22.0")
(source (sequoia-package-origin "1.6.0"))
(build-system cargo-build-system)
(outputs '("out" "python"))
(native-inputs
(list clang pkg-config python-pytest python-pytest-runner
python-wrapper))
(inputs
(list gmp nettle openssl python python-cffi))
(inherit rust-sequoia-wot-0.8)
(name "sequoia-wot")
(arguments
(list
#:tests? #f ;; TODO make python tests find the shared object file
#:cargo-inputs
`(("rust-anyhow" ,rust-anyhow-1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-memsec" ,rust-memsec-0.6)
("rust-native-tls" ,rust-native-tls-0.2)
("rust-proc-macro2" ,rust-proc-macro2-1) ;; for ffi-macros
("rust-quote" ,rust-quote-1) ;; for ffi-macros
("rust-sequoia-ipc" ,rust-sequoia-ipc-0.26)
("rust-sequoia-net" ,rust-sequoia-net-0.23)
("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
("rust-sha2" ,rust-sha2-0.8) ;; for ffi-macros
("rust-tokio" ,rust-tokio-1))
#:cargo-development-inputs
`(("rust-filetime" ,rust-filetime-0.2))
#:phases
#~(modify-phases %standard-phases
(add-after 'configure 'set-PREFIX
(lambda _
(setenv "PREFIX" #$output)))
(replace 'build
(lambda _
(invoke "make" "-C" "openpgp-ffi" "build-release")
(invoke "make" "-C" "ffi" "build-release")))
(delete 'package) ;; cargo can't package a multi-crate workspace
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(begin
(invoke "make" "-C" "openpgp-ffi" "check")
(invoke "make" "-C" "ffi" "check")))))
(replace 'install
(lambda _
(invoke "make" "-C" "openpgp-ffi" "install")
(invoke "make" "-C" "ffi" "install")))
(add-after 'configure 'fix-build-environment
(lambda _
(delete-file "Cargo.toml")
(symlink "../.cargo" "openpgp-ffi/.cargo")
(symlink "../.cargo" "ffi/.cargo")
(for-each delete-file-recursively
(find-files "guix-vendor" "^sequoia-[0-9]+\\.*"
#:directories? #t))))
(add-after 'unpack 'fix-for-python-output
(lambda _
(substitute* "ffi/lang/python/Makefile"
;; adjust prefix for python package
(("PREFIX\\s*\\??=.*")
(string-append "PREFIX = " (pk #$output:python) "\n"))
;; fix rpath to include the main package
(("\\WLDFLAGS=" text)
(string-append text "'-Wl,-rpath=" #$output "/lib '"))
;; make setuptools install into the prefix, see
;; guix/build/python-build-system.scm for explanation
(("\\ssetup.py\\s+install\\s")
" setup.py install --root=/ --single-version-externally-managed "))))
(add-after 'unpack 'fix-Makefiles
(lambda _
(substitute* '("openpgp-ffi/Makefile")
(("^check-headers: force-build") "check-headers:"))))
(add-after 'unpack 'remove-other-crypto-features
(lambda _
(substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml")
(("^crypto-cng =" line) (string-append "# " line))
(("^crypto-rust =" line) (string-append "# " line)))))
(add-after 'unpack 'fix-missing-feature
(lambda _
(substitute* '("ffi/Cargo.toml")
(("^(tokio = .* features = \\[)" line)
(string-append line "\"net\", ")))))
(add-after 'unpack 'unbundle-crates
(lambda _
(substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml")
(("path = \"\\.\\./(openpgp|store|net|ipc)\",") "")))))))
(home-page "https://sequoia-pgp.org")
(synopsis "C/FFI interfaces for Sequoia-PGP")
(description "This package provides a C and FFI interface to both the
low-level and a high-level API of Sequoia-PGP.
(substitute-keyword-arguments (package-arguments rust-sequoia-wot-0.8)
((#:install-source? _ #t) #f)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'install 'install-more
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share"))
(man1 (string-append share "/man/man1")))
(for-each (lambda (file)
(install-file file man1))
(find-files "target/release" "\\.1$"))
;; TODO: Install _sq-wot.ps1, sq-wot.elv
(mkdir-p (string-append out "/etc/bash_completion.d"))
(mkdir-p (string-append share "/fish/vendor_completions.d"))
(copy-file (car (find-files "target/release" "sq-wot.bash"))
(string-append out "/etc/bash_completion.d/sq-wot"))
(copy-file (car (find-files "target/release" "sq-wot.fish"))
(string-append
share "/fish/vendor_completions.d/sq-wot.fish"))
(install-file (car (find-files "target/release" "_sq-wot"))
(string-append
share "/zsh/site-functions")))))))))
(description "An implementation of OpenPGP's web of trust.
Use with caution: This is an \"unofficial\" package, which are not officially
released, but part of the Sequoia-PGP v1.6.0 archive. So this package might
even go away.")
(license license:lgpl2.0+)))
This Guix package is built to use the nettle cryptographic library.")))
;;
(define-public sequoia
(package
(name "sequoia")
(version "1.6.0")
(version "1.16.0")
(source #f)
(build-system trivial-build-system)
(outputs '("out" "python"))
(inputs
(list glibc ;; for ldconfig in make-dynamic-linker-cache
libsequoia
`(,libsequoia "python")
sequoia-sq
sequoia-sqv))
(arguments
(list
#:modules '((guix build utils) (guix build gnu-build-system)
(guix build gremlin) (guix elf))
#:modules '((guix build utils)
(guix build union)
(guix build gnu-build-system)
(guix build gremlin)
(guix elf))
#:builder
#~(begin
(use-modules (guix build utils) (guix build gnu-build-system))
(use-modules (guix build utils)
(guix build union)
(guix build gnu-build-system)
(ice-9 match))
(let ((make-dynamic-linker-cache
(assoc-ref %standard-phases 'make-dynamic-linker-cache))
(ld.so.cache
(string-append #$output "/etc/ld.so.cache")))
(copy-recursively #$libsequoia #$output)
(copy-recursively #$sequoia-sq #$output)
(match %build-inputs
(((names . directories) ...)
(union-build #$output directories)))
(delete-file ld.so.cache)
(copy-recursively #$sequoia-sqv #$output)
(delete-file ld.so.cache)
(copy-recursively #$libsequoia:python #$output:python)
(setenv "PATH"
(string-append (getenv "PATH") ":" #$glibc "/sbin"))
(make-dynamic-linker-cache #:outputs %outputs)))))
(setenv "PATH"
(string-append (getenv "PATH") ":" #$glibc "/sbin"))
(make-dynamic-linker-cache #:outputs %outputs)))))
(inputs
(list ;glibc ;; for ldconfig in make-dynamic-linker-cache
sequoia-sq
sequoia-sqv
sequoia-wot))
(home-page "https://sequoia-pgp.org")
(synopsis "New OpenPGP implementation (meta-package)")
(description "Sequoia is a new OpenPGP implementation, written in Rust,

71
gnu/packages/shells.scm
View file

@ -21,6 +21,7 @@
;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 David Pflug <david@pflug.io>
;;;
;;; This file is part of GNU Guix.
;;;
@ -602,36 +603,36 @@ (define-public xonsh
(license license:bsd-2)))
(define-public scsh
(let ((commit "114432435e4eadd54334df6b37fcae505079b49f")
(revision "1"))
(let ((commit "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052")
(revision "0"))
(package
(name "scsh")
(version (string-append "0.0.0-" revision "." (string-take commit 7)))
(version (git-version "0.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/scheme/scsh")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(file-name (git-file-name name version))
(sha256
(base32
"1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q"))
"1czrp808v5gs0ci5lmkp3wr3gfkrb3vd5b2iw2hz1bpqgaf6bxpv"))
(patches (search-patches "scsh-nonstring-search-path.patch"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
#:phases
(modify-phases %standard-phases
(add-before 'configure 'replace-rx
(lambda* (#:key inputs #:allow-other-keys)
(let* ((rx (assoc-ref inputs "scheme48-rx"))
(rxpath (string-append rx "/share/scheme48-"
,(package-version scheme48)
(list
#:test-target "test"
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'replace-rx
(lambda _
(let ((rxpath (string-append #$scheme48-rx
"/share/scheme48-"
#$(package-version scheme48)
"/rx")))
(delete-file-recursively "rx")
(symlink rxpath "rx"))
#t)))))
(delete-file-recursively "rx")
(symlink rxpath "rx")))))))
(inputs
(list scheme48 scheme48-rx))
(native-inputs
@ -788,26 +789,24 @@ (define-public oksh
(define-public loksh
(package
(name "loksh")
(version "6.9")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dimkr/loksh")
(commit version)
;; Include the ‘lolibc’ submodule, a static compatibility library
;; created for and currently used only by loksh.
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32 "0x33plxqhh5202hgqidgccz5hpg8d2q71ylgnm437g60mfi9z0px"))))
(version "7.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dimkr/loksh")
(commit version)
;; Include the ‘lolibc’ submodule, a static compatibility library
;; created for and currently used only by loksh.
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"1miydvb79wagckchinp189l8i81f08lqajg5jngn77m4x4gwjf3n"))))
(build-system meson-build-system)
(inputs
(list ncurses))
(native-inputs
(list pkg-config))
(inputs (list ncurses))
(native-inputs (list pkg-config))
(arguments
`(#:tests? #f)) ; no tests included
`(#:tests? #f)) ;no tests included
(home-page "https://github.com/dimkr/loksh")
(synopsis "Korn Shell from OpenBSD")
(description
@ -858,7 +857,7 @@ (define-public mksh
(define-public oil
(package
(name "oil")
(version "0.15.0")
(version "0.17.0")
(source
;; oil's sources contain a modified version of CPython 2.7.13.
;; According to https://www.oilshell.org/blog/2017/05/05.html
@ -871,7 +870,7 @@ (define-public oil
(uri (string-append "https://www.oilshell.org/download/oil-"
version ".tar.gz"))
(sha256
(base32 "1yy4523lbwkb0abnnvp4v08nv94isxb16wjryrp820idb90c1zfb"))))
(base32 "01b67dq56iam44d7c81ba9w62jjnjx2z7wm928rkc1ff6bacm37r"))))
(build-system gnu-build-system)
(arguments
(list #:strip-binaries? #f ; strip breaks the binary

19
gnu/packages/ssh.scm
View file

@ -198,16 +198,15 @@ (define-public libssh2
(define-public openssh
(package
(name "openssh")
(version "9.3p2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
"openssh-" version ".tar.gz"))
(patches (search-patches "openssh-hurd.patch"
"openssh-trust-guix-store-directory.patch"))
(sha256
(base32
"1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
(version "9.4p1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
"openssh-" version ".tar.gz"))
(patches (search-patches "openssh-trust-guix-store-directory.patch"))
(sha256
(base32 "11bahrik5qi337m954g5479f63cxnxdch076ng7668fvi28gs21n"))))
(build-system gnu-build-system)
(arguments
(list

49
gnu/packages/stalonetray.scm
View file

@ -1,49 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages stalonetray)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:select (gpl2+))
#:use-module (gnu packages xorg))
(define-public stalonetray
(package
(name "stalonetray")
(version "0.8.3")
(source
(origin
(method url-fetch)
(uri
(string-append "mirror://sourceforge/stalonetray/stalonetray/stalonetray-"
version "/stalonetray-" version ".tar.bz2"))
(sha256
(base32
"0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"))))
(inputs (list libx11))
(build-system gnu-build-system)
(home-page "https://stalonetray.sourceforge.net")
(synopsis "Standalone freedesktop.org and KDE systray implementation")
(description
"Stalonetray is a stand-alone freedesktop.org and KDE system
tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86). It
has full XEMBED support and minimal dependencies: an X11 lib only. Stalonetray
works with virtually any EWMH-compliant window manager.")
(license gpl2+)))

7
gnu/packages/syndication.scm
View file

@ -224,22 +224,21 @@ (define-public giara
(define-public newsboat
(package
(name "newsboat")
(version "2.31")
(version "2.32")
(source
(origin
(method url-fetch)
(uri (string-append "https://newsboat.org/releases/" version
"/newsboat-" version ".tar.xz"))
(sha256
(base32 "1nn1akjc3l29gcr0n6g7y39qvmbw8vf5sfmnxd794sgmbki7vbsb"))))
(base32 "1rp67fqsnsknlhlq75vgdjg9rggx8j7wbmixvps967m2f92m2qsv"))))
(build-system cargo-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
;; For building documentation.
,@(if (member (%current-system)
(package-transitive-supported-systems ruby-asciidoctor))
,@(if (supported-package? ruby-asciidoctor)
`(("asciidoctor" ,ruby-asciidoctor))
`())))
(inputs

16881
gnu/packages/tex.scm
View file

File diff suppressed because it is too large Load diff

4
gnu/packages/textutils.scm
View file

@ -1470,7 +1470,7 @@ (define-public go-github-com-aswinkarthik-csvdiff
(define-public ack
(package
(name "ack")
(version "3.5.0")
(version "3.7.0")
(source (origin
(method git-fetch)
(uri
@ -1479,7 +1479,7 @@ (define-public ack
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "00131vqjbzcn6w22m0h3j6x9kp59dimfnnqhpmi78vbcj0jws1dv"))))
(base32 "0xrbgjj3nys4158nskd0npqf825xlrqa2x3fqcfz0nnxai2jzbck"))))
(build-system perl-build-system)
(arguments
`(#:phases

4
gnu/packages/tls.scm
View file

@ -659,14 +659,14 @@ (define-public bearssl
(define-public libressl
(package
(name "libressl")
(version "3.6.1")
(version "3.7.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/LibreSSL/"
"libressl-" version ".tar.gz"))
(sha256
(base32
"0x37037rb0zx34zp0kbbqj2xwd57gh1m6bfn52f92fz92q9wdymc"))))
"1csx6gfgiqr43dw23qj2mr5jbkcd99kqavwb4vbmp0hcm5bchj3r"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

4
gnu/packages/tor.scm
View file

@ -63,14 +63,14 @@ (define-module (gnu packages tor)
(define-public tor
(package
(name "tor")
(version "0.4.7.13")
(version "0.4.7.14")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.torproject.org/tor-"
version ".tar.gz"))
(sha256
(base32
"17ga25dq2lcph390ljqmyd8sggp97h42d3h423qmci83rqn1fy90"))))
"1y2xwrji1rvk6h0k15705yra5s74h72h2g84x02zr0338vv6gb55"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags

2
gnu/packages/tryton.scm
View file

@ -129,7 +129,7 @@ (define-public tryton
`(("glib-compile-schemas" ,glib "bin")
("gobject-introspection" ,gobject-introspection)))
(propagated-inputs
(list librsvg
(list (librsvg-for-system)
gsettings-desktop-schemas
gtk+
python-dateutil

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

@ -3097,7 +3097,7 @@ (define-public go-github-com-git-lfs-gitobj-v2
(define-public git-lfs
(package
(name "git-lfs")
(version "3.3.0")
(version "3.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3106,7 +3106,7 @@ (define-public git-lfs
(file-name (git-file-name name version))
(sha256
(base32
"1g268pplld04b9myhlrwc4fd8r1hvfyya5ja8wr558rar3pgsp5g"))))
"0ljjs8kyznp2ifkqdcd9q3550sknyx5qxx247icwkd9djjq7x74m"))))
(build-system go-build-system)
(arguments
(list
@ -3171,7 +3171,7 @@ (define-public git-lfs
(define-public lfs-s3
(package
(name "lfs-s3")
(version "0.1.2")
(version "0.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3180,7 +3180,7 @@ (define-public lfs-s3
(file-name (git-file-name name version))
(sha256
(base32
"0ncfy3lgc7dik9k71xk9l5f2llsh2jk33aaqb8dkslschc1mx4g6"))))
"0yilbxpia2lh36s872hiji77hazy83h2zc0iyqldrf3r18szqniw"))))
(build-system go-build-system)
(arguments
(list

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

@ -723,7 +723,7 @@ (define-public nyxt
(define-public lagrange
(package
(name "lagrange")
(version "1.16.6")
(version "1.16.7")
(source
(origin
(method url-fetch)
@ -731,7 +731,7 @@ (define-public lagrange
(string-append "https://git.skyjake.fi/skyjake/lagrange/releases/"
"download/v" version "/lagrange-" version ".tar.gz"))
(sha256
(base32 "05wqg78l6jwbsmy8rsz14cp2wl1wss02vwrzfzpyx8qhjxcw7v32"))
(base32 "0ig7xdsihq7wc8h7n1af275z3kjxq5iiy0x4dwjahgligrdmj7vm"))
(modules '((guix build utils)))
(snippet
'(begin

19
gnu/packages/web.scm
View file

@ -326,7 +326,7 @@ (define-public httpd/pinned
(define-public miniflux
(package
(name "miniflux")
(version "2.0.44")
(version "2.0.46")
(source (origin
(method git-fetch)
(uri (git-reference
@ -335,21 +335,32 @@ (define-public miniflux
(file-name (git-file-name name version))
(sha256
(base32
"18ggk71nk3zylgkwq32glggdcapgsj772qn2y4i9hbk374l6h61w"))))
"1qv95kipjlg374kiq6gssh5jsb5arahq4jsb7vkg3njnx0ldwvkb"))))
(build-system go-build-system)
(arguments
(list #:go go-1.19
#:install-source? #f
#:import-path "miniflux.app"
#:build-flags
#~(list (string-append
"-ldflags= -X miniflux.app/version.Version=" #$version))
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'rename-binary
(add-before 'build 'disable-cgo
(lambda _
(setenv "CGO_ENABLED" "0")))
(add-after 'install 'install-manpage
(lambda* (#:key import-path #:allow-other-keys)
(let ((man1 (string-append #$output "/share/man/man1/"))
(page (format #f "src/~a/miniflux.1" import-path)))
(install-file page man1))))
(add-after 'install-manpage 'rename-binary
(lambda _
(let ((bindir (string-append #$output "/bin/")))
(rename-file (string-append bindir "miniflux.app")
(string-append bindir "miniflux"))))))))
(inputs
(list go-github-com-coreos-go-oidc
(list go-github-com-coreos-go-oidc-v3
go-github-com-go-telegram-bot-api-telegram-bot-api
go-github-com-gorilla-mux
go-github-com-lib-pq

26
gnu/packages/wm.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2015 xd1le <elisp.vim@gmail.com>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019, 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2016 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
@ -63,6 +63,7 @@
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -193,6 +194,27 @@ (define-public bspwm
the leaves of a full binary tree.")
(license license:bsd-2)))
(define-public cage
(package
(name "cage")
(version "0.1.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cage-kiosk/cage")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja"))))
(build-system meson-build-system)
(native-inputs (list pkg-config scdoc))
(inputs (list wayland wlroots libxkbcommon))
(home-page "https://github.com/cage-kiosk/cage")
(synopsis "Wayland kiosk")
(description "This package provides a Wayland @dfn{kiosk}, which runs a
single, maximized application.")
(license license:expat)))
(define-public herbstluftwm
(package
(name "herbstluftwm")
@ -3023,7 +3045,7 @@ (define-public jwm
(list cairo
libjpeg-turbo
libpng
librsvg
(librsvg-for-system)
libxext
libxinerama
libxmu

143
gnu/packages/xdisorg.scm
View file

@ -59,6 +59,7 @@
;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@ -102,6 +103,7 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
@ -132,6 +134,8 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-check)
#:use-module (gnu packages qt)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages syncthing)
@ -140,6 +144,8 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
#:use-module (gnu packages xml)
#:use-module (gnu packages wm)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
#:use-module (ice-9 match))
@ -1816,6 +1822,66 @@ (define-public xdpyprobe
connectivity of the X server running on a particular @code{DISPLAY}.")
(license license:gpl3+)))
(define-public ulauncher
(package
(name "ulauncher")
(version "6.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Ulauncher/Ulauncher")
(commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9")))
(file-name (git-file-name name version))
(sha256
(base32
"1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1"))))
(build-system python-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-libX11
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "ulauncher/utils/xinit.py"
(("libX11.so.6")
(search-input-file inputs "/lib/libX11.so")))))
(add-after 'unpack 'fix-usr
(lambda _
(substitute* "setup.py"
(("\\{sys.prefix\\}")
(string-append #$output)))))
(add-after 'unpack 'fix-os-release
(lambda _
(define (touch file)
(call-with-output-file file
(const #t)))
(let* ((hard-path "/etc/os-release")
(fixed-path (string-append #$output
hard-path)))
;; Make it relative
;; Update hardcoded path to something
;; within the build enviroment.
(substitute* "ulauncher/utils/environment.py"
((hard-path)
fixed-path))
;; Create directory for the dummy file.
(mkdir-p (string-append #$output "/etc"))
(touch fixed-path))))
(add-before 'check 'env-setup
;; The test require access to home to put temporary files.
(lambda _
(setenv "HOME"
(getcwd)))))))
(native-inputs (list intltool python-distutils-extra python-mock))
(inputs (list libx11 python-levenshtein python-pycairo))
(propagated-inputs (list keybinder libwnck gsettings-desktop-schemas
python-pygobject webkitgtk-with-libsoup2))
(home-page "https://ulauncher.io")
(synopsis "Application launcher for Linux")
(description
"Ulauncher is a fast application launcher for Linux. It is written in
Python, using GTK+, and features: App Search (fuzzy matching), Calculator,
Extensions, Shortcuts, File browser mode and Custom Color Themes.")
(license license:gpl3+)))
(define-public rofi
(package
(name "rofi")
@ -1827,7 +1893,16 @@ (define-public rofi
version "/rofi-" version ".tar.xz"))
(sha256
(base32
"138c4bl60p7namsb2pk8q5cdlxbdkli7zny192vk5jv5s5kczzya"))))
"138c4bl60p7namsb2pk8q5cdlxbdkli7zny192vk5jv5s5kczzya"))
(snippet
#~(begin
;; Delete pre-generated files.
(for-each delete-file
(list "lexer/theme-lexer.c"
"lexer/theme-parser.c"
"lexer/theme-parser.h"
"resources/resources.c"
"resources/resources.h"))))))
(build-system gnu-build-system)
(native-inputs
(list bison
@ -1839,7 +1914,7 @@ (define-public rofi
(list cairo
glib
libjpeg-turbo
librsvg
(librsvg-for-system)
libxcb
libxkbcommon
pango
@ -1875,7 +1950,7 @@ (define-public rofi-wayland
(package
(inherit rofi)
(name "rofi-wayland")
(version "1.7.5+wayland1")
(version "1.7.5+wayland2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/lbonn/rofi"
@ -1883,16 +1958,16 @@ (define-public rofi-wayland
"/rofi-" version ".tar.xz"))
(sha256
(base32
"09n71wv3nxpzpjmvqmxlxk0zfln3x2l8admfq571781p9hw0w6wp"))))
"0l6rf8qwvawyh938pinl9fkwzjnq72xpa9a7lwk9jrr5lkk3h8yj"))))
(build-system meson-build-system)
(inputs
(modify-inputs (package-inputs base)
(append wayland wayland-protocols)))
(description
(string-append
(package-description base)
" This package, @code{rofi-wayland}, provides additional wayland
support.")))))
"Rofi is a minimalist application launcher. It memorizes which
applications you regularly use and also allows you to search for an
application by name. This package, @code{rofi-wayland}, provides additional
wayland support."))))
(define-public rofi-calc
(package
@ -1958,7 +2033,7 @@ (define-public tint2
(inputs
(list gtk+
imlib2
librsvg
(librsvg-for-system)
libxcomposite
libxdamage
libxft
@ -1979,6 +2054,46 @@ (define-public tint2
actions, a built-in clock, a battery monitor and a system tray.")
(license license:gpl2)))
(define-public stalonetray
(package
(name "stalonetray")
(version "0.8.5")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/kolbusa/stalonetray")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"074wy1xppfycillbxq6fwrq87ik9glc95083df5vgm20mhzni7pz"))))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-docbook-root
(lambda _
(substitute* "configure.ac"
(("AC_SUBST\\(DOCBOOK_ROOT\\)" all)
(string-append "DOCBOOK_ROOT="
#$(this-package-native-input "docbook-xsl")
"/xml/xsl/docbook-xsl-"
#$(package-version (this-package-native-input "docbook-xsl"))
"; " all))))))))
(inputs (list libx11 libxpm))
(native-inputs (list autoconf automake docbook-xsl libxslt))
(build-system gnu-build-system)
(home-page "https://kolbusa.github.io/stalonetray")
(synopsis "Standalone freedesktop.org and KDE systray implementation")
(description
"Stalonetray is a stand-alone freedesktop.org and KDE system
tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86). It
has full XEMBED support and minimal dependencies: an X11 lib only. Stalonetray
works with virtually any EWMH-compliant window manager.")
(license license:gpl2+)))
(define-public tofi
(package
(name "tofi")
@ -2583,7 +2698,7 @@ (define-public wl-color-picker
(define-public wl-clipboard
(package
(name "wl-clipboard")
(version "2.1.0")
(version "2.2.0")
(source
(origin
(method git-fetch)
@ -2592,7 +2707,7 @@ (define-public wl-clipboard
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1g6hcsn4klapvz3bw0k8syixwyyi4cl1c7vbc6f1a2hjpcf4pawn"))))
(base32 "0r45k6fk9k26qs88s2sjlgjjamhj2jqghdivlh2xjqknws63d29g"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags
@ -2605,7 +2720,7 @@ (define-public wl-clipboard
(add-after 'unpack 'patch-file-names
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "src" "\\.c$")
(("\"(cat|rm)\"" _ command)
(("\"(cat)\"" _ command)
(string-append "\"" (assoc-ref inputs "coreutils")
"/bin/" command "\""))
(("\"xdg-mime\"")
@ -3097,7 +3212,7 @@ (define-public fuzzel
fontconfig
libpng
libxkbcommon
librsvg ;if librsvg is not used, bundled nanosvg is used
(librsvg-for-system) ;if librsvg is not used, bundled nanosvg is used
pixman
wayland
wayland-protocols))
@ -3151,7 +3266,7 @@ (define-public nwg-launchers
"0hq2qiqxvrw3g515ywcb676ljc8mdw3pyslgxr3vahizfljah1pv"))))
(build-system meson-build-system)
(native-inputs (list nlohmann-json pkg-config))
(inputs (list gtk-layer-shell gtkmm-3 librsvg))
(inputs (list gtk-layer-shell gtkmm-3 (librsvg-for-system)))
(home-page "https://github.com/nwg-piotr/nwg-launchers")
(synopsis "Application launchers for wlroots")
(description

19
gnu/packages/xml.scm
View file

@ -29,7 +29,7 @@
;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
@ -88,7 +88,7 @@ (define-module (gnu packages xml)
(define-public libxmlb
(package
(name "libxmlb")
(version "0.3.10")
(version "0.3.12")
(source
(origin
(method git-fetch)
@ -98,7 +98,7 @@ (define-public libxmlb
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1q7kizfgbvs02fdnvz09yjyy3v1dpbxl7xf1gx056mbnlib6faxs"))))
(base32 "0v9s2k5saxrs0ssjyg1zxaibybikvaw7fip6sy0b8ixzax9r5y0c"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t))
@ -106,6 +106,8 @@ (define-public libxmlb
(list gobject-introspection gtk-doc/stable pkg-config))
(inputs
(list appstream-glib glib))
(propagated-inputs
(list `(,zstd "lib"))) ; in Requires.private of xmlb.pc
(synopsis "Library to help create and query binary XML blobs")
(description "Libxmlb library takes XML source, and converts it to a
structured binary representation with a deduplicated string table; where the
@ -1457,20 +1459,23 @@ (define-public python-defusedxml
(define-public freexl
(package
(name "freexl")
(version "1.0.6")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.gaia-gis.it/gaia-sins/"
"freexl-sources/"
"freexl-" version ".tar.gz"))
(sha256
(base32
"08pwj17l0lgp6zms9nmpawdxpvhzrslklbd53s4b430k7mxbbs1x"))))
"1w57w73gfj2niz9dn235hn5wsvxpdbj6sp5zxcg7rasqvvqharqp"))))
(build-system gnu-build-system)
(inputs
(list expat minizip))
(home-page "https://www.gaia-gis.it/fossil/freexl/index")
(synopsis "Read Excel files")
(description
"FreeXL is a C library to extract valid data from within an Excel (.xls)
spreadsheet.")
"FreeXL is a C library to extract valid data from within an Excel
(.xls, .xlsx) or LibreOffice (.ods) spreadsheet.")
;; Any of these licenses may be picked.
(license (list license:gpl2+
license:lgpl2.1+

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