me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into gnome-team.

master
Liliana Marie Prikler 2023-05-10 21:39:40 +02:00
parent eab4d0e18a b4e5844700
commit 09dd600159
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
180 changed files with 15732 additions and 7309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.patman
View File

@ -5,7 +5,6 @@
project: guix-patches
patchwork_url: https://patches.guix-patches.cbaines.net
add_signoff: False
get_maintainer_script: etc/teams.scm get-maintainer
# TODO: enable check_patch
check_patch: False
ignore_bad_tags: True

15
Makefile.am
View File

@ -14,6 +14,7 @@
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2021 Andrew Tropin <andrew@trop.in>
#
@ -329,6 +330,7 @@ MODULES = \
guix/scripts/lint.scm \
guix/scripts/challenge.scm \
guix/scripts/import/crate.scm \
guix/scripts/import/cpan.scm \
guix/scripts/import/cran.scm \
guix/scripts/import/egg.scm \
guix/scripts/import/elm.scm \
@ -1111,6 +1113,19 @@ cuirass-jobs: $(GOBJECTS)
.PHONY: clean-go make-go as-derivation authenticate
.PHONY: update-guix-package update-NEWS cuirass-jobs release
# Git auto-configuration.
.git/hooks/pre-push: etc/git/pre-push
$(AM_V_at)if test -d .git; then \
cp etc/git/pre-push .git/hooks/pre-push; \
fi
.git/config: etc/git/gitconfig
$(AM_V_at)if command -v git >/dev/null && test -d .git; then \
git config --add include.path ../etc/git/gitconfig; \
fi
nodist_noinst_DATA = .git/hooks/pre-push .git/config
# Downloading up-to-date PO files.
WEBLATE_REPO = https://framagit.org/tyreunom/guix-translations

114
doc/contributing.texi
View File

@ -130,14 +130,16 @@ more information.
Then, run:
@example
./configure --localstatedir=/var
./configure --localstatedir=/var --sysconfdir=/etc
@end example
@noindent
... where @file{/var} is the normal @code{localstatedir} value
(@pxref{The Store}, for information about this). Note that you will
probably not run @command{make install} at the end (you don't have to)
but it's still important to pass the right @code{localstatedir}.
(@pxref{The Store}, for information about this) and @file{/etc} is the
normal @code{sysconfdir} value. Note that you will probably not run
@command{make install} at the end (you don't have to) but it's still
important to pass the right @code{localstatedir} and @code{sysconfdir}
values, which get recorded in the @code{(guix config)} Guile module.
Finally, you can build Guix and, if you feel so inclined, run the tests
(@pxref{Running the Test Suite}):
@ -1395,28 +1397,8 @@ different name or email just for commits in this repository, you can
use @command{git config --local}, or edit @file{.git/config} in the
repository instead of @file{~/.gitconfig}.
We provide some default settings in @file{etc/git/gitconfig} which
modify how patches are generated, making them easier to read and apply.
These settings can be applied by manually copying them to
@file{.git/config} in your checkout, or by telling Git to include the
whole file:
@example
git config --local include.path ../etc/git/gitconfig
@end example
From then on, any changes to @file{etc/git/gitconfig} would
automatically take effect.
Since the first patch in a series must be sent separately
(@pxref{Sending a Patch Series}), it can also be helpful to tell
@command{git format-patch} to handle the e-mail threading instead of
@command{git send-email}:
@example
git config --local format.thread shallow
git config --local sendemail.thread no
@end example
Other important Git configuration will automatically be configured when
building the project (@pxref{Building from Git}).
@node Sending a Patch Series
@subsection Sending a Patch Series
@ -1439,10 +1421,12 @@ output of the @code{git} package, i.e. @code{git:send-email}.
The following command will create a patch email from the latest commit,
open it in your @var{EDITOR} or @var{VISUAL} for editing, and send it to
the Guix mailing list to be reviewed and merged:
the Guix mailing list to be reviewed and merged. Assuming you have
already configured Git according to @xref{Configuring Git}, you can
simply use:
@example
$ git send-email -1 -a --base=auto --to=guix-patches@@gnu.org
$ git send-email --annotate -1
@end example
@quotation Tip
@ -1453,31 +1437,26 @@ other than the @code{master} branch of
@url{https://git.savannah.gnu.org/cgit/guix.git}.
@example
git send-email -1 -a --base=auto \
--subject-prefix='PATCH core-updates' \
--to=guix-patches@@gnu.org
git send-email --annotate --subject-prefix='PATCH core-updates' -1
@end example
@end quotation
The patch email contains a three-dash separator line after the commit
message. You may ``annotate'' the patch with explanatory text by adding
it under this line. If you do not wish to annotate the email, you may
drop the @option{-a} flag (which is short for @option{--annotate}).
The @option{--base=auto} flag automatically adds a note at the bottom
of the patch of the commit it was based on, making it easier for
maintainers to rebase and merge your patch.
drop the @option{--annotate} option.
If you need to send a revised patch, don't resend it like this or send
a ``fix'' patch to be applied on top of the last one; instead, use
@command{git commit -a} or @url{https://git-rebase.io, @command{git rebase}}
to modify the commit, and use the @email{@var{ISSUE_NUMBER}@@debbugs.gnu.org}
address and the @option{-v} flag with @command{git send-email}.
@command{git commit --amend} or @url{https://git-rebase.io,
@command{git rebase}} to modify the commit, and use the
@email{@var{ISSUE_NUMBER}@@debbugs.gnu.org} address and the @option{-v}
flag with @command{git send-email}.
@example
$ git commit -a
$ git send-email -1 -a --base=auto -v@var{REVISION} \
--to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
$ git commit --amend
$ git send-email --annotate -v@var{REVISION} \
--to=@var{ISSUE_NUMBER}@@debbugs.gnu.org -1
@end example
@quotation Note
@ -1494,14 +1473,14 @@ reply to incoming bugs and patches, which contains the bug number.
@unnumberedsubsubsec Notifying Teams
@anchor{Notifying Teams}
@cindex teams
The @file{etc/teams.scm} script may be used to notify all those who
may be interested in your patch of its existence (@pxref{Teams}).
Use @command{etc/teams.scm list-teams} to display all the teams,
decide which team(s) your patch relates to, and use
@command{etc/teams.scm cc} to output various @command{git send-email}
flags which will notify the appropriate team members, or use
@command{etc/teams.scm cc-members} to detect the appropriate teams
automatically.
If your git checkout has been correctly configured (@pxref{Configuring
Git}), the @command{git send-email} command will automatically notify
the appropriate team members, based on the scope of your changes. This
relies on the @file{etc/teams.scm} script, which can also be invoked
manually if you do not use the preferred @command{git send-email}
command to submit patches. To list the available actions of the script,
you can invoke it via the @command{etc/teams.scm help} command. For
more information regarding teams, see @xref{Teams}.
@unnumberedsubsubsec Multiple Patches
@anchor{Multiple Patches}
@ -1528,9 +1507,7 @@ We can now send @emph{just} the cover letter to the
that we can send the rest of the patches to.
@example
$ git send-email outgoing/0000-cover-letter.patch -a \
--to=guix-patches@@gnu.org \
$(etc/teams.scm cc-members ...)
$ git send-email outgoing/0000-cover-letter.patch --annotate
$ rm outgoing/0000-cover-letter.patch # we don't want to resend it!
@end example
@ -1542,9 +1519,7 @@ Once the Debbugs mailer has replied to your cover letter email, you
can send the actual patches to the newly-created issue address.
@example
$ git send-email outgoing/*.patch \
--to=@var{ISSUE_NUMBER}@@debbugs.gnu.org \
$(etc/teams.scm cc-members ...)
$ git send-email outgoing/*.patch --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
$ rm -rf outgoing # we don't need these anymore
@end example
@ -1553,14 +1528,13 @@ to send an amended patch series, since an issue already exists for
the patchset.
@example
$ git send-email -@var{NUMBER_COMMITS} \
-v@var{REVISION} --base=auto \
$ git send-email -@var{NUMBER_COMMITS} -v@var{REVISION} \
--to @var{ISSUE_NUMBER}@@debbugs.gnu.org
@end example
If need be, you may use @option{--cover-letter -a} to send another cover
letter, e.g. for explaining what's changed since the last revision, and
these changes are necessary.
If need be, you may use @option{--cover-letter --annotate} to send
another cover letter, e.g. for explaining what's changed since the last
revision, and these changes are necessary.
@node Teams
@subsection Teams
@ -1587,7 +1561,8 @@ You can run the following command to have the @code{Mentors} team put in
CC of a patch series:
@example
$ git send-email --to @var{ISSUE_NUMBER}@@debbugs.gnu.org $(./etc/teams.scm cc mentors) *.patch
$ git send-email --to @var{ISSUE_NUMBER}@@debbugs.gnu.org \
--header-cmd='etc/teams.scm cc-mentors-header-cmd' *.patch
@end example
The appropriate team or teams can also be inferred from the modified
@ -1596,7 +1571,7 @@ current Git repository to review, you can run:
@example
$ guix shell -D guix
[env]$ git send-email --to @var{ISSUE_NUMBER}@@debbugs.gnu.org $(./etc/teams.scm cc-members HEAD~2 HEAD) *.patch
[env]$ git send-email --to @var{ISSUE_NUMBER}@@debbugs.gnu.org -2
@end example
@node Tracking Bugs and Patches
@ -1831,16 +1806,9 @@ To check that commits are signed with correct key, use:
make authenticate
@end example
You can prevent yourself from accidentally pushing unsigned or signed
with the wrong key commits to Savannah by using the pre-push Git hook
located at @file{etc/git/pre-push}:
@example
cp etc/git/pre-push .git/hooks/pre-push
@end example
It additionally calls @code{make check-channel-news} to be sure
@file{news.scm} file is correct.
To avoid accidentally pushing unsigned or signed with the wrong key
commits to Savannah, make sure to configure Git according to
@xref{Configuring Git}.
@subsection Commit Policy

83
doc/guix-cookbook.texi
View File

@ -628,30 +628,25 @@ The @code{use-modules} expression tells which of the modules we need in the file
Modules are a collection of values and procedures. They are commonly called
``libraries'' or ``packages'' in other programming languages.
@node @samp{GUIX_PACKAGE_PATH}
@subsubsection @samp{GUIX_PACKAGE_PATH}
@node Channels
@subsubsection Channels
@emph{Note: Starting from Guix 0.16, the more flexible Guix @dfn{channels} are the
preferred way and supersede @samp{GUIX_PACKAGE_PATH}. See next section.}
@cindex channel
Guix and its package collection can be extended through @dfn{channels}.
A channel is a Git repository, public or not, containing @file{.scm}
files that provide packages (@pxref{Defining Packages,,, guix, GNU Guix
Reference Manual}) or services (@pxref{Defining Services,,, guix, GNU
Guix Reference Manual}).
It can be tedious to specify the file from the command line instead of simply
calling @code{guix package --install my-hello} as you would do with the official
packages.
Guix makes it possible to streamline the process by adding as many ``package
declaration directories'' as you want.
Create a directory, say @file{~/guix-packages} and add it to the @samp{GUIX_PACKAGE_PATH}
environment variable:
How would you go about creating a channel? First, create a directory
that will contain your @file{.scm} files, say @file{~/my-channel}:
@example
$ mkdir ~/guix-packages
$ export GUIX_PACKAGE_PATH=~/guix-packages
mkdir ~/my-channel
@end example
To add several directories, separate them with a colon (@code{:}).
Our previous @samp{my-hello} needs some adjustments though:
Suppose you want to add the @samp{my-hello} package we saw previously;
it first needs some adjustments:
@lisp
(define-module (my-hello)
@ -692,9 +687,9 @@ package. If you want to use @code{define-public} in this use-case nonetheless,
sure the file ends with an evaluation of @code{my-hello}:
@lisp
; ...
;; ...
(define-public my-hello
; ...
;; ...
)
my-hello
@ -702,22 +697,50 @@ my-hello
This last example is not very typical.
Now @samp{my-hello} should be part of the package collection like all other official
packages. You can verify this with:
Now how do you make that package visible to @command{guix} commands so
you can test your packages? You need to add the directory to the search
path using the @option{-L} command-line option, as in these examples:
@example
$ guix package --show=my-hello
guix show -L ~/my-channel my-hello
guix build -L ~/my-channel my-hello
@end example
@node Guix channels
@subsubsection Guix channels
The final step is to turn @file{~/my-channel} into an actual channel,
making your package collection seamlessly available @i{via} any
@command{guix} command. To do that, you first need to make it a Git
repository:
Guix 0.16 features channels, which is very similar to @samp{GUIX_PACKAGE_PATH} but
provides better integration and provenance tracking. Channels are not
necessarily local, they can be maintained as a public Git repository for
instance. Of course, several channels can be used at the same time.
@example
cd ~/my-channel
git init
git add my-hello.scm
git commit -m "First commit of my channel."
@end example
@xref{Channels,,, guix, GNU Guix Reference Manual} for setup details.
And that's it, you have a channel! From there on, you can add this
channel to your channel configuration in
@file{~/.config/guix/channels.scm} (@pxref{Specifying Additional
Channels,,, guix, GNU Guix Reference Manual}); assuming you keep your
channel local for now, the @file{channels.scm} would look something like
this:
@lisp
(append (list (channel
(name 'my-channel)
(url (string-append "file://" (getenv "HOME")
"/my-channel"))))
%default-channels)
@end lisp
Next time you run @command{guix pull}, your channel will be picked up
and the packages it defines will be readily available to all the
@command{guix} commands, even if you do not pass @option{-L}. The
@command{guix describe} command will show that Guix is, indeed, using
both the @code{my-channel} and the @code{guix} channels.
@xref{Creating a Channel,,, guix, GNU Guix Reference Manual}, for
details.
@node Direct checkout hacking
@subsubsection Direct checkout hacking

190
doc/guix.texi
View File

@ -49,7 +49,7 @@ Copyright @copyright{} 2017 humanitiesNerd@*
Copyright @copyright{} 2017, 2021 Christine Lemmer-Webber@*
Copyright @copyright{} 2017, 2018, 2019, 2020, 2021, 2022 Marius Bakke@*
Copyright @copyright{} 2017, 2019, 2020, 2022 Hartmut Goebel@*
Copyright @copyright{} 2017, 2019, 2020, 2021, 2022 Maxim Cournoyer@*
Copyright @copyright{} 2017, 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer@*
Copyright @copyright{} 2017–2022 Tobias Geerinckx-Rice@*
Copyright @copyright{} 2017 George Clemmer@*
Copyright @copyright{} 2017 Andy Wingo@*
@ -180,7 +180,7 @@ Weblate} (@pxref{Translating Guix}).
* Introduction:: What is Guix about?
* Installation:: Installing Guix.
* System Installation:: Installing the whole operating system.
* System Troubleshooting Tips:: When things don't go as planned.
* System Troubleshooting Tips:: When things don't go as planned.
* Getting Started:: Your first steps.
* Package Management:: Package installation, upgrade, etc.
* Channels:: Customizing the package collection.
@ -210,8 +210,8 @@ Weblate} (@pxref{Translating Guix}).
Introduction
* Managing Software the Guix Way:: What's special.
* GNU Distribution:: The packages and tools.
* Managing Software the Guix Way:: What's special.
* GNU Distribution:: The packages and tools.
Installation
@ -241,15 +241,15 @@ System Installation
* Installing Guix in a VM:: Guix System playground.
* Building the Installation Image:: How this comes to be.
System Troubleshooting Tips
* Chrooting into an existing system:: Fixing things from a chroot
Manual Installation
* Keyboard Layout and Networking and Partitioning:: Initial setup.
* Keyboard Layout and Networking and Partitioning:: Initial setup.
* Proceeding with the Installation:: Installing.
System Troubleshooting Tips
* Chrooting into an existing system::
Package Management
* Features:: How Guix will make your life brighter.
@ -293,7 +293,7 @@ Development
* Invoking guix environment:: Setting up development environments.
* Invoking guix pack:: Creating software bundles.
* The GCC toolchain:: Working with languages supported by GCC.
* Invoking guix git authenticate:: Authenticating Git repositories.
* Invoking guix git authenticate:: Authenticating Git repositories.
Programming Interface
@ -309,7 +309,7 @@ Programming Interface
* Derivations:: Low-level interface to package derivations.
* The Store Monad:: Purely functional interface to the store.
* G-Expressions:: Manipulating build expressions.
* Invoking guix repl:: Programming Guix in Guile.
* Invoking guix repl:: Programming Guix in Guile
* Using Guix Interactively:: Fine-grain interaction at the REPL.
Defining Packages
@ -344,8 +344,9 @@ Invoking @command{guix build}
* Debugging Build Failures:: Real life packaging experience.
Foreign Architectures
* Cross-Compilation:: Cross-compiling for another architecture.
* Native Builds:: Targeting another architecture through native builds.
* Cross-Compilation:: Cross-compiling for another architecture.
* Native Builds:: Targeting another architecture through native builds.
System Configuration
@ -368,9 +369,9 @@ System Configuration
* Running Guix in a VM:: How to run Guix System in a virtual machine.
* Defining Services:: Adding new service definitions.
Home Environment Configuration
File Systems
* Invoking guix home:: Instantiating a home environment configuration.
* Btrfs file system::
Services
@ -388,12 +389,14 @@ Services
* Mail Services:: IMAP, POP3, SMTP, and all that.
* Messaging Services:: Messaging services.
* Telephony Services:: Telephony services.
* File-Sharing Services:: File-sharing services.
* Monitoring Services:: Monitoring services.
* Kerberos Services:: Kerberos services.
* LDAP Services:: LDAP services.
* Web Services:: Web servers.
* Certificate Services:: TLS certificates via Let's Encrypt.
* DNS Services:: DNS daemons.
* VNC Services:: VNC daemons.
* VPN Services:: VPN daemons.
* Network File System:: NFS related services.
* Samba Services:: Samba services.
@ -417,18 +420,45 @@ Defining Services
* Shepherd Services:: A particular type of service.
* Complex Configurations:: Defining bindings for complex configurations.
Home Configuration
* Declaring the Home Environment:: Customizing your Home.
* Configuring the Shell:: Enabling home environment.
* Home Services:: Specifying home services.
* Invoking guix home:: Instantiating a home configuration.
Home Services
* Essential Home Services:: Environment variables, packages, on-* scripts.
* Shells: Shells Home Services. POSIX shells, Bash, Zsh.
* Mcron: Mcron Home Service. Scheduled User's Job Execution.
* Power Management: Power Management Home Services. Services for battery power.
* Shepherd: Shepherd Home Service. Managing User's Daemons.
* SSH: Secure Shell. Setting up the secure shell client.
* GPG: GNU Privacy Guard. Setting up GPG and related tools.
* Desktop: Desktop Home Services. Services for graphical environments.
* Guix: Guix Home Services. Services for Guix.
* Fonts: Fonts Home Services. Services for managing User's fonts.
* Sound: Sound Home Services. Dealing with audio.
* Messaging: Messaging Home Services. Services for managing messaging.
* Media: Media Home Services. Services for managing media.
Platforms
* platform Reference:: Detail of platform declarations.
* Supported Platforms:: Description of the supported platforms.
System Images
Creating System Images
* image Reference:: Detail of image declarations.
* Instantiate an Image:: How to instantiate an image record.
* image-type Reference:: Detail of image types declaration.
* Image Modules:: Definition of image modules.
@code{image} Reference
* partition Reference::
Installing Debugging Files
* Separate Debug Info:: Installing 'debug' outputs.
@ -437,7 +467,7 @@ Installing Debugging Files
Bootstrapping
* Full-Source Bootstrap:: A Bootstrap worthy of GNU.
* Preparing to Use the Bootstrap Binaries:: Building that what matters most.
* Preparing to Use the Bootstrap Binaries:: Building that what matters most.
@end detailmenu
@end menu
@ -468,8 +498,8 @@ readily available through the @command{guix system} command, even if you're
using a different distro underneath!}. @xref{GNU Distribution}.
@menu
* Managing Software the Guix Way:: What's special.
* GNU Distribution:: The packages and tools.
* Managing Software the Guix Way:: What's special.
* GNU Distribution:: The packages and tools.
@end menu
@node Managing Software the Guix Way
@ -1016,14 +1046,21 @@ C++11 standard.
@end itemize
@cindex state directory
@cindex localstatedir
@cindex system configuration directory
@cindex sysconfdir
When configuring Guix on a system that already has a Guix installation,
be sure to specify the same state directory as the existing installation
using the @option{--localstatedir} option of the @command{configure}
script (@pxref{Directory Variables, @code{localstatedir},, standards,
GNU Coding Standards}). Usually, this @var{localstatedir} option is
set to the value @file{/var}. The @command{configure} script protects
GNU Coding Standards}). Usually, this @var{localstatedir} option is set
to the value @file{/var}. The @command{configure} script protects
against unintended misconfiguration of @var{localstatedir} so you do not
inadvertently corrupt your store (@pxref{The Store}).
inadvertently corrupt your store (@pxref{The Store}). The configuration
directory should also be configured by setting the @option{--sysconfdir}
option to the @file{/etc} value, which is the location used by Guix to
store for example the access control list of authorized machines and the
definition of offload machines.
@node Running the Test Suite
@section Running the Test Suite
@ -2407,7 +2444,7 @@ Guix System. This means that you can install additional packages, should you
need it, using @command{guix package} (@pxref{Invoking guix package}).
@menu
* Keyboard Layout and Networking and Partitioning:: Initial setup.
* Keyboard Layout and Networking and Partitioning:: Initial setup.
* Proceeding with the Installation:: Installing.
@end menu
@ -2905,6 +2942,10 @@ from there. Such technique is explained below.
@cindex chroot, guix system
@cindex chrooting, guix system
@cindex repairing GRUB, via chroot
@menu
* Chrooting into an existing system::
@end menu
@node Chrooting into an existing system
@section Chrooting into an existing system
@ -5922,7 +5963,7 @@ easily distributed to users who do not run Guix.
* Invoking guix environment:: Setting up development environments.
* Invoking guix pack:: Creating software bundles.
* The GCC toolchain:: Working with languages supported by GCC.
* Invoking guix git authenticate:: Authenticating Git repositories.
* Invoking guix git authenticate:: Authenticating Git repositories.
@end menu
@node Invoking guix shell
@ -10140,23 +10181,31 @@ phase before the @code{build} phase, called
;; other fields omitted
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'set-prefix-in-makefile
(lambda* (#:key outputs #:allow-other-keys)
;; Modify the makefile so that its
;; 'PREFIX' variable points to "out".
(let ((out (assoc-ref outputs "out")))
(substitute* "Makefile"
(("PREFIX =.*")
(string-append "PREFIX = "
out "\n")))))))))))
(list
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'set-prefix-in-makefile
(lambda* (#:key inputs #:allow-other-keys)
;; Modify the makefile so that its
;; 'PREFIX' variable points to #$output and
;; 'XMLLINT' points to the correct path.
(substitute* "Makefile"
(("PREFIX =.*")
(string-append "PREFIX = " #$output "\n"))
(("XMLLINT =.*")
(string-append "XMLLINT = "
(search-input-file inputs "/bin/xmllint")
"\n"))))))))))
@end lisp
The new phase that is inserted is written as an anonymous procedure,
introduced with @code{lambda*}; it honors the @code{outputs} parameter
we have seen before. @xref{Build Utilities}, for more about the helpers
used by this phase, and for more examples of @code{modify-phases}.
introduced with @code{lambda*}; it looks for the @file{xmllint}
executable under a @file{/bin} directory among the package's inputs
(@pxref{package Reference}). It also honors the @code{outputs} parameter
we have seen before. @xref{Build Utilities}, for more about
the helpers used by this phase, and for more examples of
@code{modify-phases}.
@cindex code staging
@cindex staging, of code
@ -12919,6 +12968,35 @@ guix build coreutils --with-patch=glibc=./glibc-frob.patch
In this example, glibc itself as well as everything that leads to
Coreutils in the dependency graph is rebuilt.
@cindex configure flags, changing them
@item --with-configure-flag=@var{package}=@var{flag}
Append @var{flag} to the configure flags of @var{package}, where
@var{package} is a spec such as @code{guile@@3.0} or @code{glibc}. The
build system of @var{package} must support the @code{#:configure-flags}
argument.
For example, the command below builds GNU@tie{}Hello with the
configure flag @code{--disable-nls}:
@example
guix build hello --with-configure-flag=hello=--disable-nls
@end example
The following command passes an extra flag to @command{cmake} as it
builds @code{lapack}:
@example
guix build lapack \
--with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
@end example
@quotation Note
Under the hood, this option works by passing the
@samp{#:configure-flags} argument to the build system of the package of
interest (@pxref{Build Systems}). Most build systems support that
option but some do not. In that case, an error is raised.
@end quotation
@cindex upstream, latest version
@item --with-latest=@var{package}
@itemx --with-version=@var{package}=@var{version}
@ -16119,8 +16197,8 @@ requires emulation, using the QEMU program for instance.
@end enumerate
@menu
* Cross-Compilation:: Cross-compiling for another architecture.
* Native Builds:: Targeting another architecture through native builds.
* Cross-Compilation:: Cross-compiling for another architecture.
* Native Builds:: Targeting another architecture through native builds.
@end menu
@node Cross-Compilation
@ -17034,6 +17112,10 @@ operating system configuration. See the examples above.
@end defun
@menu
* Btrfs file system::
@end menu
@node Btrfs file system
@subsection Btrfs file system
@ -37140,6 +37222,9 @@ for the hook and the value is the number of threads to run.
@item @code{guile} (default: @code{guile-3.0-latest})
The Guile package with which to run the Guix Build Coordinator.
@item @code{extra-environment-variables} (default: @var{'()})
Extra environment variables to set via the shepherd service.
@end table
@end deftp
@ -37172,6 +37257,9 @@ will use the current system it's running on as the default.
@item @code{max-parallel-builds} (default: @code{1})
The number of builds to perform in parallel.
@item @code{max-parallel-uploads} (default: @code{1})
The number of uploads to perform in parallel.
@item @code{max-allocated-builds} (default: @code{#f})
The maximum number of builds this agent can be allocated.
@ -41709,9 +41797,9 @@ still in an experimental stage, though.
@menu
* Declaring the Home Environment:: Customizing your Home.
* Configuring the Shell:: Enabling home environment.
* Home Services:: Specifying home services.
* Invoking guix home:: Instantiating a home configuration.
* Configuring the Shell:: Enabling home environment.
* Home Services:: Specifying home services.
* Invoking guix home:: Instantiating a home configuration.
@end menu
@node Declaring the Home Environment
@ -43115,7 +43203,7 @@ This is the multicast address used by default by the two services above.
@cindex znc
The @uref{https://znc.in, ZNC bouncer} can be run as a daemon to manage
your IRC presence. With the @code{(gnu home services znc)} service, you
your IRC presence. With the @code{(gnu home services messaging)} service, you
can configure ZNC to run upon login.
You will have to provide a @file{~/.znc/configs/znc.conf} seperately.
@ -43727,10 +43815,10 @@ This chapter explains how to define customized system images and how to
turn them into actual bootable images.
@menu
* image Reference:: Detail of image declarations.
* Instantiate an Image:: How to instantiate an image record.
* image-type Reference:: Detail of image types declaration.
* Image Modules:: Definition of image modules.
* image Reference:: Detail of image declarations.
* Instantiate an Image:: How to instantiate an image record.
* image-type Reference:: Detail of image types declaration.
* Image Modules:: Definition of image modules.
@end menu
@node image Reference
@ -43821,6 +43909,10 @@ defaults to @code{true}.
@end table
@end deftp
@menu
* partition Reference::
@end menu
@node partition Reference
@subsection @code{partition} Reference
@ -44665,7 +44757,7 @@ Binaries}).
@menu
* Full-Source Bootstrap:: A Bootstrap worthy of GNU.
* Preparing to Use the Bootstrap Binaries:: Building that what matters most.
* Preparing to Use the Bootstrap Binaries:: Building that what matters most.
@end menu
@node Full-Source Bootstrap

16
etc/git/gitconfig
View File

@ -1,5 +1,21 @@
[commit]
gpgsign = true
[diff "scheme"]
xfuncname = "^(\\(define.*)$"
[diff "texinfo"]
xfuncname = "^@node[[:space:]]+([^,]+).*$"
[format]
forceinbodyfrom = true # help preserve commit authorship
thread = shallow
useAutoBase = true
[pull]
rebase = true
[sendemail]
to = guix-patches@gnu.org
headerCmd = etc/teams.scm cc-members-header-cmd
thread = no

43
etc/news.scm
View File

@ -26,6 +26,49 @@
(channel-news
(version 0)
(entry (commit "ae11fcb84ac478dfa56d322ef08890645183a087")
(title
(en "New @option{--with-configure-flag} transformation option")
(de "Neue Paketumwandlungsoption @option{--with-configure-flag}")
(fr "Nouvelle option de transformation @option{--with-configure-flag}"))
(body
(en "The new @option{--with-configure-flag} package transformation
option lets you pass an additional configure flag to the build system of a
package. For instance, here is how you would pass a flag to @command{cmake},
the build system of the @code{lapack} package:
@example
guix build lapack \\
--with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
@end example
Run @command{info \"(guix) Package Transformation Options\"} for more info.")
(de "Die neue Paketumwandlungsoption @option{--with-configure-flag}
macht es möglich, dem Erstellungssystem eines Pakets eine zusätzliche
Befehlszeilenoption für configure mitzugeben. Zum Beispiel können Sie dem
@command{cmake}-Erstellungssystem des @code{lapack}-Pakets eine Option mitgeben:
@example
guix build lapack \\
--with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
@end example
Führen Sie für mehr Informationen @command{info \"(guix.de)
Paketumwandlungsoptionen\"} aus.")
(fr "La nouvelle option de transformation de paquets
@option{--with-configure-flag} permet de passer un drapeau supplémentaire au
système de construction d'un paquet. Par exemple, voici comment on passerait
un drapeau à @command{cmake}, le système de construction du logiciel
@code{lapack} :
@example
guix build lapack \\
--with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
@end example
Voir @command{info \"(guix.fr) Options de transformation de paquets\"} pour
plus de détails.")))
(entry (commit "c919bfefd98bf2e29549539b4e28e6dc2a8a6f32")
(title
(en "Core packages updated")

28
etc/teams.scm.in
View File

@ -5,7 +5,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -263,6 +263,7 @@ asdf-build-system."
(team 'rust
#:name "Rust"
#:scope (list (make-regexp "^gnu/packages/(crates|rust)(-.+|)\\.scm$")
"gnu/packages/sequoia.scm"
"guix/build/cargo-build-system.scm"
"guix/build/cargo-utils.scm"
"guix/build-system/cargo.scm"
@ -696,6 +697,12 @@ and REV-END, two git revision strings."
(rev-start (string-append rev-end "^")))
(list rev-start rev-end)))
(define (patch->teams patch-file)
"Return the name of the teams in scope for the changes in PATCH-FILE."
(map (compose symbol->string team-id)
(find-team-by-scope (apply diff-revisions
(git-patch->revisions patch-file)))))
(define (main . args)
(match args
@ -708,11 +715,16 @@ and REV-END, two git revision strings."
(("cc-members" rev-start rev-end)
(apply cc (find-team-by-scope
(diff-revisions rev-start rev-end))))
(("cc-members-header-cmd" patch-file)
(for-each (lambda (team-name)
(list-members (find-team team-name) (current-output-port)
"X-Debbugs-Cc: "))
(patch->teams patch-file)))
(("cc-mentors-header-cmd" patch-file)
(list-members (find-team "mentors") (current-output-port)
"X-Debbugs-Cc: "))
(("get-maintainer" patch-file)
(apply main "list-members"
(map (compose symbol->string team-id)
(find-team-by-scope (apply diff-revisions
(git-patch->revisions patch-file))))))
(apply main "list-members" (patch->teams patch-file)))
(("list-teams" . args)
(list-teams))
(("list-members" . team-names)
@ -727,8 +739,12 @@ and REV-END, two git revision strings."
Commands:
cc <team-name>
get git send-email flags for cc-ing <team-name>
cc-members <start> <end> | patch
cc-members <start> <end> | <patch>
cc teams related to files changed between revisions or in a patch file
cc-members-header-cmd <patch>
cc-members variant for use with 'git send-email --header-cmd'
cc-mentors-header-cmd <patch>
command to use with 'git send-email --header-cmd' to notify mentors
list-teams
list teams and their members
list-members <team-name>

4
gnu/build/dbus-service.scm
View File

@ -64,10 +64,10 @@
;;; which is required at least for the Jami service.
(define sleep*
(lambda () ;delay execution
(if (resolve-module '(fibers) #f)
(if (resolve-module '(fibers) #f #:ensure #f)
(module-ref (resolve-interface '(fibers)) 'sleep)
(begin
(format #f "fibers not available -- blocking 'sleep' in use")
(format #t "Fibers not available -- blocking 'sleep' in use~%")
sleep))))
;;;

2
gnu/build/secret-service.scm
View File

@ -62,7 +62,7 @@ bindings available within the lexical scope of BODY."
(define (wait-for-readable-fd port timeout)
"Wait until PORT has data available for reading or TIMEOUT has expired.
Return #t in the former case and #f in the latter case."
(match (resolve-module '(fibers) #f) ;using Fibers?
(match (resolve-module '(fibers) #f #:ensure #f) ;using Fibers?
(#f
(log "blocking on socket...~%")
(match (select (list port) '() '() timeout)

7
gnu/installer/locale.scm
View File

@ -93,9 +93,10 @@ optionally, CODESET."
(define (supported-locales->locales supported-locales)
"Given SUPPORTED-LOCALES, a file produced by 'glibc-supported-locales',
return a list of locales where each locale is an alist."
(map (match-lambda
((locale . codeset)
(locale-string->locale locale codeset)))
(filter-map (match-lambda
(("C.UTF-8" . codeset) #f)
((locale . codeset)
(locale-string->locale locale codeset)))
(call-with-input-file supported-locales read)))

19
gnu/local.mk
View File

@ -1000,6 +1000,7 @@ dist_patch_DATA = \
%D%/packages/patches/classpath-aarch64-support.patch \
%D%/packages/patches/classpath-miscompilation.patch \
%D%/packages/patches/cling-use-shared-library.patch \
%D%/packages/patches/clitest-grep-compat.patch \
%D%/packages/patches/clog-fix-shared-build.patch \
%D%/packages/patches/clucene-pkgconfig.patch \
%D%/packages/patches/cmake-curl-certificates-3.24.patch \
@ -1055,6 +1056,9 @@ dist_patch_DATA = \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
%D%/packages/patches/dstat-skip-devices-without-io.patch \
%D%/packages/patches/dune-common-skip-failing-tests.patch \
%D%/packages/patches/dune-grid-add-missing-include-cassert.patch \
%D%/packages/patches/dune-istl-fix-solver-playground.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/dynaconf-unvendor-deps.patch \
%D%/packages/patches/efivar-211.patch \
@ -1210,6 +1214,7 @@ dist_patch_DATA = \
%D%/packages/patches/genimage-mke2fs-test.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/gettext-libunicode-update.patch \
%D%/packages/patches/git-header-cmd.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \
%D%/packages/patches/ghc-9.2-grep-warnings.patch \
@ -1425,6 +1430,7 @@ dist_patch_DATA = \
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
%D%/packages/patches/kodi-mesa-eglchromium.patch \
%D%/packages/patches/kwayland-skip-flaky-test.patch \
%D%/packages/patches/laby-make-install.patch \
%D%/packages/patches/ldns-drill-examples.patch \
@ -1435,6 +1441,7 @@ dist_patch_DATA = \
%D%/packages/patches/liba52-set-soname.patch \
%D%/packages/patches/liba52-use-mtune-not-mcpu.patch \
%D%/packages/patches/libaio-32bit-test.patch \
%D%/packages/patches/libaio-riscv-test5.patch \
%D%/packages/patches/libbase-fix-includes.patch \
%D%/packages/patches/libbase-use-own-logging.patch \
%D%/packages/patches/libbonobo-activation-test-race.patch \
@ -1510,7 +1517,6 @@ dist_patch_DATA = \
%D%/packages/patches/linuxdcpp-openssl-1.1.patch \
%D%/packages/patches/lirc-localstatedir.patch \
%D%/packages/patches/lirc-reproducible-build.patch \
%D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \
%D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \
%D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \
%D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \
@ -1533,11 +1539,8 @@ dist_patch_DATA = \
%D%/packages/patches/lua-5.4-liblua-so.patch \
%D%/packages/patches/luit-posix.patch \
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/lxqt-session-procps-4.patch \
%D%/packages/patches/mailutils-variable-lookup.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
%D%/packages/patches/mathjax-disable-webpack.patch \
%D%/packages/patches/mathjax-no-a11y.patch \
%D%/packages/patches/mathjax-3.1.2-no-a11y.patch \
@ -1557,7 +1560,6 @@ dist_patch_DATA = \
%D%/packages/patches/mercurial-hg-extension-path.patch \
%D%/packages/patches/mercurial-openssl-compat.patch \
%D%/packages/patches/mesa-opencl-all-targets.patch \
%D%/packages/patches/mesa-fix-sporadic-test-failures.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mia-fix-boost-headers.patch \
%D%/packages/patches/mia-vtk9.patch \
@ -1686,6 +1688,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-telingo-fix-comparison.patch \
%D%/packages/patches/python-typeguard-python3.10.patch \
%D%/packages/patches/python-w3lib-fix-test-failure.patch \
%D%/packages/patches/python-wxwidgets-type-errors.patch \
%D%/packages/patches/scribus-1.5.8-poppler-22.03.0.patch \
%D%/packages/patches/scribus-1.5.8-poppler-22.04.0.patch \
%D%/packages/patches/scribus-1.5.8-poppler-22.09.0.patch \
@ -1804,6 +1807,8 @@ dist_patch_DATA = \
%D%/packages/patches/python-robotframework-atest.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
%D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \
%D%/packages/patches/python-scikit-optimize-1148.patch \
%D%/packages/patches/python-scikit-optimize-1150.patch \
%D%/packages/patches/python-typing-inspect-fix.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \
@ -1823,6 +1828,7 @@ dist_patch_DATA = \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/quilt-grep-compat.patch \
%D%/packages/patches/qtwayland-gcc-11.patch \
%D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \
%D%/packages/patches/qtwayland-cleanup-callbacks.patch \
@ -1860,7 +1866,6 @@ 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-adblock-ignore-live-tests.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 \
@ -1868,6 +1873,7 @@ dist_patch_DATA = \
%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 \
%D%/packages/patches/rw-igraph-0.10.patch \
%D%/packages/patches/sbc-fix-build-non-x86.patch \
@ -1956,7 +1962,6 @@ dist_patch_DATA = \
%D%/packages/patches/tootle-reason-phrase.patch \
%D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transfig-gcc10-fno-common.patch \
%D%/packages/patches/transmission-honor-localedir.patch \
%D%/packages/patches/trytond-add-egg-modules-to-path.patch \
%D%/packages/patches/trytond-add-guix_trytond_path.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \

38
gnu/packages/admin.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
@ -58,6 +58,7 @@
;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2023 Lu Hui <luhux76@gmail.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -375,25 +376,6 @@ interface and is based on GNU Guile.")
(native-inputs (list pkg-config guile-2.2))
(inputs (list guile-2.2 guile2.2-fibers))))
(define-public guile2.0-shepherd
(package
(inherit shepherd)
(name "guile2.0-shepherd")
(native-inputs
(list help2man pkg-config guile-2.0))
(inputs
(list guile-2.0))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; (ice-9 threads) isn't available in guile-2.0
(substitute* "modules/shepherd.scm"
((".*\\(ice-9 threads\\).*") ""))
#t)))
,@(package-arguments shepherd)))))
(define-public cfm
(package
(name "cfm")
@ -2308,7 +2290,9 @@ command.")
(display "CONFIG_LIBNL32=y
CONFIG_IEEE80211R=y
CONFIG_IEEE80211N=y
CONFIG_IEEE80211AC=y\n" port)
CONFIG_IEEE80211AC=y
CONFIG_FULL_DYNAMIC_VLAN=y
CONFIG_ACS=y\n" port)
(close-port port))))
(add-after 'unpack 'patch-pkg-config
(lambda _
@ -4092,20 +4076,20 @@ everyone's screenshots nowadays.")
(license license:gpl3)))
(define-public ufetch
(let ((commit "98b622023e03fe24dbc137e9a68104dfe1fbd04a")
(revision "1"))
(let ((commit "12b68fa35510a063582d626ccd1abc48f301b6b1")
(revision "0"))
(package
(name "ufetch")
(version (git-version "0.2" revision commit))
(version "0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/jschx/ufetch.git")
(commit commit)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"09c4zmikza16xpydinnqbi3hmcibfrrn10wij7j0j1wv1pj2sl2l"))))
"0sv17zmvhp0vfdscs8yras7am10ah7rpfyfia608sx74k845bfyl"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash)
@ -4138,7 +4122,7 @@ everyone's screenshots nowadays.")
(home-page "https://gitlab.com/jschx/ufetch")
(synopsis "Tiny system info")
(description "This package provides a tiny system info utility.")
(license license:isc))))
(license license:expat))))
(define-public pfetch
(let ((commit "e18a0959ab98b963744755ec4687e59dc11db3c5")

3
gnu/packages/animation.scm
View File

@ -83,7 +83,8 @@
`(#:configure-flags
(list
"-Dlog=true"
"-Dtest=true")))
"-Dtest=true"
"-Dcpp_std=gnu++17")))
(native-inputs
(list googletest pkg-config))
(synopsis "Lottie Animation Library")

69
gnu/packages/assembly.scm
View File

@ -37,6 +37,7 @@
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
@ -420,38 +421,48 @@ as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...),
(license license:gpl2)))
(define-public armips
(package
(name "armips")
(version "0.11.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Kingcom/armips")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1c4dhjkvynqn9xm2vcvwzymk7yg8h25alnawkz4z1dnn1z1k3r9g"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
(invoke "./armipstests" "../source/Tests")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "armips" (string-append (assoc-ref outputs "out")
"/bin"))
#t)))))
(home-page "https://github.com/Kingcom/armips")
(synopsis "Assembler for various ARM and MIPS platforms")
(description
"armips is an assembler with full support for the MIPS R3000, MIPS R4000,
(let ((commit "6719edebaae03330ee5441d9b28280672edf00d5")
(revision "1"))
(package
(name "armips")
(version "0.11.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Kingcom/armips")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1a85h2b3r3hy9hm07v8drvkklp4qfdq3i3zwb3cgk011s0njdfvz"))
(modules '((guix build utils)))
(snippet
#~(begin
(substitute* "Core/Types.h"
(("#include <string>" all)
(string-append all "\n"
"#include <string_view>")))))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DARMIPS_USE_STD_FILESYSTEM=ON")
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
(invoke "./armipstests" "../source/Tests")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "armips" (string-append (assoc-ref outputs "out")
"/bin"))
#t)))))
(home-page "https://github.com/Kingcom/armips")
(synopsis "Assembler for various ARM and MIPS platforms")
(description
"armips is an assembler with full support for the MIPS R3000, MIPS R4000,
Allegrex and RSP instruction sets, partial support for the EmotionEngine
instruction set, as well as complete support for the ARM7 and ARM9 instruction
sets, both THUMB and ARM mode.")
(license license:expat)))
(license license:expat))))
(define-public intel-xed
(package

135
gnu/packages/astronomy.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021, 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021-2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@ -41,6 +41,7 @@
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages geo)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@ -1131,13 +1132,13 @@ accurately in real time at any rate desired.")
(define-public python-astropy
(package
(name "python-astropy")
(version "5.2.1")
(version "5.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astropy" version))
(sha256
(base32 "08xc6brs7xwiqchhsjq8l10p6qc5p68cfxps7s889spqfyh2gbpn"))
(base32 "170ddflli35mvhf6pla7aizfw8a7ckq66g1mi1br99dx2r3y7ag6"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1187,21 +1188,33 @@ accurately in real time at any rate desired.")
(invoke "python" "setup.py" "build_ext" "--inplace")
(invoke "python" "-m" "pytest" "--pyargs" "astropy"
;; Skip tests that need remote data.
"-m" "not remote_data")))))))
"-k" (string-append
"not remote_data"
;; XXX: Check why this tests failing.
" and not test_ignore_sigint"
" and not test_parquet_filter"))))))))
(native-inputs
(list pkg-config
python-colorlog
python-coverage
python-cython
python-extension-helpers
python-h5py
python-ipython
python-jplephem
python-objgraph
python-pandas
python-pyarrow
python-pytest
python-pytest-astropy
python-pytest-astropy-header
python-pytest-xdist
python-scikit-image
python-scipy
python-setuptools-scm
python-sgp4
python-skyfield))
python-skyfield
python-timezonefinder))
(inputs
(list cfitsio expat wcslib))
(propagated-inputs
@ -1302,6 +1315,81 @@ astronomy and astrophysics.")
to access online Astronomical data. Each web service has its own sub-package.")
(license license:bsd-3)))
(define-public python-astroscrappy
(package
(name "python-astroscrappy")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astroscrappy" version))
(sha256
(base32 "0shmfilvzpmlwz4fh0bx4kqmzr0y39fgga6vipxb5d1rx1y6q6by"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags #~(list "--pyargs" "astroscrappy")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'preparations
(lambda _ (setenv "HOME" "/tmp")))
(add-before 'install 'writable-compiler
(lambda _ (make-file-writable "astroscrappy/_compiler.c")))
(add-before 'check 'tests-preparation
(lambda _
(make-file-writable "astroscrappy/_compiler.c")
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
(list python-cython
python-extension-helpers
python-h5py
python-pandas
python-pytest-astropy
python-scikit-image
python-scipy
python-setuptools-scm))
(propagated-inputs (list python-astropy python-numpy))
(home-page "https://github.com/astropy/astroscrappy")
(synopsis "Speedy Cosmic Ray Annihilation Package in Python")
(description
"Astro-SCRAPPY is designed to detect cosmic rays in images (numpy
arrays), based on Pieter van Dokkum's L.A.Cosmic algorithm. Much of this was
originally adapted from cosmics.py written by Malte Tewes. This is designed to
be as fast as possible so some of the readability has been sacrificed,
specifically in the C code.")
(license license:bsd-3)))
(define-public python-ccdproc
(package
(name "python-ccdproc")
(version "2.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ccdproc" version))
(sha256
(base32 "0fy1sni87cr05dkljd8wb7vgh7z9agh8wv5kiagxcpbcf8l06jv1"))))
(build-system pyproject-build-system)
(arguments
;; FIXME: Test failed a lot with: DeprecationWarning: distutils Version
;; classes are deprecated. Use packaging.version instead (see:
;; https://github.com/astropy/ccdproc/issues/805).
(list #:tests? #f))
(native-inputs (list python-memory-profiler python-pytest-astropy))
(propagated-inputs
(list python-astropy
python-astroscrappy
python-numpy
python-reproject
python-scikit-image
python-scipy))
(home-page "http://ccdproc.readthedocs.io/")
(synopsis "Basic data reductions of CCD images")
(description "The ccdproc package provides many of the necessary tools for
processing of CCD images built on a framework to provide error propagation and
bad pixel tracking throughout the reduction process.")
(license license:bsd-3)))
(define-public python-cdflib
(package
(name "python-cdflib")
@ -2474,13 +2562,13 @@ Moon position, etc.")
(define-public python-jplephem
(package
(name "python-jplephem")
(version "2.17")
(version "2.18")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jplephem" version))
(sha256
(base32 "09xaibxnwbzzs3x9g3ibqa2la17z3r6in93321glh02dbibfbip1"))))
(base32 "1rgswy52ismij0bkmfqwbml5zikzvzzs1f833dwk0y64lkl12aa9"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -2991,22 +3079,25 @@ default) to world coordinates.")
(define-public python-astroalign
(package
(name "python-astroalign")
(version "2.3.1")
(version "2.4.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astroalign" version))
;; There are no tests in the PyPI tarball.
(method git-fetch)
(uri (git-reference
(url "https://github.com/quatrope/astroalign")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "19qzv3552lgrd9qmj0rxs51wmx485hw04cbf76ds5pin85kfaiy1"))))
(build-system python-build-system)
(arguments
;; TODO: (Sharlatan-20210213T162940+0000): I could not make tests run
`(#:tests? #f))
(inputs
`(("numpy" ,python-numpy)
("scikit-image" ,python-scikit-image)
("scipy" ,python-scipy)
("sep" ,python-sep)))
(base32 "0hly20a65540hr3l1lsd1i4d90a0vdrbwnn6zx3z8s89ha9lq3pb"))))
(build-system pyproject-build-system)
(native-inputs (list python-astropy python-ccdproc python-pillow))
(propagated-inputs
(list python-bottleneck
python-numpy
python-scikit-image
python-scipy
python-sep))
(home-page "https://astroalign.readthedocs.io/")
(synopsis "Astrometric Alignment of Images")
(description
@ -3017,13 +3108,13 @@ astronomical images, especially when there is no WCS information available.")
(define-public python-skyfield
(package
(name "python-skyfield")
(version "1.39")
(version "1.46")
(source
(origin
(method url-fetch)
(uri (pypi-uri "skyfield" version))
(sha256
(base32 "1qh3k7g9dm6idppk87hnwxpx9a22xx98vav0zk31p6291drak3as"))))
(base32 "1r4kpsh1pa4h3diyxy3gyapp0rykfjdqmn5w348a2ck2qkdlx997"))))
(build-system python-build-system)
(arguments
;; NOTE: (Sharlatan-20210207T163305+0000): tests depend on custom test

26
gnu/packages/audio.scm
View File

@ -2316,7 +2316,7 @@ partial release of the General MIDI sound set.")
(define-public guitarix
(package
(name "guitarix")
(version "0.43.1")
(version "0.44.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -2324,14 +2324,14 @@ partial release of the General MIDI sound set.")
version ".tar.xz"))
(sha256
(base32
"1bsjlfd7x09p3iiljilyfbns6hpqn9cgp6psl4ccd6i1lwascfrm"))))
"063cdvrzrpnj08dm22z651hy5cz5bnsywf1z8b2kib2i9xskvs3p"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no "check" target
#:configure-flags
(list
;; Add the output lib directory to the RUNPATH.
(string-append "--ldflags=-Wl,-rpath=" %output "/lib"))))
(list #:tests? #f ; no "check" target
#:configure-flags
#~(list
;; Add the output lib directory to the RUNPATH.
(string-append "--ldflags=-Wl,-rpath=" #$output "/lib"))))
(inputs
(list libsndfile
boost
@ -2349,12 +2349,12 @@ partial release of the General MIDI sound set.")
zita-resampler
zita-convolver))
(native-inputs
`(("gperf" ,gperf)
("faust" ,faust)
("intltool" ,intltool)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("sassc" ,sassc)))
(list gperf
faust
intltool
gettext-minimal
pkg-config
sassc))
(native-search-paths
(list (search-path-specification
(variable "LV2_PATH")

8
gnu/packages/backup.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014, 2015, 2020, 2023 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
@ -480,19 +480,19 @@ errors.")
(define-public rdiff-backup
(package
(name "rdiff-backup")
(version "2.0.5")
(version "2.2.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/rdiff-backup/rdiff-backup/releases/"
"download/v" version "/rdiff-backup-" version ".tar.gz"))
(sha256
(base32 "11rvjcp77zwgkphz1kyf5yqgr3rlss7dm9xzmvpvc4lp99xq7drb"))))
(base32 "1xfvy1xql8zl7rprnaxwya8bp9g7rg8v5pwhr93svhj2594m30cl"))))
(build-system python-build-system)
(native-inputs
(list python-setuptools-scm))
(inputs
(list python librsync))
(list python python-pyaml librsync))
(arguments
`(#:tests? #f)) ; Tests require root/sudo
(home-page "https://rdiff-backup.net/")

2
gnu/packages/base.scm
View File

@ -348,7 +348,7 @@ interactive means to merge two files.")
(("#!/bin/sh")
(string-append "#!" (which "sh")))))))
#:make-flags ,(if (hurd-target?)
''("XFAIL_TESTS=test-perror2")
''("XFAIL_TESTS=test-strerror_r")
''())))
(synopsis "Operating on files matching given criteria")
(description

9
gnu/packages/benchmark.scm
View File

@ -612,13 +612,6 @@ its features are:
(arguments
(list
#:configure-flags #~(list "--with-pgsql"
;; Explicitly specify the library directory of
;; MySQL, otherwise `mysql_config` gets
;; consulted and adds unnecessary link
;; directives.
(string-append "--with-mysql-libs="
#$(this-package-input "mysql")
"/lib")
"--with-system-luajit"
"--with-system-ck"
;; If we let the build tool select the most
@ -659,7 +652,7 @@ its features are:
libxslt
docbook-xml
docbook-xsl))
(inputs (list ck libaio luajit mysql postgresql))
(inputs (list ck libaio luajit (list mariadb "dev") postgresql))
(home-page "https://github.com/akopytov/sysbench/")
(synopsis "Scriptable database and system performance benchmark")
(description "@command{sysbench} is a scriptable multi-threaded benchmark

2468
gnu/packages/bioconductor.scm
View File

File diff suppressed because it is too large Load Diff

338
gnu/packages/bioinformatics.scm
View File

@ -1251,6 +1251,54 @@ Format (GFF) with Biopython integration.")
(modify-inputs (package-propagated-inputs python-bcbio-gff)
(replace "python-biopython" python-biopython-1.73)))))
;; Note: the name on PyPi is "biofluff".
(define-public python-biofluff
(package
(name "python-biofluff")
(version "3.0.4")
;; PyPi tarball does not contain test data.
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/simonvh/fluff")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"12yvhgp72s2ygf3h07rrc852zd6q8swc41hm28mcczpsyprggxyz"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
;; Theses tests require internet access
'(list "--ignore=tests/test_mirror.py"
"-k" "not test_plots_big")
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'matplotlib-compatibility
(lambda _
(substitute* "fluff/plot.py"
(("beginarrow=False, endarrow=True,") "")))))))
(propagated-inputs
(list htseq
python-matplotlib
python-numpy
python-palettable
python-pybedtools
python-pybigwig
python-pysam
python-scikit-learn
python-scipy))
(native-inputs
(list python-pytest))
(home-page "https://github.com/simonvh/fluff/")
(synopsis "Analysis and visualization of high-throughput sequencing data")
(description
"Fluff is a Python package that contains several scripts to produce
pretty, publication-quality figures for next-generation sequencing
experiments.")
(license license:expat)))
(define-public python-cellbender
(package
(name "python-cellbender")
@ -1447,6 +1495,29 @@ protocol. It provides a simple and reliable way to retrieve genomic data from
servers supporting the protocol.")
(license license:asl2.0)))
(define-public python-logomaker
(package
(name "python-logomaker")
(version "0.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "logomaker" version))
(sha256
(base32
"0v9z3ml1s7imk28hqyhrqjqg3sq0j29lx975d36n2ybdgld51iyq"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-matplotlib python-numpy python-pandas))
(home-page "https://logomaker.readthedocs.io")
(synopsis "Package for making Sequence Logos")
(description "Logomaker is a Python package for generating
publication-quality sequence logos. Logomaker can generate both standard and
highly customized logos illustrating the properties of DNA, RNA, or protein
sequences. Logos are rendered as vector graphics embedded within native
matplotlib Axes objects, making them easy to style and incorporate into
multi-panel figures.")
(license license:expat)))
(define-public python-pegasusio
(package
(name "python-pegasusio")
@ -4655,6 +4726,64 @@ variety of diversity measures including those that make use of phylogenetic
similarity of community members.")
(license license:gpl3+)))
(define-public fanc
(let ((commit "354401e52ba2320e6b1ba0d3b5aab3541d31c9f3")
(revision "1"))
(package
(name "fanc")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/vaquerizaslab/fanc.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0vp2cak5snla4j2q23d3ixx016bwzvxfiv4z6yp7anl0xaksd5bl"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list "-m" "not longrunning"
;; XXX: some of the tests here just take forever
"--ignore=fanc/test/test_matrix.py")))
(propagated-inputs
(list python-biopython
python-cooler
python-deprecated
python-future
python-genomic-regions
python-gridmap
python-h5py
python-imageio
python-intervaltree
python-matplotlib
python-msgpack
python-msgpack-numpy
python-numpy
python-pandas
python-pillow
python-progressbar2
python-pybedtools
python-pybigwig
python-pysam
python-pywavelets
python-pyyaml
python-scikit-image
python-scikit-learn
python-scipy
python-seaborn
python-tables
python-tifffile))
(native-inputs
(list python-cython python-pytest))
(home-page "https://github.com/vaquerizaslab/fanc")
(synopsis "Framework for the analysis of C-like data")
(description "FAN-C provides a pipeline for analysing Hi-C data starting
at mapped paired-end sequencing reads.")
(license license:gpl3+))))
(define-public fasttree
(package
(name "fasttree")
@ -5040,6 +5169,63 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).")
;; GPLv3 or later.
(license license:gpl3+)))
(define-public homer
(package
(name "homer")
(version "4.11.1")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "http://homer.ucsd.edu/homer/data/software/homer.v"
version ".zip"))
(sha256
(base32
"0ay802swzq6ix9d8fkinpplcvyc1xyi3cjmj2x08jab7c40cvlc0"))))
(build-system gnu-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(let ((share (string-append #$output "/share/homer")))
(mkdir-p share)
(substitute* "configureHomer.pl"
(("my \\$homeDir = \\$1;")
(string-append "my $homeDir = \"" share "\";"))))))
(replace 'build
(lambda _
(let ((share (string-append #$output "/share/homer")))
(copy-recursively "." share))
(invoke "perl" "configureHomer.pl" "-local")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke (string-append #$output "/share/homer/bin/homer2")))))
(replace 'install
(lambda _
(mkdir-p (string-append #$output "/bin"))
(symlink (string-append #$output "/share/homer/bin/homer2")
(string-append #$output "/bin/homer2"))
(for-each patch-shebang
(find-files (string-append #$output "/share/homer/bin")
"\\.pl$")))))))
(inputs
(list perl))
(native-inputs
(list perl unzip))
(home-page "http://homer.ucsd.edu/homer")
(synopsis "Motif discovery and next generation sequencing analysis")
(description
"HOMER (Hypergeometric Optimization of Motif EnRichment) is a suite of
tools for Motif Discovery and next-gen sequencing analysis. It is a
collection of command line programs written in Perl and C++. HOMER was
primarily written as a de novo motif discovery algorithm and is well suited
for finding 8-20 bp motifs in large scale genomics data. HOMER contains many
useful tools for analyzing ChIP-Seq, GRO-Seq, RNA-Seq, DNase-Seq, Hi-C and
numerous other types of functional genomics sequencing data sets.")
(license license:gpl3+)))
(define-public hmmer
(package
(name "hmmer")
@ -5109,6 +5295,59 @@ HMMs).")
high-throughput sequencing (HTS) assays")
(license license:gpl3+)))
(define-public python-genomepy
(package
(name "python-genomepy")
(version "0.15.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "genomepy" version))
(sha256
(base32
"0jmyvnsn6w0djjmxh4fjspy1346337jzihxb276v3s275r6zjmln"))))
(build-system pyproject-build-system)
(arguments
(list
;; The tests require internet access.
#:tests? #false
#:phases
'(modify-phases %standard-phases
;; Needed by tests
(add-after 'unpack 'set-HOME
(lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs (list python-appdirs
python-biopython
python-click
python-colorama
python-diskcache
;; We cannot use an older filelock, because the
;; @lock annotation is used here.
python-filelock-3.5
python-loguru
python-mygene
python-mysql-connector-python
python-norns
python-numpy
python-pandas
python-pyfaidx
python-requests
python-tqdm))
(native-inputs (list python-hatchling python-pytest))
(home-page "https://vanheeringen-lab.github.io/genomepy/")
(synopsis "Genes and genomes at your fingertips")
(description "genomepy is designed to provide a simple and straightforward
way to download and use genomic data. This includes
@enumerate
@item searching available data,
@item showing the available metadata,
@item automatically downloading, preprocessing and matching data, and
@item generating optional aligner indexes.
@end enumerate
All with sensible, yet controllable defaults.")
(license license:expat)))
(define-public java-htsjdk
(package
(name "java-htsjdk")
@ -7628,19 +7867,17 @@ complexity samples.")
(define-public python-screed
(package
(name "python-screed")
(version "1.0")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "screed" version))
(sha256
(base32
"148vcb7w2wr6a4w6vs2bsxanbqibxfk490zbcbg4m61s8669zdjx"))))
(build-system python-build-system)
(base32 "0slva743xn93h4sl5zg2as4ricnnj5pp6nw9dm4qclk4i9xglkvk"))))
(build-system pyproject-build-system)
(native-inputs
(list python-pytest python-pytest-cov python-pytest-runner))
(inputs
(list python-bz2file))
(list python-pytest-cov
python-pytest-runner))
(home-page "https://github.com/dib-lab/screed/")
(synopsis "Short read sequence database utilities")
(description "Screed parses FASTA and FASTQ files and generates databases.
@ -9267,13 +9504,13 @@ single cell ATAC-seq sequencing data.")
(define-public r-tictoc
(package
(name "r-tictoc")
(version "1.1")
(version "1.2")
(source (origin
(method url-fetch)
(uri (cran-uri "tictoc" version))
(sha256
(base32
"0ka7zd857xfqb5afn0psn0yzfv2qjb0ddxfyiq6aggbnla5qc3qj"))))
"037jbwb58mj5asf3kr6hpf3fy9c6fkinnd8hbpfb141a2jsa8pph"))))
(properties `((upstream-name . "tictoc")))
(build-system r-build-system)
(home-page "https://github.com/jabiru/tictoc")
@ -12279,6 +12516,48 @@ selection of file types and formats for handling genomic region data---all
using the same syntax.")
(license license:expat)))
(define-public python-goatools
(package
(name "python-goatools")
(version "1.3.1")
;; Pypi tarball doesn't include test files.
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tanghaibao/goatools")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0a295zk9jc8kny5vnka63q3gbksins42kcmgvskf8xy7hkca7cmq"))))
(build-system pyproject-build-system)
(arguments
(list
;; Almost all tests require access to the internet.
#:tests? #false
#:test-flags
;; These have syntax errors.
'(list "--ignore=tests/test_i195_sgd_gaf.py"
"--ignore=tests/test_i206.py"
"--ignore=tests/test_setup_dirs.py")))
(propagated-inputs (list python-docopt
python-numpy
python-openpyxl
python-pandas
python-pydot
python-requests
python-scipy
python-statsmodels
python-xlsxwriter))
(native-inputs (list python-pytest))
(home-page "https://github.com/tanghaibao/goatools")
(synopsis "Python scripts to find enrichment of GO terms")
(description "Python scripts to find enrichment of GO terms. In addition,
this package is used for processing the obo-formatted file from Gene Ontology
website. The data structure is a directed acyclic graph that allows easy
traversal from leaf to root.")
(license license:bsd-2)))
(define-public python-loompy
(package
(name "python-loompy")
@ -13261,7 +13540,7 @@ based methods.")
(define-public pigx-sars-cov-2
(package
(name "pigx-sars-cov-2")
(version "0.0.8")
(version "0.0.9")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_sars-cov-2"
@ -13269,7 +13548,7 @@ based methods.")
"/pigx_sars-cov-2-" version ".tar.gz"))
(sha256
(base32
"1yf1y25asnhxz80dajs54wrhr0wyi9fldk7lxsnqrh7gpqp2dvcs"))))
"168hrafgsn165q3hcdn916vlbl0zbzri1lckaqapbrcqk00izxma"))))
(build-system gnu-build-system)
(arguments
(list
@ -14874,17 +15153,32 @@ bgzipped text file that contains a pair of genomic coordinates per line.")
(define-public python-pyfaidx
(package
(name "python-pyfaidx")
(version "0.5.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyfaidx" version))
(sha256
(base32
"038xi3a6zvrxbyyfpp64ka8pcjgsdq4fgw9cl5lpxbvmm1bzzw2q"))))
(build-system python-build-system)
(propagated-inputs
(list python-six))
(version "0.7.2.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "pyfaidx" version))
(sha256
(base32
"182ia2zg026lgphv68agxm9imw7649z9pdhfn8zkalrxkq5d5w1h"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
;; These tests require the download of large fasta.gz files.
'(list "--ignore=tests/test_Fasta_bgzip.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-version
(lambda _
(substitute* "pyproject.toml"
(("dynamic = \\[\"version\"\\]")
(string-append "version = \"" #$version "\""))))))))
(native-inputs
(list python-fsspec
python-mock
python-numpy
python-pytest
python-pytest-cov))
(home-page "http://mattshirley.com")
(synopsis "Random access to fasta subsequences")
(description

95
gnu/packages/bittorrent.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016-2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
@ -81,7 +81,7 @@
(define-public transmission
(package
(name "transmission")
(version "3.00")
(version "4.0.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/transmission/transmission"
@ -89,51 +89,60 @@
version ".tar.xz"))
(sha256
(base32
"1wjmn96zrvmk8j1yz2ysmqd7a2x6ilvnwwapcvfzgxs2wwpnai4i"))
(patches (search-patches "transmission-honor-localedir.patch"))))
(build-system glib-or-gtk-build-system)
"0njlmpcdsxwx8vwdk9dvsby51l6f6awks9d0mgvi9fs2ivaizc5n"))))
(build-system cmake-build-system)
(outputs '("out" ; library and command-line interface
"gui")) ; graphical user interface
(arguments
'(#:configure-flags
(list (string-append "--localedir="
(assoc-ref %outputs "gui")
"/share/locale"))
;; Some tests segfault when using libevent 2.12 without internet
;; connection. This has been reported mainstream but not fixed yet:
;; https://github.com/transmission/transmission/issues/1437.
#:tests? #f
#:glib-or-gtk-wrap-excluded-outputs '("out")
#:phases
(modify-phases %standard-phases
(list
#:imported-modules `((guix build glib-or-gtk-build-system)
,@%cmake-build-system-modules)
#:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build cmake-build-system)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
;; Avoid embedding kernel version for reproducible build
(add-after 'unpack 'remove-kernel-version
(lambda _
(substitute* "third-party/miniupnpc/updateminiupnpcstrings.sh"
(("OS_VERSION=`uname -r`") "OS_VERSION=Guix"))))
(add-after 'install 'move-gui
(lambda* (#:key outputs #:allow-other-keys)
;; Move the GUI to its own output, so that "out" doesn't
;; depend on GTK+.
(let ((out (assoc-ref outputs "out"))
(gui (assoc-ref outputs "gui")))
(mkdir-p (string-append gui "/bin"))
(rename-file (string-append out "/bin/transmission-gtk")
(string-append gui "/bin/transmission-gtk"))
(add-after 'unpack 'remove-kernel-version
(lambda _
(substitute* "third-party/miniupnpc/updateminiupnpcstrings.sh"
(("OS_VERSION=`uname -r`") "OS_VERSION=Guix"))))
(replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(if tests?
;; XXX this test fails...
(invoke "ctest" "-E" "usesBootstrapFile"
"-j" (if parallel-tests?
(number->string (parallel-job-count))
"1"))
(format #t "test suite not run~%"))))
(add-after 'install 'move-gui
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append #$output:gui "/bin"))
(mkdir-p (string-append #$output:gui "/share/man/man1"))
(rename-file (string-append #$output "/bin/transmission-gtk")
(string-append #$output:gui "/bin/transmission-gtk"))
(for-each
(lambda (dir)
(rename-file (string-append out "/share/" dir)
(string-append gui "/share/" dir)))
'("appdata" "applications" "icons" "pixmaps"))
(mkdir-p (string-append gui "/share/man/man1"))
(rename-file
(string-append out "/share/man/man1/transmission-gtk.1")
(string-append gui "/share/man/man1/transmission-gtk.1"))
#t))))))
(inputs
(list libevent curl openssl zlib gtk+ libappindicator))
(rename-file (string-append #$output "/share/" dir)
(string-append #$output:gui "/share/" dir)))
'("applications" "icons" "metainfo" "transmission"))
(rename-file
(string-append #$output "/share/man/man1/transmission-gtk.1")
(string-append #$output:gui "/share/man/man1/transmission-gtk.1"))))
(add-after 'move-gui 'glib-or-gtk-wrap
(lambda* (#:key outputs #:allow-other-keys #:rest args)
(apply (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)
#:glib-or-gtk-wrap-excluded-outputs (list "out")
args))))))
(inputs (list curl
(list glib "bin")
gtkmm
libappindicator
libevent
openssl
python
zlib))
(native-inputs
(list intltool pkg-config))
(home-page "https://transmissionbt.com/")
@ -525,9 +534,7 @@ features.")
python-zope-interface))
(native-inputs
(list intltool python-wheel
(if (string-prefix? "x86_64-" (%current-system))
librsvg
librsvg-2.40)))
(librsvg-for-system)))
;; TODO: Enable tests.
;; After "pytest-twisted" is packaged, HOME is set, and an X server is
;; started, some of the tests still fail. There are likely some tests

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

@ -154,7 +154,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
("re2" ,re2)
("spdlog" ,spdlog-1.10)))
(native-inputs
`(("abseil-cpp" ,abseil-cpp)
`(("abseil-cpp" ,abseil-cpp-cxxstd11)
("googletest" ,googletest)
("openssl" ,openssl)
("pkg-config" ,pkg-config)

4
gnu/packages/certs.scm
View File

@ -131,7 +131,7 @@ that was originally contributed to Debian.")
;; XXX We used to refer to the nss package here, but that eventually caused
;; module cycles. The below is a quick copy-paste job that must be kept in
;; sync manually. Surely there's a better way…?
(version "3.85")
(version "3.88.1")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@ -142,7 +142,7 @@ that was originally contributed to Debian.")
"nss-" version ".tar.gz")))
(sha256
(base32
"15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg"))
"15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"

34
gnu/packages/check.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2015, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017, 2018, 2020, 2021, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016-2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
@ -310,6 +310,7 @@ for C++ 11 and beyond implemented as a single-header library.")
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(patches (search-patches "clitest-grep-compat.patch"))
(sha256
(base32
"1p745mxiq3hgi3ywfljs5sa1psi06awwjxzw0j9c2xx1b09yqv4a"))))
@ -325,13 +326,6 @@ for C++ 11 and beyond implemented as a single-header library.")
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(substitute* "test.md"
;; One test looks for an error from grep in the form "grep: foo",
;; but our grep returns the absolute file name on errors. Adjust
;; the test to cope with that.
(("sed 's/\\^e\\*grep: \\.\\*/")
"sed 's/.*e*grep: .*/"))
(setenv "HOME" "/tmp")
(invoke "./clitest" "test.md"))))
(replace 'install
@ -2471,6 +2465,30 @@ Pytest that runs the mypy static type checker on your source files as part of
a Pytest test execution.")
(license license:expat)))
(define-public python-pytest-mypy-plugins
(package
(name "python-pytest-mypy-plugins")
(version "1.10.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest-mypy-plugins" version))
(sha256
(base32
"05ng29b05gasqj195i9hyyhx5shmwypyvajb7plxwha3g36qq98z"))))
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;there are none
(propagated-inputs (list python-chevron
python-decorator
python-mypy
python-pytest
python-pyyaml
python-regex))
(home-page "https://github.com/TypedDjango/pytest-mypy-plugins")
(synopsis "Pytest plugin for writing tests for mypy plugins")
(description "This package provides a pytest plugin for writing tests for
mypy plugins.")
(license license:expat)))
(define-public python-pytest-pep8
(package
(name "python-pytest-pep8")

42
gnu/packages/chicken.scm
View File

@ -77,6 +77,24 @@ produces portable and efficient C, supports almost all of the R5RS Scheme
language standard, and includes many enhancements and extensions.")
(license license:bsd-3)))
(define-public chicken-compile-file
(package
(name "chicken-compile-file")
(version "1.3")
(source (origin
(method url-fetch)
(uri (egg-uri "compile-file" version))
(sha256
(base32
"1029i5ifr48vb3clvl8n50iq23rzc42szdcsl9320qmj1ksg9y93"))))
(build-system chicken-build-system)
(arguments `(#:egg-name "compile-file"))
(home-page "https://wiki.call-cc.org/egg/compile-file")
(synopsis "Programmatic compiler invocation")
(description "This egg provides a way to do on-the-fly compilation of
source code and load it into the running process.")
(license license:bsd-3)))
(define-public chicken-srfi-1
(package
(name "chicken-srfi-1")
@ -156,6 +174,30 @@ a characters and be compared to other character sets")
(license (license:non-copyleft
"http://wiki.call-cc.org/eggref/5/srfi-14#license"))))
(define-public chicken-srfi-18
(package
(name "chicken-srfi-18")
(version "0.1.6")
(source (origin
(method url-fetch)
(uri (egg-uri "srfi-18" version))
(sha256
(base32
"0v2pkdck0ji1wiqgg8sg4z6rbkj2qw4vy4b9lx0w0pmhlxqpg1xd"))))
(build-system chicken-build-system)
(arguments
`(#:egg-name "srfi-18"))
(native-inputs (list chicken-compile-file))
(home-page "https://wiki.call-cc.org/egg/srfi-18")
(synopsis "Multithreading package, largely following SRFI-18")
(description "The threads implemented in CHICKEN are so called \"green\"
threads, based on first-class continuations. Native threads that map directly
to the threads provided by the operating system are not supported. The
advantage of this is that threads are very lightweight and somewhat larger
degree of determinism. The disadvantage is that execution of Scheme code on
multiple processor cores is not available.")
(license license:bsd-3)))
(define-public chicken-srfi-69
(package
(name "chicken-srfi-69")

87
gnu/packages/chromium.scm
View File

@ -90,11 +90,10 @@
"net/third_party/uri_template" ;ASL2.0
"third_party/abseil-cpp" ;ASL2.0
"third_party/angle" ;BSD-3
"third_party/angle/src/common/third_party/base" ;BSD-3
"third_party/angle/src/common/third_party/smhasher" ;Public domain
"third_party/angle/src/common/third_party/xxhash" ;BSD-2
"third_party/angle/src/third_party/ceval" ;Expat
"third_party/angle/src/third_party/libXNVCtrl" ;Expat
"third_party/angle/src/third_party/trace_event" ;BSD-3
"third_party/angle/src/third_party/systeminfo" ;BSD-2
"third_party/angle/src/third_party/volk" ;Expat
"third_party/apple_apsl" ;APSL2.0
"third_party/axe-core" ;MPL2.0
@ -145,13 +144,16 @@
"third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
"third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
"third_party/devtools-frontend/src/front_end/third_party/lit-html" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/lodash-isequal" ;Expat
"third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
"third_party/devtools-frontend/src/front_end/third_party/puppeteer" ;ASL2.0
"third_party/devtools-frontend/src/front_end/third_party/puppeteer\
/package/lib/esm/third_party/mitt" ;Expat
"third_party/devtools-frontend/src/front_end/third_party\
/vscode.web-custom-data" ;Expat
"third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
"third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
"third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0
"third_party/distributed_point_functions" ;ASL2.0
@ -185,7 +187,6 @@
"third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
"third_party/libaom/source/libaom/third_party/vector" ;Expat
"third_party/libaom/source/libaom/third_party/x86inc" ;ISC
"third_party/libjxl" ;ASL2.0
"third_party/libgav1" ;ASL2.0
"third_party/libjingle_xmpp" ;BSD-3
"third_party/libphonenumber" ;ASL2.0
@ -208,6 +209,7 @@
"third_party/lss" ;BSD-3
"third_party/mako" ;Expat
"third_party/markupsafe" ;BSD-3
"third_party/material_color_utilities" ;ASL2.0
"third_party/mesa_headers" ;Expat, SGI
"third_party/metrics_proto" ;BSD-3
"third_party/minigbm" ;BSD-3
@ -236,7 +238,6 @@
"third_party/private_membership" ;ASL2.0
"third_party/private-join-and-compute" ;ASL2.0
"third_party/protobuf" ;BSD-3
"third_party/protobuf/third_party/six" ;Expat
"third_party/pthreadpool" ;BSD-2
"third_party/pyjson5" ;ASL2.0
"third_party/qcms" ;Expat
@ -273,9 +274,7 @@
"third_party/utf" ;Expat
"third_party/vulkan-deps" ;ASL2.0, BSD-3, Expat
"third_party/vulkan_memory_allocator" ;Expat
"third_party/wayland/src/protocol" ;Expat
"third_party/wayland/stubs" ;BSD-3, Expat
"third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3
"third_party/wayland" ;BSD-3, Expat
"third_party/wayland-protocols" ;Expat
"third_party/web-animations-js" ;ASL2.0
"third_party/webdriver" ;ASL2.0
@ -308,6 +307,7 @@
"v8/src/third_party/siphash" ;Public domain
"v8/src/third_party/utf8-decoder" ;Expat
"v8/src/third_party/valgrind" ;BSD-4
"v8/third_party/glibc/src/sysdeps/ieee754/dbl-64" ;LGPL2.1+
"v8/third_party/inspector_protocol" ;BSD-3
"v8/third_party/v8/builtins")) ;PSFL
@ -317,11 +317,9 @@
;; run the Blink performance tests, just remove everything to save ~70MiB.
'("third_party/blink/perf_tests"))
(define %chromium-version "109.0.5414.119")
(define %chromium-version "112.0.5615.165")
(define %ungoogled-revision (string-append %chromium-version "-1"))
(define %debian-revision "debian/103.0.5060.53-1")
;; This is the first release supporting openjpeg@2.5 in openjpeg.patch;
;; it still includes jsoncpp.patch, which also appears to be needed.
(define %debian-revision "debian/110.0.5481.177-1")
(define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80")
(define %ungoogled-origin
@ -332,7 +330,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256
(base32
"1nb0099gwkhxv3zc184jyvpl5jrrq194pv6yq95nbc27vw6zz7qv"))))
"1q2870z4k2hkn3jh24xc0xiadd1sxc4apn1jz740yzlwsi6jmcgw"))))
(define %debian-origin
(origin
@ -345,7 +343,7 @@
((_ version) version))))
(sha256
(base32
"0bmbp1y0cykcbjhvsk330d11f7qnwmapcwxv76vdbl8cjfb6h60w"))))
"02cvdrr3s3v7v107284n8w9zpdmdl42rgjjvqjdjxb1gyk546kvg"))))
(define (origin-file origin file)
(computed-file
@ -359,7 +357,6 @@
(define %debian-patches
(map debian-patch
'("fixes/clang-and-gcc11.patch"
"system/jsoncpp.patch"
"system/zlib.patch"
"system/openjpeg.patch")))
@ -381,9 +378,7 @@
(define %arch-patches
(list
(arch-patch %arch-revision "disable-GlobalMediaControlsCastStartStop.patch"
"00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz")
(arch-patch %arch-revision "fix-the-way-to-handle-codecs-in-the-system-icu.patch"
"1qy7ldw7lnfbg0dl49m7myrflw0ps80adaisq5dqjndhn0rcbmd5")))
"00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz")))
(define %guix-patches
(list (local-file
@ -467,10 +462,10 @@
(("#if defined\\(OFFICIAL_BUILD\\)")
"#if 0"))
(invoke "python" "build/linux/unbundle/replace_gn_files.py"
"--system-libraries" "ffmpeg" "flac" "fontconfig"
"freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
"libjpeg" "libpng" "libwebp" "libxml" "libxslt"
"openh264" "opus" "re2" "zlib")))))
"--system-libraries" "ffmpeg" "flac" "fontconfig" "freetype"
"harfbuzz-ng" "icu" "jsoncpp" "libdrm" "libevent" "libjpeg"
"libpng" "libwebp" "libxml" "libxslt" "openh264" "opus" "re2"
"zlib")))))
(define opus+custom
(package/inherit opus
@ -496,7 +491,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb"))
"1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)
@ -559,15 +554,10 @@
"use_system_harfbuzz=true"
"use_system_lcms2=true"
"use_system_libdrm=true"
"use_system_libffi=true"
"use_system_libjpeg=true"
"use_system_libopenjpeg2=true"
"use_system_libpng=true"
"use_system_libwayland=true"
"use_system_wayland_scanner=true"
(string-append "system_wayland_scanner_path=\""
(search-input-file %build-inputs
"/bin/wayland-scanner")
"\"")
"use_system_zlib=true"
"use_gnome_keyring=false" ;deprecated by libsecret
@ -698,8 +688,6 @@
(libvulkan.so.1 (search-input-file inputs
"/lib/libvulkan.so.1"))
(icd.d (search-input-directory inputs "share/vulkan/icd.d"))
(mesa-lib (dirname (search-input-file inputs
"/lib/libGL.so.1")))
(gtk-libs '("libgio-2.0.so.0"
"libgdk_pixbuf-2.0.so.0"
"libgdk-3.so.0"
@ -717,20 +705,6 @@
(substitute* "device/udev_linux/udev1_loader.cc"
(("libudev\\.so\\.1") libudev.so.1))
;; Patch libvulkan.so everywhere.
(substitute*
'("third_party/swiftshader/include/vulkan/vulkan.hpp"
"third_party/vulkan-deps/vulkan-tools\
/src/vulkaninfo/vulkaninfo.h"
"third_party/vulkan-deps/vulkan-headers\
/src/include/vulkan/vulkan.hpp"
"content/gpu/gpu_sandbox_hook_linux.cc"
"ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc"
"ui/ozone/platform/drm/gpu/vulkan_implementation_gbm.cc"
"ui/ozone/platform/x11/vulkan_implementation_x11.cc"
"third_party/skia/tools/sk_app/unix\
/DawnVulkanWindowContext_unix.cpp")
(("libvulkan\\.so\\.1") libvulkan.so.1))
(substitute* "content/gpu/gpu_sandbox_hook_linux.cc"
(("/usr/share/vulkan/icd\\.d") icd.d))
@ -739,19 +713,7 @@
(("^([[:blank:]]+)mRuntimeSearchPaths\\.push_back\\(\"\"\\);"
all indent)
(string-append indent "mRuntimeSearchPaths.push_back(\""
(dirname libvulkan.so.1) "/\");\n" all)))
(substitute*
'("ui/ozone/platform/x11/gl_ozone_glx.cc"
"ui/ozone/common/egl_util.cc"
"third_party/angle/src/libANGLE/renderer/gl/glx\
/FunctionsGLX.cpp")
(("libGL\\.so\\.1")
(string-append mesa-lib "/libGL.so.1"))
(("libEGL\\.so\\.1")
(string-append mesa-lib "/libEGL.so.1"))
(("libGLESv2\\.so\\.2")
(string-append mesa-lib "/libGLESv2.so.2"))))))
(dirname libvulkan.so.1) "/\");\n" all))))))
(add-before 'configure 'prepare-build-environment
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((node (search-input-file (or native-inputs inputs)
@ -833,6 +795,8 @@
"chromium/master-preferences.json")))
(gtk (dirname (dirname
(search-input-file inputs "lib/libgtk-3.so"))))
(mesa (dirname (search-input-file inputs "lib/libGL.so")))
(vulkan (dirname (search-input-file inputs "lib/libvulkan.so")))
(xdg-utils (dirname (search-input-file inputs "bin/xdg-open"))))
(substitute* '("chrome/app/resources/manpage.1.in"
@ -870,6 +834,11 @@
(wrap-program exe
;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk "/share")))
;; Provide libGL and libvulkan without patching all references.
;; XXX: How to add on RUNPATH instead of this hack?
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append mesa ":" vulkan)))
;; Ensure xdg-open et al. is found.
`("PATH" ":" prefix (,xdg-utils))))
(with-directory-excursion "chrome/app/theme/chromium"

22
gnu/packages/ci.scm
View File

@ -58,8 +58,8 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass
(let ((commit "1341725f2cbb886e0960c6fad13444e3cfe36c13")
(revision "13"))
(let ((commit "4a8a4bc1f83924c88740b08b14cbfbc089502997")
(revision "15"))
(package
(name "cuirass")
(version (git-version "1.1.0" revision commit))
@ -72,7 +72,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"0l928hd84ky9l4d1nfdkzc4jvghvxia4j6gflliydvfiyfiw87b3"))))
"0s55yx86wqnb543vwbs2kj6bmnzqrvjgj3mafm7vzvfrxrqj3xgi"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)
@ -95,16 +95,6 @@
(call-with-output-file ".tarball-version"
(lambda (port)
(display ,version port)))))
(add-before 'check 'set-PATH-for-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((pg (assoc-ref inputs "ephemeralpg"))
(path (getenv "PATH")))
(setenv "PATH" (string-append pg "/bin:" path)))))
;; Disable the remote tests that require a Guix daemon connection.
(add-before 'check 'disable-remote-tests
(lambda _
(substitute* "Makefile.am"
(("tests/remote.scm") ""))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules.
@ -119,7 +109,7 @@
(fibers (assoc-ref inputs "guile-fibers"))
(zlib (assoc-ref inputs "guile-zlib"))
(matd (assoc-ref inputs "guile-mastodon"))
(tls (assoc-ref inputs "gnutls"))
(tls (assoc-ref inputs "guile-gnutls"))
(mail (assoc-ref inputs "mailutils"))
(guix (assoc-ref inputs "guix"))
(deps (list avahi gcrypt json zmq squee git bytes
@ -152,7 +142,7 @@
(inputs
(list guile-3.0-latest
guile-avahi
guile-fibers
guile-fibers-1.1
guile-gcrypt
guile-json-4
guile-simple-zmq
@ -160,7 +150,7 @@
guile-git
guile-zlib
guile-mastodon
gnutls
guile-gnutls
mailutils
;; FIXME: this is propagated by "guile-git", but it needs to be among
;; the inputs to add it to GUILE_LOAD_PATH.

401
gnu/packages/commencement.scm
View File

@ -2082,9 +2082,7 @@ exec " gcc "/bin/" program
(substitute* "gnulib-tests/Makefile"
(("^XFAIL_TESTS =")
"XFAIL_TESTS = test-fnmatch ")))))
'())))
((#:make-flags flags ''())
''()))))))
'()))))))))
(define file
(package
@ -2259,13 +2257,13 @@ exec " gcc "/bin/" program
((or "i686-linux" "x86_64-linux")
(substitute-keyword-arguments (package-arguments lib)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'workaround-wrapper-bug
;; XXX: The crude gcc-cross-wrapper causes "g++ -v" to
;; fail, which in turn confuses the configure script.
(lambda _
(substitute* "libstdc++-v3/configure"
(("g\\+\\+ -v") "true"))))))))
#~(modify-phases #$phases
(add-after 'unpack 'workaround-wrapper-bug
;; XXX: The crude gcc-cross-wrapper causes "g++ -v" to
;; fail, which in turn confuses the configure script.
(lambda _
(substitute* "libstdc++-v3/configure"
(("g\\+\\+ -v") "true"))))))))
(_ (package-arguments lib)))
;; Explicitly add #:modules so MAKE-LIBSTDC++ can be changed
@ -2292,28 +2290,28 @@ exec " gcc "/bin/" program
,@(substitute-keyword-arguments (package-arguments lib)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'unpack-gmp&co
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref %build-inputs "gmp-source"))
(mpfr (assoc-ref %build-inputs "mpfr-source"))
(mpc (assoc-ref %build-inputs "mpc-source")))
#~(modify-phases #$phases
(add-after 'unpack 'unpack-gmp&co
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref %build-inputs "gmp-source"))
(mpfr (assoc-ref %build-inputs "mpfr-source"))
(mpc (assoc-ref %build-inputs "mpc-source")))
;; To reduce the set of pre-built bootstrap inputs, build
;; GMP & co. from GCC.
(for-each (lambda (source)
(invoke "tar" "xvf" source))
(list gmp mpfr mpc))
;; To reduce the set of pre-built bootstrap inputs, build
;; GMP & co. from GCC.
(for-each (lambda (source)
(invoke "tar" "xvf" source))
(list gmp mpfr mpc))
;; Create symlinks like `gmp' -> `gmp-x.y.z'.
,@(map (lambda (lib)
;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0.
`(symlink ,(string-trim-right
(package-full-name lib "-")
char-set:letter)
,(package-name lib)))
(list gmp-6.0 mpfr mpc))))))))))
;; Create symlinks like `gmp' -> `gmp-x.y.z'.
#$@(map (lambda (lib)
;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0.
#~(symlink #$(string-trim-right
(package-full-name lib "-")
char-set:letter)
#$(package-name lib)))
(list gmp-6.0 mpfr mpc))))))))))
(inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0)))
("mpfr-source" ,(bootstrap-origin (package-source mpfr)))
("mpc-source" ,(bootstrap-origin (package-source mpc)))
@ -2338,81 +2336,82 @@ exec " gcc "/bin/" program
(system* #$(file-append coreutils-boot0 "/bin/rm") "-rf"
"gcc/testsuite/go.test/test/fixedbugs/issue27836.dir"))))))
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
#:modules ((guix build gnu-build-system)
(cons*
#:guile %bootstrap-guile
#:implicit-inputs? #f
#:modules '((guix build gnu-build-system)
(guix build utils)
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-26))
,@(substitute-keyword-arguments (package-arguments gcc)
((#:configure-flags flags)
`(append (list ,(string-append "--target=" (boot-triplet))
(substitute-keyword-arguments (package-arguments gcc)
((#:configure-flags flags)
#~(append (list #$(string-append "--target=" (boot-triplet))
;; No libc yet.
"--without-headers"
;; No libc yet.
"--without-headers"
;; Disable features not needed at this stage.
"--disable-shared"
"--enable-languages=c,c++"
;; Disable features not needed at this stage.
"--disable-shared"
"--enable-languages=c,c++"
;; libstdc++ cannot be built at this stage
;; ("Link tests are not allowed after
;; GCC_NO_EXECUTABLES.").
"--disable-libstdc++-v3"
;; libstdc++ cannot be built at this stage
;; ("Link tests are not allowed after
;; GCC_NO_EXECUTABLES.").
"--disable-libstdc++-v3"
"--disable-threads"
"--disable-libmudflap"
"--disable-libatomic"
"--disable-libsanitizer"
"--disable-libitm"
"--disable-libgomp"
"--disable-libmpx"
"--disable-libcilkrts"
"--disable-libvtv"
"--disable-libssp"
"--disable-libquadmath"
"--disable-decimal-float")
(remove (cut string-match
"--(with-system-zlib|enable-languages.*)" <>)
,flags)))
((#:make-flags flags)
`(let* ((libc (assoc-ref %build-inputs "libc"))
(libc-native (or (assoc-ref %build-inputs "libc-native")
libc)))
`(,(string-append "LDFLAGS="
"-Wl,-rpath=" libc-native "/lib "
"-Wl,-dynamic-linker "
"-Wl," libc-native ,(glibc-dynamic-linker
(match (%current-system)
("x86_64-linux" "i686-linux")
(_ (%current-system))))))))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'unpack-gmp&co
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref %build-inputs "gmp-source"))
(mpfr (assoc-ref %build-inputs "mpfr-source"))
(mpc (assoc-ref %build-inputs "mpc-source")))
"--disable-threads"
"--disable-libmudflap"
"--disable-libatomic"
"--disable-libsanitizer"
"--disable-libitm"
"--disable-libgomp"
"--disable-libmpx"
"--disable-libcilkrts"
"--disable-libvtv"
"--disable-libssp"
"--disable-libquadmath"
"--disable-decimal-float")
(remove (cut string-match
"--(with-system-zlib|enable-languages.*)" <>)
#$flags)))
((#:make-flags flags)
`(let* ((libc (assoc-ref %build-inputs "libc"))
(libc-native (or (assoc-ref %build-inputs "libc-native")
libc)))
`(,(string-append "LDFLAGS="
"-Wl,-rpath=" libc-native "/lib "
"-Wl,-dynamic-linker "
"-Wl," libc-native ,(glibc-dynamic-linker
(match (%current-system)
("x86_64-linux" "i686-linux")
(_ (%current-system))))))))
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'unpack-gmp&co
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref %build-inputs "gmp-source"))
(mpfr (assoc-ref %build-inputs "mpfr-source"))
(mpc (assoc-ref %build-inputs "mpc-source")))
;; To reduce the set of pre-built bootstrap inputs, build
;; GMP & co. from GCC.
(for-each (lambda (source)
(invoke "tar" "xvf" source))
(list gmp mpfr mpc))
;; To reduce the set of pre-built bootstrap inputs, build
;; GMP & co. from GCC.
(for-each (lambda (source)
(invoke "tar" "xvf" source))
(list gmp mpfr mpc))
;; Create symlinks like `gmp' -> `gmp-x.y.z'.
,@(map (lambda (lib)
;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0.
`(symlink ,(string-trim-right
(package-full-name lib "-")
char-set:letter)
,(package-name lib)))
(list gmp-6.0 mpfr mpc)))))
,(match (%current-system)
((or "i686-linux" "x86_64-linux")
'(add-before 'configure 'fix-libcc1
;; Create symlinks like `gmp' -> `gmp-x.y.z'.
#$@(map (lambda (lib)
;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0.
#~(symlink #$(string-trim-right
(package-full-name lib "-")
char-set:letter)
#$(package-name lib)))
(list gmp-6.0 mpfr mpc)))))
#$(match (%current-system)
((or "i686-linux" "x86_64-linux")
#~(add-before 'configure 'fix-libcc1
(lambda* (#:key inputs #:allow-other-keys)
;; libcc1.so NEEDs libgcc_s.so, so provide one here
;; to placate the 'validate-runpath' phase.
@ -2423,18 +2422,18 @@ exec " gcc "/bin/" program
;; XXX: "g++ -v" is broken (see also libstdc++ above).
(substitute* "libcc1/configure"
(("g\\+\\+ -v") "true")))))
(_ '(add-before 'configure 'return-true
(_ #~(add-before 'configure 'return-true
(lambda _ #t))))
(add-after 'install 'symlink-libgcc_eh
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "lib")))
;; Glibc wants to link against libgcc_eh, so provide
;; it.
(with-directory-excursion
(string-append out "/lib/gcc/"
,(boot-triplet)
"/" ,(package-version gcc))
(symlink "libgcc.a" "libgcc_eh.a"))))))))))
(add-after 'install 'symlink-libgcc_eh
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "lib")))
;; Glibc wants to link against libgcc_eh, so provide
;; it.
(with-directory-excursion
(string-append out "/lib/gcc/"
#$(boot-triplet)
"/" #$(package-version gcc))
(symlink "libgcc.a" "libgcc_eh.a"))))))))))
(inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0)))
("mpfr-source" ,(bootstrap-origin (package-source mpfr)))
@ -2452,7 +2451,7 @@ exec " gcc "/bin/" program
,@(alist-delete "libc" (%boot0-inputs))))
;; No need for the native-inputs to build the documentation at this stage.
(native-inputs `())))
(native-inputs '())))
(define perl-boot0
(package
@ -2885,41 +2884,42 @@ that makes it available under the native tool names."
(build-system trivial-build-system)
(outputs '("out"))
(arguments
`(#:guile ,%bootstrap-guile
#:modules ((guix build utils))
#:builder (begin
(use-modules (guix build utils))
(list
#:guile %bootstrap-guile
#:modules '((guix build utils))
#:builder #~(begin
(use-modules (guix build utils))
(let* ((binutils (assoc-ref %build-inputs "binutils"))
(gcc (assoc-ref %build-inputs "gcc"))
(libc (assoc-ref %build-inputs "libc"))
(bash (assoc-ref %build-inputs "bash"))
(out (assoc-ref %outputs "out"))
(bindir (string-append out "/bin"))
(triplet ,(boot-triplet)))
(define (wrap-program program)
;; GCC-BOOT0 is a libc-less cross-compiler, so it
;; needs to be told where to find the crt files and
;; the dynamic linker.
(call-with-output-file program
(lambda (p)
(format p "#!~a/bin/bash
(let* ((binutils (assoc-ref %build-inputs "binutils"))
(gcc (assoc-ref %build-inputs "gcc"))
(libc (assoc-ref %build-inputs "libc"))
(bash (assoc-ref %build-inputs "bash"))
(out (assoc-ref %outputs "out"))
(bindir (string-append out "/bin"))
(triplet #$(boot-triplet)))
(define (wrap-program program)
;; GCC-BOOT0 is a libc-less cross-compiler, so it
;; needs to be told where to find the crt files and
;; the dynamic linker.
(call-with-output-file program
(lambda (p)
(format p "#!~a/bin/bash
exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
bash
gcc triplet program
libc libc
,(glibc-dynamic-linker))))
bash
gcc triplet program
libc libc
#$(glibc-dynamic-linker))))
(chmod program #o555))
(chmod program #o555))
(mkdir-p bindir)
(with-directory-excursion bindir
(for-each (lambda (tool)
(symlink (string-append binutils "/bin/"
triplet "-" tool)
tool))
'("ar" "ranlib"))
(for-each wrap-program '("gcc" "g++")))))))
(mkdir-p bindir)
(with-directory-excursion bindir
(for-each (lambda (tool)
(symlink (string-append binutils "/bin/"
triplet "-" tool)
tool))
'("ar" "ranlib"))
(for-each wrap-program '("gcc" "g++")))))))
(native-inputs
`(("binutils" ,binutils)
("gcc" ,gcc)
@ -3119,79 +3119,80 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(outputs (delete "debug" (package-outputs gcc-boot0)))
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
(cons*
#:guile %bootstrap-guile
#:implicit-inputs? #f
#:allowed-references ("out" "lib" ,zlib-final
#:allowed-references `("out" "lib" ,zlib-final
,glibc-final ,static-bash-for-glibc)
;; Things like libasan.so and libstdc++.so NEED ld.so for some
;; reason, but it is not in their RUNPATH. This is a false
;; positive, so turn it off.
#:validate-runpath? #f
;; Things like libasan.so and libstdc++.so NEED ld.so for some
;; reason, but it is not in their RUNPATH. This is a false
;; positive, so turn it off.
#:validate-runpath? #f
;; Additional modules for the libstdc++ phase below.
#:modules ((srfi srfi-1)
;; Additional modules for the libstdc++ phase below.
#:modules `((srfi srfi-1)
(srfi srfi-26)
,@%gnu-build-system-modules)
,@(substitute-keyword-arguments (package-arguments gcc)
((#:make-flags flags)
;; Since $LIBRARY_PATH is not honored, add the relevant flags.
`(let ((zlib (assoc-ref %build-inputs "zlib")))
(map (lambda (flag)
(if (string-prefix? "LDFLAGS=" flag)
(string-append flag " -L"
(assoc-ref %build-inputs "libstdc++")
"/lib -L" zlib "/lib -Wl,-rpath="
zlib "/lib")
flag))
,flags)))
;; Build again GMP & co. within GCC's build process, because it's hard
;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus
;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'unpack-gmp&co
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref %build-inputs "gmp-source"))
(mpfr (assoc-ref %build-inputs "mpfr-source"))
(mpc (assoc-ref %build-inputs "mpc-source")))
(substitute-keyword-arguments (package-arguments gcc)
((#:make-flags flags)
;; Since $LIBRARY_PATH is not honored, add the relevant flags.
#~(let ((zlib (assoc-ref %build-inputs "zlib")))
(map (lambda (flag)
(if (string-prefix? "LDFLAGS=" flag)
(string-append flag " -L"
(assoc-ref %build-inputs "libstdc++")
"/lib -L" zlib "/lib -Wl,-rpath="
zlib "/lib")
flag))
#$flags)))
;; Build again GMP & co. within GCC's build process, because it's hard
;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus
;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'unpack-gmp&co
(lambda* (#:key inputs #:allow-other-keys)
(let ((gmp (assoc-ref %build-inputs "gmp-source"))
(mpfr (assoc-ref %build-inputs "mpfr-source"))
(mpc (assoc-ref %build-inputs "mpc-source")))
;; To reduce the set of pre-built bootstrap inputs, build
;; GMP & co. from GCC.
(for-each (lambda (source)
(invoke "tar" "xvf" source))
(list gmp mpfr mpc))
;; To reduce the set of pre-built bootstrap inputs, build
;; GMP & co. from GCC.
(for-each (lambda (source)
(invoke "tar" "xvf" source))
(list gmp mpfr mpc))
;; Create symlinks like `gmp' -> `gmp-x.y.z'.
,@(map (lambda (lib)
;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0.
`(symlink ,(string-trim-right
;; Create symlinks like `gmp' -> `gmp-x.y.z'.
#$@(map (lambda (lib)
;; Drop trailing letters, as gmp-6.0.0a unpacks
;; into gmp-6.0.0.
#~(symlink #$(string-trim-right
(package-full-name lib "-")
char-set:letter)
,(package-name lib)))
(list gmp-6.0 mpfr mpc)))))
(add-after 'unpack 'fix-build-with-external-libstdc++
(lambda* (#:key inputs #:allow-other-keys)
(let ((libstdc++ (assoc-ref inputs "libstdc++")))
;; Fix a regression in GCC 11 where the libstc++ input
;; shadows glibc headers when building libstdc++. An
;; upstream fix was added in GCC 11.3.0, but it only
;; hides system include directories, not those on
;; CPLUS_INCLUDE_PATH. See discussion at
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017>.
(substitute* "libstdc++-v3/src/c++17/Makefile.in"
(("AM_CXXFLAGS = ")
(string-append "CPLUS_INCLUDE_PATH = "
(string-join
(remove (cut string-prefix? libstdc++ <>)
(string-split
(getenv "CPLUS_INCLUDE_PATH")
#\:))
":")
"\nAM_CXXFLAGS = ")))))))))))
#$(package-name lib)))
(list gmp-6.0 mpfr mpc)))))
(add-after 'unpack 'fix-build-with-external-libstdc++
(lambda* (#:key inputs #:allow-other-keys)
(let ((libstdc++ (assoc-ref inputs "libstdc++")))
;; Fix a regression in GCC 11 where the libstc++ input
;; shadows glibc headers when building libstdc++. An
;; upstream fix was added in GCC 11.3.0, but it only
;; hides system include directories, not those on
;; CPLUS_INCLUDE_PATH. See discussion at
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017>.
(substitute* "libstdc++-v3/src/c++17/Makefile.in"
(("AM_CXXFLAGS = ")
(string-append "CPLUS_INCLUDE_PATH = "
(string-join
(remove (cut string-prefix? libstdc++ <>)
(string-split
(getenv "CPLUS_INCLUDE_PATH")
#\:))
":")
"\nAM_CXXFLAGS = ")))))))))))
;; This time we want Texinfo, so we get the manual. Add
;; STATIC-BASH-FOR-GLIBC so that it's used in the final shebangs of

536
gnu/packages/cran.scm
View File

File diff suppressed because it is too large Load Diff

1084
gnu/packages/crates-graphics.scm
View File

File diff suppressed because it is too large Load Diff

57
gnu/packages/crates-gtk.scm
View File

@ -1901,37 +1901,6 @@ library.")
"Rust bindings for the PangoCairo library.")
(license license:expat)))
(define-public rust-pangocairo-0.9
(package
(inherit rust-pangocairo-0.15)
(name "rust-pangocairo")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "pangocairo" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0bap3h78hdqdyln58349qjjbcv45m8a0a16c4n9fprdj1my0gldx"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-cairo-rs" ,rust-cairo-rs-0.8)
("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9)
("rust-glib" ,rust-glib-0.9)
("rust-glib-sys" ,rust-glib-sys-0.9)
("rust-gobject-sys" ,rust-gobject-sys-0.9)
("rust-libc" ,rust-libc-0.2)
("rust-pango" ,rust-pango-0.8)
("rust-pango-sys" ,rust-pango-sys-0.9)
("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10)
("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1))
#:cargo-development-inputs
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
(define-public rust-pangocairo-sys-0.15
(package
(name "rust-pangocairo-sys")
@ -1966,32 +1935,6 @@ library.")
(description "This package provides FFI bindings to libgtk-3.")
(license license:expat)))
(define-public rust-pangocairo-sys-0.10
(package
(inherit rust-pangocairo-sys-0.15)
(name "rust-pangocairo-sys")
(version "0.10.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "pangocairo-sys" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1zlyf5vajarnxg5034b8qa5w5zajv96lfvlgiki26svpmcqip4m3"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9)
("rust-glib-sys" ,rust-glib-sys-0.9)
("rust-libc" ,rust-libc-0.2)
("rust-pango-sys" ,rust-pango-sys-0.9)
("rust-pkg-config" ,rust-pkg-config-0.3))
#:cargo-development-inputs
(("rust-shell-words" ,rust-shell-words-0.1)
("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-soup-sys-0.10
(package
(name "rust-soup-sys")

8974
gnu/packages/crates-io.scm
View File

File diff suppressed because it is too large Load Diff

252
gnu/packages/databases.scm
View File

@ -1482,13 +1482,13 @@ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
(define-public python-pymysql
(package
(name "python-pymysql")
(version "0.9.3")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyMySQL" version))
(sha256
(base32 "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q"))))
(base32 "0dmdszskfri11b9m6n3lag31vzi10aqxz9gc583md3gka2ijfsc1"))))
(build-system python-build-system)
(inputs
(list python-cryptography))
@ -3022,14 +3022,14 @@ protocol with Cython for performance.")
(define-public python-aiomysql
(package
(name "python-aiomysql")
(version "0.0.21")
(version "0.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiomysql" version))
(sha256
(base32 "0b442d0jb82z3lk19ylmm64ix88ppz7gay08bxld538ivg06j5c1"))))
(build-system python-build-system)
(base32 "0zhhisf2bz2hv0vcklw45k54yr0f7gx61gnq4lc7vdp6v97nqs0d"))))
(build-system pyproject-build-system)
(arguments '(#:tests? #f)) ;test suite requires docker
(propagated-inputs (list python-pymysql))
(home-page "https://github.com/aio-libs/aiomysql")
@ -3410,14 +3410,14 @@ on localhost.")
(define-public python-sqlalchemy
(package
(name "python-sqlalchemy")
(version "1.4.35")
(version "1.4.42")
(source
(origin
(method url-fetch)
(uri (pypi-uri "SQLAlchemy" version))
(sha256
(base32 "1ddab00d5mpzg25r1qxccma2zb551hhmymsy1ycp6r6w04xq3z1g"))))
(build-system python-build-system)
(base32 "0qzkxy47y06fqh1m7a0p7q2r9h48x9k5kl3znzhx2vj79j8l2zhp"))))
(build-system pyproject-build-system)
(native-inputs
(list python-cython ; for C extensions
python-pytest python-mock python-pytest-xdist)) ; for tests
@ -3425,16 +3425,10 @@ on localhost.")
(list python-greenlet))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv"
"-n" (number->string (parallel-job-count))
;; The memory usage tests are very expensive and run in
;; sequence; skip them.
"-k" "not test_memusage.py")))))))
#:test-flags
'(list ;; The memory usage tests are very expensive and run in sequence;
;; skip them.
"-k" "not test_memusage.py")))
(home-page "https://www.sqlalchemy.org")
(synopsis "Database abstraction library")
(description
@ -3719,27 +3713,28 @@ into Python.")
(define-public python-aiosqlite
(package
(name "python-aiosqlite")
(version "0.17.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiosqlite" version))
(sha256
(base32
"0lgfpbkcd730hbgj3zlrbx2y8fzvdns2zj3s4r4l31n49g1arrph"))))
(build-system python-build-system)
(version "0.18.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/omnilib/aiosqlite")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1a8sggh1wwbpl46k5qcfmp97s9hjysna0x7mwwc53kyfm0m95wf8"))))
(build-system pyproject-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "python" "-m" "unittest" "aiosqlite.tests")
(format #t "test suite not run~%"))
#t)))))
(propagated-inputs
(list python-typing-extensions))
(native-inputs
(list python-aiounittest))
(list #:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "-m" "coverage" "run" "-m"
"aiosqlite.tests")
(invoke "python" "-m" "coverage" "report")))))))
(native-inputs (list python-flit-core
python-coverage
python-mypy))
(home-page "https://github.com/jreese/aiosqlite")
(synopsis
"Asyncio bridge for sqlite3")
@ -3752,13 +3747,13 @@ managers for automatically closing connections.")
(define-public python-databases
(package
(name "python-databases")
(version "0.5.5")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "databases" version))
(sha256
(base32 "0dzb998kg35xmd50ih168320vih2w3ich798r8fc4lf9q4bb1ih2"))))
(base32 "0x5nqhzgjqimv2ybjbzy5vv0l23g0n1g5f6fnyahbf1f7nfl2bga"))))
(build-system python-build-system)
(propagated-inputs
(list python-aiosqlite
@ -3768,8 +3763,9 @@ managers for automatically closing connections.")
python-asyncmy
python-sqlalchemy))
(home-page "https://github.com/encode/databases")
(synopsis "Async database support for Python")
(description "This package implements async database support for Python.")
(synopsis "Asynchronous database abstraction library")
(description "Databases provides a wrapper around asynchronous database
libraries with SQLALchemy.")
(license license:bsd-3)))
(define-public python-psycopg2
@ -4276,7 +4272,7 @@ the SQL language using a syntax that reflects the resulting query.")
(define-public apache-arrow
(package
(name "apache-arrow")
(version "11.0.0")
(version "12.0.0")
(source
(origin
(method git-fetch)
@ -4286,104 +4282,98 @@ the SQL language using a syntax that reflects the resulting query.")
(file-name (git-file-name name version))
(sha256
(base32
"06d3jjxagj5f14j9c48rh63x7pr9f96v69anjnpc6lakr0gkpi1d"))))
"057n3l9bpnfn8fqlqblkdz4w4rkmkr7zrh3adlgfw4nipwmm38zj"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'enter-source-directory
(lambda _ (chdir "cpp")))
(add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cpp/cmake_modules/ThirdpartyToolchain.cmake"
(("set\\(xsimd_SOURCE.*") ""))
(setenv "BOOST_ROOT" (assoc-ref inputs "boost"))
(setenv "BROTLI_HOME" (assoc-ref inputs "brotli"))
(setenv "FLATBUFFERS_HOME" (assoc-ref inputs "flatbuffers"))
(setenv "RAPIDJSON_HOME" (assoc-ref inputs "rapidjson")))))
(list
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'enter-source-directory
(lambda _ (chdir "cpp")))
(add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cpp/cmake_modules/ThirdpartyToolchain.cmake"
(("set\\(xsimd_SOURCE.*") ""))
(setenv "BOOST_ROOT" #$(this-package-input "boost"))
(setenv "BROTLI_HOME" #$(this-package-input "brotli"))
(setenv "FLATBUFFERS_HOME" #$(this-package-input "flatbuffers"))
(setenv "RAPIDJSON_HOME" #$(this-package-input "rapidjson")))))
#:build-type "Release"
#:configure-flags
(list "-DARROW_PYTHON=ON"
"-DARROW_GLOG=ON"
;; Parquet options
"-DARROW_PARQUET=ON"
"-DPARQUET_BUILD_EXECUTABLES=ON"
;; The maintainers disallow using system versions of
;; jemalloc:
;; https://issues.apache.org/jira/browse/ARROW-3507. This
;; is unfortunate because jemalloc increases performance:
;; https://arrow.apache.org/blog/2018/07/20/jemalloc/.
"-DARROW_JEMALLOC=OFF"
#~(list "-DARROW_PYTHON=ON"
"-DARROW_GLOG=ON"
;; Parquet options
"-DARROW_PARQUET=ON"
"-DPARQUET_BUILD_EXECUTABLES=ON"
;; The maintainers disallow using system versions of
;; jemalloc:
;; https://issues.apache.org/jira/browse/ARROW-3507. This
;; is unfortunate because jemalloc increases performance:
;; https://arrow.apache.org/blog/2018/07/20/jemalloc/.
"-DARROW_JEMALLOC=OFF"
;; The CMake option ARROW_DEPENDENCY_SOURCE is a global
;; option that instructs the build system how to resolve
;; each dependency. SYSTEM = Finding the dependency in
;; system paths using CMake's built-in find_package
;; function, or using pkg-config for packages that do not
;; have this feature
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
"-Dxsimd_SOURCE=SYSTEM"
;; The CMake option ARROW_DEPENDENCY_SOURCE is a global
;; option that instructs the build system how to resolve
;; each dependency. SYSTEM = Finding the dependency in
;; system paths using CMake's built-in find_package
;; function, or using pkg-config for packages that do not
;; have this feature
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
"-Dxsimd_SOURCE=SYSTEM"
"-DARROW_RUNTIME_SIMD_LEVEL=NONE"
"-DARROW_SIMD_LEVEL=NONE"
"-DARROW_PACKAGE_KIND=Guix"
"-DARROW_RUNTIME_SIMD_LEVEL=NONE"
"-DARROW_SIMD_LEVEL=NONE"
"-DARROW_PACKAGE_KIND=Guix"
;; Split output into its component packages.
(string-append "-DCMAKE_INSTALL_PREFIX="
(assoc-ref %outputs "lib"))
(string-append "-DCMAKE_INSTALL_RPATH="
(assoc-ref %outputs "lib")
"/lib")
(string-append "-DCMAKE_INSTALL_BINDIR="
(assoc-ref %outputs "out")
"/bin")
(string-append "-DCMAKE_INSTALL_INCLUDEDIR="
(assoc-ref %outputs "include")
"/share/include")
;; Split output into its component packages.
(string-append "-DCMAKE_INSTALL_PREFIX=" #$output:lib)
(string-append "-DCMAKE_INSTALL_RPATH=" #$output:lib "/lib")
(string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin")
(string-append "-DCMAKE_INSTALL_INCLUDEDIR=" #$output:include
"/share/include")
"-DARROW_WITH_SNAPPY=ON"
"-DARROW_WITH_ZLIB=ON"
"-DARROW_WITH_ZSTD=ON"
"-DARROW_WITH_LZ4=ON"
"-DARROW_COMPUTE=ON"
"-DARROW_CSV=ON"
"-DARROW_DATASET=ON"
"-DARROW_FILESYSTEM=ON"
"-DARROW_HDFS=ON"
"-DARROW_JSON=ON"
;; Arrow Python C++ integration library (required for
;; building pyarrow). This library must be built against
;; the same Python version for which you are building
;; pyarrow. NumPy must also be installed. Enabling this
;; option also enables ARROW_COMPUTE, ARROW_CSV,
;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and
;; ARROW_JSON.
"-DARROW_PYTHON=ON"
"-DARROW_WITH_SNAPPY=ON"
"-DARROW_WITH_ZLIB=ON"
"-DARROW_WITH_ZSTD=ON"
"-DARROW_WITH_LZ4=ON"
"-DARROW_COMPUTE=ON"
"-DARROW_CSV=ON"
"-DARROW_DATASET=ON"
"-DARROW_FILESYSTEM=ON"
"-DARROW_HDFS=ON"
"-DARROW_JSON=ON"
;; Arrow Python C++ integration library (required for
;; building pyarrow). This library must be built against
;; the same Python version for which you are building
;; pyarrow. NumPy must also be installed. Enabling this
;; option also enables ARROW_COMPUTE, ARROW_CSV,
;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and
;; ARROW_JSON.
"-DARROW_PYTHON=ON"
;; Building the tests forces on all the
;; optional features and the use of static
;; libraries.
"-DARROW_BUILD_TESTS=OFF"
"-DBENCHMARK_ENABLE_GTEST_TESTS=OFF"
;;"-DBENCHMARK_ENABLE_TESTING=OFF"
"-DARROW_BUILD_STATIC=OFF")))
;; Building the tests forces on all the
;; optional features and the use of static
;; libraries.
"-DARROW_BUILD_TESTS=OFF"
"-DBENCHMARK_ENABLE_GTEST_TESTS=OFF"
;;"-DBENCHMARK_ENABLE_TESTING=OFF"
"-DARROW_BUILD_STATIC=OFF")))
(inputs
`(("boost" ,boost)
("brotli" ,brotli)
("bzip2" ,bzip2)
("double-conversion" ,double-conversion)
("gflags" ,gflags)
("glog" ,glog)
("grpc" ,grpc)
("protobuf" ,protobuf)
("python-3" ,python)
("python-numpy" ,python-numpy)
("rapidjson" ,rapidjson)
("re2" ,re2)
("snappy" ,snappy)
("xsimd" ,xsimd)))
(list boost
brotli
bzip2
double-conversion
gflags
glog
grpc
protobuf
python
python-numpy
rapidjson
re2
snappy
xsimd))
;; These are all listed under Requires.private in arrow.pc
(propagated-inputs
(list `(,apache-thrift "lib") lz4 utf8proc zlib

4
gnu/packages/datastructures.scm
View File

@ -359,7 +359,7 @@ equivalent succinct data structure are (most of the time) identical.")
(define-public tllist
(package
(name "tllist")
(version "1.0.5")
(version "1.1.0")
(home-page "https://codeberg.org/dnkl/tllist")
(source (origin
(method git-fetch)
@ -367,7 +367,7 @@ equivalent succinct data structure are (most of the time) identical.")
(file-name (git-file-name name version))
(sha256
(base32
"061mkg6hc9x89zya3bw18ymxlzd8fbhjipxpva8x01lh2vp1d4f0"))))
"03296h1w0rnsj87490cgy007axngyg1v8w3z5nvm6x5gcs6b8rg1"))))
(build-system meson-build-system)
(synopsis "Typed link list for C")
(description

8
gnu/packages/debian.scm
View File

@ -47,7 +47,7 @@
(define-public debian-archive-keyring
(package
(name "debian-archive-keyring")
(version "2021.1.1")
(version "2023.3")
(source
(origin
(method git-fetch)
@ -57,7 +57,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"0dcmv7y1k6j3a646kr0rkd2a0c4j2wrz868bh8j9zjx1npzns73q"))))
"1x0hsgfq08c53ws5llkhr1jqwr6yr0sccy5w9pz3p1dzbgfv2wd5"))))
(build-system gnu-build-system)
(arguments
'(#:test-target "verify-results"
@ -271,7 +271,7 @@ unpacking them into a directory which can eventually be chrooted into.")
(define-public debianutils
(package
(name "debianutils")
(version "5.5-1")
(version "5.7-0.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -280,7 +280,7 @@ unpacking them into a directory which can eventually be chrooted into.")
(file-name (git-file-name "debianutils" version))
(sha256
(base32
"1sbdjcb44g2s1zxjf9kxrp9drf9mmh6b49a9z3k428gmc6zsci4r"))))
"0hw407fm5ylsf28b0vrwz7rm2r2rsgfwzajbkbn6n2b6kqhdjyy9"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake gettext-minimal po4a))

8
gnu/packages/display-managers.scm
View File

@ -475,13 +475,17 @@ GTK+, lets you select a desktop session and log in to it.")
;; The build system's logic here is: if "Linux", then
;; "systemd". Strip that.
""))
#t)))
#t))
(add-before 'configure 'fix-0-pointer-comparison
(lambda _
(substitute* "panel.cpp"
(("WinGC < 0") "WinGC == NULL")))))
#:configure-flags '("-DUSE_PAM=yes"
"-DUSE_CONSOLEKIT=no")
#:tests? #f))
;; This used to be at <http://slim.berlios.de/>.
(home-page "https://sourceforge.net/projects/slim.berlios/")
(home-page "https://github.com/iwamatsu/slim")
(synopsis "Desktop-independent graphical login manager for X11")
(description
"SLiM is a Desktop-independent graphical login manager for X11, derived

5
gnu/packages/distributed.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2019 Brant Gardner <brantcgardner@brantware.com>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Eric Bavier <bavier@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -44,7 +45,7 @@
(define-public boinc-client
(package
(name "boinc-client")
(version "7.16.17")
(version "7.22.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -55,7 +56,7 @@
(file-name (git-file-name "boinc" version))
(sha256
(base32
"1p8y3mnf5yfhavhqxwf9v68prg1601h8q1pllm5z89zh661di3mj"))))
"0af7j6zg3saa5x7lfsg41p7j9r1d1dsdsz5b241p1f2yrhba0m81"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("--disable-server")))
(inputs (list openssl

10
gnu/packages/django.scm
View File

@ -800,14 +800,14 @@ entries, photos, book chapters, or anything else.")
(define-public python-django-pipeline
(package
(name "python-django-pipeline")
(version "2.0.5")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-pipeline" version))
(sha256
(base32
"19vrbd5s12qw4qlg5n8ldv7zz2rs5y2sdid1i7lvgp92m71dayvc"))))
"194j8xihx5yr1yfrssdy6nxmx8yc999pz2ai9lg83l7izmbcx9in"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -823,8 +823,10 @@ entries, photos, book chapters, or anything else.")
(setenv "DJANGO_SETTINGS_MODULE" "tests.settings")
(invoke "django-admin" "test" "tests"
"--pythonpath=.")))))))
(propagated-inputs
(list python-css-html-js-minify python-django python-slimit
(native-inputs
(list python-django
python-setuptools-scm
python-css-html-js-minify
python-jsmin))
(home-page
"https://github.com/jazzband/django-pipeline")

306
gnu/packages/emacs-xyz.scm
View File

@ -127,6 +127,8 @@
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2022-2023 Simon Josefsson <simon@josefsson.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -259,6 +261,7 @@
#:use-module (gnu packages erlang)
#:use-module (gnu packages statistics)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages web-browsers)
#:use-module (gnu packages wget)
#:use-module (guix utils)
@ -734,10 +737,10 @@ configuration language which makes it trivial to write your own themes.")
(license license:gpl3+)))
(define-public emacs-inspector
(let ((commit "0b2cf2f00a827f06bda717da8250eafec4108fb3")) ;version bump
(let ((commit "c328475aa433a39dd08702ff7daf5941a3a3efde")) ;version bump
(package
(name "emacs-inspector")
(version "0.28")
(version "0.29")
(source
(origin
(uri (git-reference
@ -745,7 +748,7 @@ configuration language which makes it trivial to write your own themes.")
(commit commit)))
(method git-fetch)
(sha256
(base32 "1l5dwcacz9y3qrsg8xjycr835vjjfssbzzx2nns91hyssb10hmkx"))
(base32 "0c9r8gk3ivrd9lpzjnf254ymmfnh4jnr1dcsbr0zmxrrpfsq3mym"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@ -3357,6 +3360,69 @@ defined in RFC 2425 and RFC 2426 to/from The Insidious Big Brother Database
(BBDB). Version 2.1 vCards are converted into version 3.0 on import.")
(license license:gpl2+))))
(define-public emacs-eweouz
(package
(name "emacs-eweouz")
(version "0.12")
(source
(origin
(method url-fetch)
;; README's git://git.err.no/eweouz is gone
(uri (string-append "mirror://debian/pool/main/e/eweouz/"
"eweouz_" version ".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"192zl3dyphhvcrvn65bqsrc4h6zks8b747lp6pqbpbmsqy4g4mr8"))))
(build-system gnu-build-system)
(arguments
(list
#:modules '((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules `(,@%gnu-build-system-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
#~(list (string-append "--with-lispdir="
(emacs:elpa-directory #$output)))
#:phases
#~(modify-phases %standard-phases
(replace 'bootstrap
(lambda _ (invoke "autoreconf" "-vif")))
(add-after 'compress-documentation 'enter-lisp-dir
(lambda _ (chdir "lisp/")))
(add-after 'enter-lisp-dir 'emacs-patch-variables
(lambda _
(emacs-substitute-sexps "eweouz.el"
("eweouz-helper-dirs"
`(list ,(string-append #$output "/libexec/eweouz"))))))
(add-after 'emacs-patch-variables 'emacs-expand-load-path
(assoc-ref emacs:%standard-phases 'expand-load-path))
(add-after 'emacs-expand-load-path 'emacs-add-install-to-native-load-path
(assoc-ref emacs:%standard-phases 'add-install-to-native-load-path))
(add-after 'emacs-add-install-to-native-load-path 'emacs-install
(assoc-ref emacs:%standard-phases 'install))
(add-after 'emacs-install 'emacs-build
(assoc-ref emacs:%standard-phases 'build))
(add-after 'emacs-install 'emacs-make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads)))))
(native-inputs
(list autoconf
automake
emacs-minimal
pkg-config))
(inputs
(list evolution-data-server))
(home-page "https://tracker.debian.org/pkg/eweouz")
(synopsis "Emacs interface to Evolution Data Server")
(description
"Eweouz is an tool for looking up contacts from Evolution Data Server
from Emacs. It is similar to BBDB, except much, much simpler.")
;; Most things are GPLv2-only although lisp/vcard.el is GPLv2+.
(license (list license:gpl2 license:gpl2+))))
(define-public emacs-beacon
(package
(name "emacs-beacon")
@ -11859,35 +11925,30 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled
@code{yas-minor-mode} first).")
(license license:gpl3+))))
;; The 0.1.6 release is incompatible with newer ivy versions, so we instead
;; pick a more recent snapshot of the repository, see
;; https://github.com/Yevgnen/ivy-rich/pull/80.
(define-public emacs-ivy-rich
(let ((commit "600b8183ed0be8668dcc548cc2c8cb94b001363b")
(revision "2"))
(package
(name "emacs-ivy-rich")
(version (git-version "0.1.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Yevgnen/ivy-rich")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1dv6vr7fv32v5m04zdy02sdajpvrnpc4i3pbh2dwfv73ff8d8yxm"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-ivy))
(home-page "https://github.com/Yevgnen/ivy-rich")
(synopsis "More friendly interface for @code{ivy}")
(description
"This package extends Ivy by showing more information in the minibuffer
(package
(name "emacs-ivy-rich")
(version "0.1.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Yevgnen/ivy-rich")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0fn3v6221750hk6hs5rrrr894d53ibgj3yza9rismmj321xwbrh5"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-ivy))
(home-page "https://github.com/Yevgnen/ivy-rich")
(synopsis "More friendly interface for @code{ivy}")
(description
"This package extends Ivy by showing more information in the minibuffer
for each candidate. It adds columns showing buffer modes, file sizes,
docstrings, etc. If @code{emacs-all-the-icons} is installed, it can show
icons as well.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-avy
(package
@ -12837,7 +12898,7 @@ an Emacs buffer.")
"0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx"))))
(build-system emacs-build-system)
(inputs
(list node))
(list node-lts))
(native-inputs
(list emacs-ert-expectations))
(arguments
@ -15359,7 +15420,7 @@ passive voice.")
(define-public emacs-org
(package
(name "emacs-org")
(version "9.6.4")
(version "9.6.5")
(source
(origin
(method git-fetch)
@ -15368,7 +15429,7 @@ passive voice.")
(commit (string-append "release_" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0n285p8az9386jdfixv8bzkjx5agdfyfg9a122nnk1km15j53xdj"))))
(base32 "1dpqds0cx56va8cpvvhiqi116h7c4msfqxzvhnamm99ab4ccck1a"))))
(build-system emacs-build-system)
(arguments
(list
@ -16071,8 +16132,7 @@ structure, or any other pattern.")
(lambda* (#:key inputs #:allow-other-keys)
(let ((ffplay (search-input-file inputs "/bin/ffplay")))
(substitute* "tmr.el"
(("\"ffplay ")
(string-append "\"" ffplay " "))))
(("\"ffplay") (string-append "\"" ffplay))))
(emacs-substitute-variables "tmr.el"
("tmr-sound-file"
(search-input-file
@ -18275,7 +18335,7 @@ Emacs.")
(define-public emacs-eglot
(package
(name "emacs-eglot")
(version "1.14")
(version "1.15")
(source
(origin
(method url-fetch)
@ -18283,7 +18343,7 @@ Emacs.")
".tar"))
(sha256
(base32
"0aw28gdx90k87czxf436r9bva58bal55cdnp90ga36c89wzdjznj"))))
"05brq76xbdkbhbn572n0hyz80lwc3ly5waaqsaan5l1apxgl6ww7"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-external-completion
@ -21765,16 +21825,18 @@ timestamps by providing a @code{ts} struct.")
(list
#:tests? #t
#:test-command
#~(list "emacs" "--batch"
#~(list "emacs" "-Q" "--batch"
"-l" "test.el"
"--eval" "(ert-run-tests-batch-and-exit test-order)")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'skip-failing-test
;; XXX: Skip known (to upstream) failing test.
;; XXX: Skip known (to upstream) failing tests.
(lambda _
(substitute* "test.el"
(("\\(ert-deftest test-circadian-sunrise-sunset .*" all)
(string-append all " (skip-unless nil)"))
(("\\(ert-deftest test-circadian-setup-benchmark .*" all)
(string-append all " (skip-unless nil)"))))))))
(native-inputs
(list emacs-el-mock))
@ -23048,20 +23110,32 @@ expansions for debugging with Edebug as normal.")
(license license:gpl3+)))
(define-public emacs-lacarte
(package
(name "emacs-lacarte")
(version "0.1")
(source (origin
(method url-fetch)
(uri "https://www.emacswiki.org/emacs/download/lacarte.el")
(sha256
(base32
"1sbmk37ljq5j7dsw5c37sbxvlfgdqswh7bi4dknyjzfxlq50f4am"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/lacarte.el")
(synopsis "Execute menu items as commands, with completion")
(description "Execute menu items as commands, with completion.")
(license license:gpl3)))
(let ((commit "79afc5d2406dae5aabc1c12089e8e2e1990abd85")
(revision "1"))
(package
(name "emacs-lacarte")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacsmirror/lacarte")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0g9r7cp1y6b7ldcls8fdblwf79hharcf2lfgz737pff68qhv9c3l"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/lacarte.el")
(synopsis "Execute menu items as commands, with completion")
(description "La Carte lets you execute menu-bar menu commands from the
keyboard, with completion.
Use the keyboard to access any menu item, without knowing where it is or what
its full name is. Type part of its name and use completion to get the rest:
the complete path and item name. When you choose a menu-item candidate, the
corresponding command is executed.")
(license license:gpl3+))))
(define-public emacs-latex-preview-pane
(let ((commit "5297668a89996b50b2b62f99cba01cc544dbed2e")
@ -26308,26 +26382,29 @@ show it; if it's not, we want to hide whatever fold the cursor is in.")
(license license:gpl2+))))
(define-public emacs-markup-faces
(package
(name "emacs-markup-faces")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://stable.melpa.org/packages/markup-faces-"
version ".el"))
(sha256
(base32
"124dxbaa25fwxnpwsygpz7pw6da6dnnw7y2lic3jf8rgz7lw4v32"))))
(build-system emacs-build-system)
(home-page "https://github.com/sensorflo/markup-faces")
(synopsis "Collection of Emacs faces for markup language modes")
(description "emacs-markup-faces is like font-lock-faces, but tailored for
markup languages instead programming languages. The sub group markup-faces-text
is also intended for 'text viewing modes' such as info or (wo)man. This gives a
common look and feel, or let's say theme, across different markup language modes
and 'text viewing modes' respectively.")
(license license:gpl3+)))
(let ((commit "98a807ed82473eb41c6a201ed7ef816d6bcd67b0"))
(package
(name "emacs-markup-faces")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sensorflo/markup-faces")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27"))))
(build-system emacs-build-system)
(home-page "https://github.com/sensorflo/markup-faces")
(synopsis "Collection of Emacs faces for markup language modes")
(description "Markup Faces is like @code{font-lock-faces}, but tailored
for markup languages instead programming languages. The sub-group
@code{markup-faces-text} is also intended for text viewing modes such as Info
or Woman. This gives a common look and feel across different markup language
modes and text viewing modes respectively.")
(license license:gpl3+))))
(define-public emacs-adoc-mode
(package
@ -27720,27 +27797,40 @@ leader key in vim), and much more.")
(license license:gpl3+))))
(define-public emacs-tldr
(let ((commit "7203d1be3dcbf12131846ffe06601933fa874d74"))
(let ((commit "1b09d2032491d3904bd7ee9bf5ba7c7503db6593")
(revision "2"))
(package
(name "emacs-tldr")
(version (git-version "0" "1" commit))
(home-page "https://github.com/kuanyui/tldr.el")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append home-page ".git"))
(url "https://github.com/kuanyui/tldr.el")
(commit commit)))
(sha256
(base32
"1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk"))
"0qdv5yhvs4mnb4lszglhli80pv1436mknbap9qrm9riixfg6zlvv"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-unzip-location
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "tldr.el"
(("\"unzip")
(string-append "\""
(search-input-file inputs "/bin/unzip")))))))))
(inputs
(list unzip))
(propagated-inputs
(list emacs-request))
(home-page "https://github.com/kuanyui/tldr.el")
(synopsis "Simplified and community-driven man pages for Emacs")
(description "@code{emacs-tldr} allows the user to access tldr pages
from within emacs. The @code{tldr} pages are a community effort to simplify
the man pages with practical examples.")
(description "Tldr allows the user to access @code{tldr} pages from
within Emacs. The @code{tldr} pages are a community effort to simplify the
man pages with practical examples.")
(license license:wtfpl2))))
(define-public emacs-window-layout
@ -30685,14 +30775,14 @@ well as an option for visually flashing evaluated s-expressions.")
(define-public emacs-tramp
(package
(name "emacs-tramp")
(version "2.6.0.3")
(version "2.6.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"tramp-" version ".tar"))
(sha256
(base32 "0hcm20qk62k9irqdfcb44js9jkff43fji07la33arnjqvswrqs6n"))))
(base32 "0s50zgxxhlc2k80mnxyyqcfd1iij9dz95fryb2a65chy1ccibd0m"))))
(build-system emacs-build-system)
(arguments
(list
@ -35880,6 +35970,40 @@ It includes syntax highlighting, automatic indentation, and imenu integration.
Unlike Emacs' generic ASM mode, it understands NASM-specific syntax.")
(license license:unlicense)))
(define-public emacs-riscv-mode
(let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
(revision "1"))
(package
(name "emacs-riscv-mode")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AdamNiederer/riscv-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
(build-system emacs-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'hardcode-spike
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "riscv-mode.el"
("riscv-interpreter"
(search-input-file inputs "/bin/spike"))))))))
(inputs (list spike))
(home-page "https://github.com/AdamNiederer/riscv-mode")
(synopsis "Emacs major mode for RISC-V assembly")
(description
"RISC-V mode is a major mode for editing RISC-V assembly programs.
It includes syntax highlighting, syntactic indentation and code evaluation
with spike.")
(license license:gpl3+))))
(define-public emacs-validate-html
;; XXX: Upstream did not tag commits yet. However, commit below matches the
;; last version bump. Version is extracted from the keyword in main file.
@ -36135,22 +36259,6 @@ audio volume via amixer.")
Fennel code within Emacs.")
(license license:gpl3+))))
(define-public emacs-gerbil-mode
(package
(inherit gerbil)
(name "emacs-gerbil-mode")
(version "1.0")
(build-system emacs-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-before 'install 'change-directory
(lambda _
(chdir "etc"))))))
(synopsis "Emacs major-mode for editing Gerbil code")
(description
"Gerbil mode provides font-lock, indentation, navigation, and REPL for
Gerbil code within Emacs.")))
(define-public emacs-org-modern
(package
(name "emacs-org-modern")
@ -36268,7 +36376,7 @@ hacker.")
(define-public emacs-osm
(package
(name "emacs-osm")
(version "0.11")
(version "0.12")
(source (origin
(method git-fetch)
(uri (git-reference
@ -36277,7 +36385,7 @@ hacker.")
(file-name (git-file-name name version))
(sha256
(base32
"1g4scrk7cgdlfyfaycq0576p5kiycy2jsq3iigppz7iky3xiqa9c"))))
"1wfk8r0szav8hipq0apaix2f83kmxcrmgvykb30acgap9rjs357b"))))
(build-system emacs-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases

19
gnu/packages/emacs.scm
View File

@ -13,7 +13,7 @@
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu>
@ -345,9 +345,7 @@
;; must also provide zlib as an input.
libpng
zlib
(if (target-x86-64?)
librsvg
librsvg-2.40)
(librsvg-for-system)
libxpm
libxml2
libice
@ -461,6 +459,19 @@ languages.")
(description "This Emacs build implements graphical UI purely in terms
of GTK and supports tree-sitter.")))
(define-public emacs-next-pgtk-xwidgets
(package
(inherit emacs-next-pgtk)
(name "emacs-next-pgtk-xwidgets")
(synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support")
(arguments
(substitute-keyword-arguments (package-arguments emacs-next-pgtk)
((#:configure-flags flags #~'())
#~(cons "--with-xwidgets" #$flags))))
(inputs
(modify-inputs (package-inputs emacs-next-pgtk)
(prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
(define-public emacs-minimal
;; This is the version that you should use as an input to packages that just
;; need to byte-compile .el files.

46
gnu/packages/emulators.scm
View File

@ -2274,7 +2274,7 @@ framework based on QEMU.")
(define-public ppsspp
(package
(name "ppsspp")
(version "1.12.3")
(version "1.14.4")
(source
(origin
(method git-fetch)
@ -2282,7 +2282,7 @@ framework based on QEMU.")
(url "https://github.com/hrydgard/ppsspp")
(commit (string-append "v" version))))
(sha256
(base32 "1p6pmp0lhqhk9h5r9xsjicd0zn08bwx3y8533npps96ixwbm2y15"))
(base32 "1l80zs1khph4a3g3hnh91awafmyy6wdcayb81xnflkzmpv3bwq8i"))
(file-name (git-file-name name version))
(patches
(search-patches "ppsspp-disable-upgrade-and-gold.patch"))
@ -2314,10 +2314,8 @@ framework based on QEMU.")
(substitute* "CMakeLists.txt"
;; Drop unnecessary includes and targets.
(("include_directories\\(ext/glslang\\)") "")
(("include_directories\\(ext/xxhash\\)") "")
(("include_directories\\(ext/cityhash\\)") "")
(("include_directories\\(ext/zstd.*") "")
(("libzstd_static") "zstd")
(("target_include_directories\\(.*ext/xxhash\\)") "")
(("target_include_directories\\(.*ext/cityhash\\)") "")
(("set_target_properties\\(cityhash .*\\)") "")
;; Fix linking to GLEW.
(("TARGET Ext::GLEW") "true")
@ -2384,9 +2382,11 @@ elseif(FALSE)"))
(arguments
(list
#:out-of-source? #f
#:configure-flags #~(list "-DUSE_DISCORD=OFF"
#:configure-flags #~(list "-DARMIPS_USE_STD_FILESYSTEM=ON" ; from armips
"-DUSE_DISCORD=OFF"
"-DUSE_SYSTEM_FFMPEG=ON"
"-DUSE_SYSTEM_LIBZIP=ON"
"-DUSE_SYSTEM_ZSTD=ON"
;; for testing
"-DUNITTEST=ON" "-DHEADLESS=ON")
#:phases
@ -2394,37 +2394,7 @@ elseif(FALSE)"))
(add-after 'unpack 'add-external-sources
(lambda* (#:key inputs #:allow-other-keys)
;; TODO: unbundle armips.
(copy-recursively #$(package-source armips) "ext/armips")
;; Some tests are externalised, so we add them here.
(copy-recursively
#$(let ((commit "1047400eaec6bcbdb2a64d326375ef6a6617c4ac"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/pspautotests")
(commit commit)))
(sha256
(base32 "0nxv1lskcr8zbg6nrfai21mxsw0n5vaqhbsa41c3cxfyx5c4w2pg"))
(file-name (git-file-name "pspautotests" commit))))
"pspautotests")))
(add-after 'unpack 'fix-unittest-build
(lambda _
(substitute* "CMakeLists.txt"
(("unittest/TestVertexJit.cpp" all)
(string-append all " unittest/TestShaderGenerators.cpp")))
(substitute* "unittest/TestVertexJit.cpp"
(("#include \"unittest/UnitTest.h\"" all)
(string-append all "\n#include <cmath>")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(for-each
(lambda (t) (invoke "./unitTest" t))
'("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin"
"SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit"
"MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ"
#|"ShaderGenerators"|#))
(invoke "python3" "test.py" "-g"))))
(copy-recursively #$(package-source armips) "ext/armips")))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))

6
gnu/packages/engineering.scm
View File

@ -4164,9 +4164,11 @@ form, numpad.
;; <https://github.com/rizinorg/rizin/issues/2905>.
(substitute* "test/meson.build"
(("subdir\\('integration'\\)") ""))
;;; Skip analysis_var test, which is failing.
;;; Skip failing tests.
(substitute* "test/unit/meson.build"
(("'analysis_var',\n") "")))))))
(("'analysis_var',\n") "")
(("'bin_mach0',\n") "")
(("'hash',\n") "")))))))
(native-inputs (list pkg-config))
(inputs
(list capstone file libuv libzip lz4 openssl tree-sitter xxhash zlib libmspack))

16
gnu/packages/fcitx.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,6 +29,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system qt)
#:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
@ -128,10 +130,18 @@
(mkdir-p (string-append doc "/share/presage"))
(rename-file
(string-append out "/share/presage/html")
(string-append doc "/share/presage/html"))
#t))))))
(string-append doc "/share/presage/html")))))
(add-after 'unpack 'update-config-scripts
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(for-each (lambda (file)
(install-file
(search-input-file
(or native-inputs inputs)
(string-append "/bin/" file)) "."))
'("config.guess" "config.sub")))))))
(native-inputs
`(("dot" ,graphviz)
`(("config" ,config)
("dot" ,graphviz)
("doxygen" ,doxygen)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")

6
gnu/packages/file-systems.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
;;; Copyright © 2021 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2021, 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2022 Brian Cully <bjc@spork.org>
;;;
;;; This file is part of GNU Guix.
@ -1364,7 +1364,7 @@ with the included @command{xfstests-check} helper.")
(define-public zfs
(package
(name "zfs")
(version "2.1.9")
(version "2.1.11")
(outputs '("out" "module" "src"))
(source
(origin
@ -1373,7 +1373,7 @@ with the included @command{xfstests-check} helper.")
"/download/zfs-" version
"/zfs-" version ".tar.gz"))
(sha256
(base32 "1xjhzqi4jqc3mdps93w4b5f0qhy16fmhz44gsvy1fkmm5vgjq5vb"))))
(base32 "1cnfv3adk7prl6b8r3nw62y6dbjy2q7ai68p9xc0g8nhaklf8kx5"))))
(build-system linux-module-build-system)
(arguments
(list

24
gnu/packages/fontutils.scm
View File

@ -148,22 +148,16 @@ them as it goes.")
(define-public python-afdko
(package
(name "python-afdko")
(version "3.9.4")
(version "3.9.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "afdko" version))
(sha256
(base32 "1d3b1590gxlindh1sjhwvxnryn5zil98hgdwbgsr76fd657r3f99"))
(base32 "02c1rjx7ggbd1m9vqgsc2r28yiw66cjgvs5cq1a2fz0lkadbvrnb"))
(modules '((guix build utils)))
(snippet
#~(begin
(substitute*
"tests/buildcff2vf_data/expected_output/SHSansJPVFTest.ttx"
;; Adjust expected output to match newer fonttools. Taken from:
;; https://github.com/adobe-type-tools/afdko/commit/7c526390a10e
(("FDSelect format=\"3\"")
"FDSelect format=\"0\""))
(with-directory-excursion "c/makeotf/lib/hotconv"
;; Delete ANTLR-generated code.
(for-each delete-file
@ -223,17 +217,7 @@ them as it goes.")
(when tests?
(setenv "HOME" "/tmp")
(invoke "pytest" "-vv" "--dist" "loadfile" "-n"
(number->string (parallel-job-count))
;; This test is known to fail on multiple architectures.
;; https://github.com/adobe-type-tools/afdko/issues/1163
"-k"
(string-append
"not test_type1mm_inputs "
;; These tests fail for unknown reasons (see:
;; https://github.com/adobe-type-tools/afdko/issues/1635).
"and not test_rvrn_vf "
"and not test_cjk_vf "
"and not test_sparse_cjk_vf")))))
(number->string (parallel-job-count))))))
(add-after 'check 'wrap
(assoc-ref %standard-phases 'wrap))
(add-before 'wrap 'wrap-PATH
@ -808,10 +792,8 @@ suite of the @code{psautohint} package.")
(inputs (list python-fonttools))
(native-inputs
(list psautohint-font-data
python-fs
python-pytest
python-pytest-cov
python-pytest-randomly
python-pytest-xdist
python-setuptools-scm
python-wheel))

73
gnu/packages/games.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2014-2022 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014-2023 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
;;; Copyright © 2014, 2015, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
@ -3739,11 +3739,11 @@ for common mesh file formats, and collision detection.")
;; The latest release on SourceForge relies on an unreleased version of SFML
;; with a different API, so we take the latest version from the official
;; repository on Github.
(let ((commit "c855d044094a1d92317e38935d81ba938946132e")
(revision "1"))
(let ((commit "84664cda094efe6e49d9b1550e4f4f98c33eefa2")
(revision "2"))
(package
(name "mars")
(version (string-append "0.7.5." revision "." (string-take commit 7) ))
(version (git-version "0.7.5" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -3752,31 +3752,24 @@ for common mesh file formats, and collision detection.")
(file-name (git-file-name name version))
(sha256
(base32
"1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"))
(patches (search-patches "mars-sfml-2.3.patch"
"mars-install.patch"))))
"0bdi4ja39rark742qvqixm8khai5k8qd84z5kzim9jcjdvvwyqj9"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; There are no tests
#:configure-flags (list (string-append "-Dmars_EXE_DEST_DIR="
%output "/bin"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-install-path
(lambda _
(substitute* "src/CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_PREFIX\\}/games")
"${CMAKE_INSTALL_PREFIX}/bin"))
#t))
(add-after 'unpack 'fix-data-path
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "src/System/settings.cpp"
(("C_dataPath = \"./data/\";")
(string-append "C_dataPath = \""
(assoc-ref outputs "out")
"/share/games/marsshooter/\";")))
#t)))))
"/share/games/marsshooter/\";"))))))))
(inputs
(list mesa fribidi taglib sfml))
(home-page "http://mars-game.sourceforge.net/")
(home-page "https://mars-game.sourceforge.net/")
(synopsis "2D space shooter")
(description
"M.A.R.S. is a 2D space shooter with pretty visual effects and
@ -4538,14 +4531,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
(define openttd-engine
(package
(name "openttd-engine")
(version "13.0")
(version "13.1")
(source
(origin (method url-fetch)
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
version "/openttd-" version "-source.tar.xz"))
(sha256
(base32
"0rxbsymfirkw2d9hn2lmi8yhlfx7qvpzhy7y7b48fw42w3hgi79k"))))
"1fsq1azddk1l11w89r93mgmhna34kvarfak7xy2q48rmf39j5psy"))))
(build-system cmake-build-system)
(inputs
(list allegro
@ -4958,7 +4951,7 @@ logging, so games can be viewed again.")
(define-public pinball
(package
(name "pinball")
(version "0.3.20201218")
(version "0.3.20230219")
(source
(origin (method git-fetch)
(uri (git-reference
@ -4967,7 +4960,7 @@ logging, so games can be viewed again.")
(file-name (git-file-name name version))
(sha256
(base32
"056jk98v6zlkrj9vjm06p0pmpnav1x658n6qw10v5klg5gr6ldf7"))
"02by4df9hgda5zhl9p3rwg0s4mlxdr0v8f8dk152vjp43p1wqvfp"))
(patches (search-patches "pinball-system-ltdl.patch"))))
(build-system gnu-build-system)
(native-inputs
@ -4976,27 +4969,23 @@ logging, so games can be viewed again.")
(list glu
libltdl
mesa
sdl
sdl-image
sdl-mixer))
(sdl-union (list sdl2 sdl2-image sdl2-mixer))))
(arguments
'(#:configure-flags
;; Configure tries to use pkg-config, but falls short, so:
(list (string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "sdl-image")
"/include/SDL -I"
(assoc-ref %build-inputs "sdl-mixer")
"/include/SDL"))
#:phases
(modify-phases %standard-phases
(replace 'bootstrap
;; The `bootstrap` script tries to call a script with
;; `/usr/bin/make` in the shebang, but ultimately does the same as
;; autoreconf would do, so just use that.
(lambda _
(symlink "README.md" "README")
(display (which "autoreconf")) (newline)
(invoke "autoreconf" "-vif"))))))
(list
#:configure-flags
;; Configure tries to use pkg-config, but falls short, so:
#~(list (string-append "CPPFLAGS=-I"
#$(this-package-input "sdl-union")
"/include/SDL2"))
#:phases
#~(modify-phases %standard-phases
(replace 'bootstrap
;; The `bootstrap` script tries to call a script with
;; `/usr/bin/make` in the shebang, but ultimately does the same as
;; autoreconf would do, so just use that.
(lambda _
(symlink "README.md" "README")
(invoke "autoreconf" "-vif"))))))
(home-page "https://pinball.sourceforge.net")
(synopsis "Pinball simulator")
(description "The Emilia Pinball Project is a pinball simulator. There
@ -7057,7 +7046,7 @@ at their peak of economic growth and military prowess.
(define-public open-adventure
(package
(name "open-adventure")
(version "1.15")
(version "1.16")
(source
(origin
(method git-fetch)
@ -7066,7 +7055,7 @@ at their peak of economic growth and military prowess.
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0gair1dfqgzjzvsasisv2szh3wgy8pfgmpxpisybn6svn294yzhf"))))
(base32 "0spciwqcyldalzdd813zwigbldcnyaxi7kfslq1yp0fg4c4a10aa"))))
(build-system gnu-build-system)
(arguments
(list

156
gnu/packages/gcc.scm
View File

@ -556,17 +556,17 @@ Go. It also includes runtime support libraries for these languages.")
,@(package-inputs gcc-4.7)))))
(define %gcc-7.5-aarch64-micro-architectures
;; Suitable '-march' values for GCC 7.5.
;; Suitable '-march' values for GCC 7.5 (info "(gcc) AArch64 Options").
;; TODO: Allow dynamically adding feature flags.
'("armv8-a" "armv8.1-a" "armv8.2-a" "armv8.3-a"))
(define %gcc-7.5-armhf-micro-architectures
;; Suitable '-march' values for GCC 7.5.
;; Suitable '-march' values for GCC 7.5 (info "(gcc) ARM Options").
;; TODO: Allow dynamically adding feature flags.
'("armv7" "armv7-a" "armv7-m" "armv7-r" "armv7e-m" "armv7ve"
"armv8-a" "armv8-a+crc" "armv8.1-a" "armv8.1-a+crc"
"armv8-m.base" "armv8-m.main" "armv8-m.main+dsp"
"iwmmxt" "iwmmxt2"))
"iwmmxt" "iwmmxt2" "armv8.2-a"))
(define %gcc-7.5-x86_64-micro-architectures
;; Suitable '-march' values for GCC 7.5 (info "(gcc) x86 Options").
@ -589,7 +589,7 @@ Go. It also includes runtime support libraries for these languages.")
;; Suitable '-march' values for GCC 10.
;; TODO: Allow dynamically adding feature flags.
(append %gcc-7.5-armhf-micro-architectures
'("armv8.2-a" "armv8.3-a" "armv8.4-a" "armv8.5-a" "armv8.6-a"
'("armv8.3-a" "armv8.4-a" "armv8.5-a" "armv8.6-a"
"armv8-r" "armv8.1-m.main")))
(define %gcc-10-x86_64-micro-architectures
@ -603,7 +603,8 @@ Go. It also includes runtime support libraries for these languages.")
(define %gcc-11-aarch64-micro-architectures
;; Suitable '-march' values for GCC 11.
%gcc-10-aarch64-micro-architectures) ;unchanged
(append %gcc-10-aarch64-micro-architectures
'("armv8-r")))
(define %gcc-11-armhf-micro-architectures
%gcc-10-armhf-micro-architectures)
@ -615,6 +616,31 @@ Go. It also includes runtime support libraries for these languages.")
"btver1" "btver2"))) ;AMD
;; Suitable '-march' values for GCC 12.
(define %gcc-12-aarch64-micro-architectures
(append %gcc-11-aarch64-micro-architectures
'("armv8.7-a" "armv8.8-a" "armv9-a")))
(define %gcc-12-armhf-micro-architectures
(append %gcc-11-armhf-micro-architectures
'("armv9-a")))
(define %gcc-12-x86_64-micro-architectures
(append %gcc-11-x86_64-micro-architectures
'("znver4"))) ;AMD
;; Suitable '-march' values for GCC 13.
(define %gcc-13-aarch64-micro-architectures
(append %gcc-12-aarch64-micro-architectures
'("armv9.1-a" "armv9.2-a" "armv9.3-a")))
(define %gcc-13-armhf-micro-architectures
%gcc-12-armhf-micro-architectures)
(define %gcc-13-x86_64-micro-architectures
(append %gcc-12-x86_64-micro-architectures
'("graniterapids"))) ;Intel
(define-public gcc-7
(package
(inherit gcc-6)
@ -735,19 +761,24 @@ It also includes runtime support libraries for these languages.")
(define-public gcc-12
(package
(inherit gcc-11)
;; Note: 'compiler-cpu-architectures' is unchanged compared to GCC 11.
(version "12.2.0")
(version "12.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
"1zrhca90c7hqnjz3jgr1vl675q3h5lrd92b5ggi00jjryffcyjg5"))
"0fwcvbgpmjdfj5drfs8k6bkqsmxmz8pv4cmmjcd451p7k57mv6ll"))
(patches (search-patches "gcc-12-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))
(modules '((guix build utils)))
(snippet gcc-canadian-cross-objdump-snippet)))))
(snippet gcc-canadian-cross-objdump-snippet)))
(properties
`((compiler-cpu-architectures
("aarch64" ,@%gcc-12-aarch64-micro-architectures)
("armhf" ,@%gcc-12-armhf-micro-architectures)
("x86_64" ,@%gcc-12-x86_64-micro-architectures))
,@(package-properties gcc-11)))))
;; Note: When changing the default gcc version, update
@ -861,62 +892,63 @@ using compilers other than GCC."
(inherit gcc)
(name "libstdc++")
(arguments
`(#:out-of-source? #t
#:modules ((srfi srfi-1)
(list
#:out-of-source? #t
#:modules `((srfi srfi-1)
(srfi srfi-26)
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
,@(if (version>=? (package-version gcc) "11")
`((add-after 'unpack 'hide-gcc-headers
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gcc (assoc-ref (or native-inputs inputs)
,(if (%current-target-system)
"cross-gcc"
"gcc"))))
;; Fix a regression in GCC 11 where the GCC headers
;; shadows glibc headers when building libstdc++. An
;; upstream fix was added in GCC 11.3.0, but it only
;; hides system include directories, not those on
;; CPLUS_INCLUDE_PATH. See discussion at
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017>
;; and the similar adjustment in GCC-FINAL.
(substitute* "libstdc++-v3/src/c++17/Makefile.in"
(("AM_CXXFLAGS = ")
(string-append ,(if (%current-target-system)
"CROSS_CPLUS_INCLUDE_PATH = "
"CPLUS_INCLUDE_PATH = ")
(string-join
(remove (cut string-prefix? gcc <>)
(string-split
(getenv
,(if (%current-target-system)
"CROSS_CPLUS_INCLUDE_PATH"
"CPLUS_INCLUDE_PATH"))
#\:))
":")
"\nAM_CXXFLAGS = ")))))))
'())
,@(let ((version (package-version gcc)))
(if (and (target-ppc64le?)
(version>=? version "11")
(not (version>=? version "12")))
`((add-after 'unpack 'patch-powerpc
(lambda* (#:key inputs #:allow-other-keys)
(invoke "patch" "--force" "-p1" "-i"
(assoc-ref inputs "powerpc64le-patch")))))
'()))
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
(add-before 'chdir 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib")))))
(add-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3"))))
#:phases
#~(modify-phases %standard-phases
#$@(if (version>=? (package-version gcc) "11")
#~((add-after 'unpack 'hide-gcc-headers
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gcc (assoc-ref (or native-inputs inputs)
#$(if (%current-target-system)
"cross-gcc"
"gcc"))))
;; Fix a regression in GCC 11 where the GCC headers
;; shadows glibc headers when building libstdc++. An
;; upstream fix was added in GCC 11.3.0, but it only
;; hides system include directories, not those on
;; CPLUS_INCLUDE_PATH. See discussion at
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017>
;; and the similar adjustment in GCC-FINAL.
(substitute* "libstdc++-v3/src/c++17/Makefile.in"
(("AM_CXXFLAGS = ")
(string-append #$(if (%current-target-system)
"CROSS_CPLUS_INCLUDE_PATH = "
"CPLUS_INCLUDE_PATH = ")
(string-join
(remove (cut string-prefix? gcc <>)
(string-split
(getenv
#$(if (%current-target-system)
"CROSS_CPLUS_INCLUDE_PATH"
"CPLUS_INCLUDE_PATH"))
#\:))
":")
"\nAM_CXXFLAGS = ")))))))
'())
#$@(let ((version (package-version gcc)))
(if (and (target-ppc64le?)
(version>=? version "11")
(not (version>=? version "12")))
#~((add-after 'unpack 'patch-powerpc
(lambda* (#:key inputs #:allow-other-keys)
(invoke "patch" "--force" "-p1" "-i"
(assoc-ref inputs "powerpc64le-patch")))))
'()))
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
(add-before 'chdir 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib")))))
(add-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3"))))
#:configure-flags `("--disable-libstdcxx-pch"
#:configure-flags '`("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")
"/include"))))

28
gnu/packages/gdb.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2019, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -45,17 +45,19 @@
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (srfi srfi-1))
(define-public gdb-11
(define-public gdb/pinned
;; This is the fixed version that packages depend on. Update it rarely
;; enough to avoid massive rebuilds.
(package
(name "gdb")
(version "11.1")
(version "12.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz"))
(sha256
(base32
"151z6d0265hv9cgx9zqqa4bd6vbp20hrljhd6bxl7lr0gd0crkyc"))))
"1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf"))))
(build-system gnu-build-system)
(outputs '("out" "debug"))
(arguments
@ -140,15 +142,12 @@ doing while it runs or what it was doing just before a crash. It allows you
to specify the runtime conditions, to define breakpoints, and to change how
the program is running to try to fix bugs. It can be used to debug programs
written in C, C++, Ada, Objective-C, Pascal and more.")
(license gpl3+)
;; GDB 11 now fails to build on GNU/Hurd (undefined references to process
;; RPC stubs).
(supported-systems (fold delete %supported-systems %hurd-systems))))
(properties `((hidden? . #t)))
(license gpl3+)))
(define-public gdb-12
(package
(inherit gdb-11)
(inherit gdb/pinned)
(version "12.1")
(source (origin
(method url-fetch)
@ -157,14 +156,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
(sha256
(base32
"1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf"))))
;; GDB 12 builds fine on GNU/Hurd.
(supported-systems %supported-systems)))
(define-public gdb/pinned
;; This is the fixed version that packages depend on. Update it rarely
;; enough to avoid massive rebuilds.
gdb-11)
(properties '())))
(define-public gdb
;; The "default" version.

127
gnu/packages/geo.scm
View File

@ -14,7 +14,7 @@
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2020, 2021, 2022, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021, 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org>
@ -38,6 +38,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages geo)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system ant)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
@ -47,12 +48,11 @@
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix svn-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
@ -89,9 +89,9 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-apps)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages java)
#:use-module (gnu packages kde)
#:use-module (gnu packages libusb)
@ -118,8 +118,8 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
#:use-module (gnu packages speech)
#:use-module (gnu packages swig)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
@ -227,6 +227,121 @@ data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more
than 600 operators available.")
(license license:bsd-3)))
(define-public h3
(package
(name "h3")
(version "4.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber/h3")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0x764xzna8ka6yhgv2y4hb158a61y3g9a6835qckqp7wfkpqvb7f"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
(home-page "https://h3geo.org/")
(synopsis "Hexagonal hierarchical geospatial indexing system")
(description "H3 is a geospatial indexing system using a hexagonal grid
that can be (approximately) subdivided into finer and finer hexagonal grids,
combining the benefits of a hexagonal grid with S2's hierarchical
subdivisions.")
(license license:asl2.0)))
;; For python-timezonefinder, remove it when it starts supporting newer
;; version.
(define-public h3-3
(package
(inherit h3)
(name "h3")
(version "3.7.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber/h3")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0bvsljfxmjvl23v9gxykc4aynjzh5xfy3wg02bxad7cknr1amx9j"))))))
(define-public python-h3
(package
(name "python-h3")
(version "4.0.0b2")
(source
(origin
(method git-fetch) ; no tests data in PyPi package
(uri (git-reference
(url "https://github.com/uber/h3-py")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1k1n256hhlh05gjcj64pqh08zlaz6962jkb6nk1aazsgg8p41zs0"))
(modules '((guix build utils)))
;; Remove bundeled H3 lib.
(snippet #~(begin (delete-file-recursively "src/h3lib")))))
(build-system pyproject-build-system)
(arguments
(list
;; FIXME: Check why these tests are failing.
;; test_versions - assert (4, 1) == (4, 0)
;; test_resolution - h3._cy.error_system.H3Failed
#:test-flags #~(list "-k" (string-append
"not test_versions"
" and not test_resolution"))
#:phases
#~(modify-phases %standard-phases
;; Use packaged in Guix h3 source.
(add-after 'unpack 'patch-cmakelists
(lambda _
(substitute* "CMakeLists.txt"
(("add_subdirectory\\(src/h3lib\\)")
(string-append
"include_directories(" #$(this-package-input "h3")
"/include/h3)\n"
"link_directories(" #$(this-package-input "h3")
"/lib)\n"))
((".*CMAKE_CURRENT_BINARY_DIR.*")
(string-append #$(this-package-input "h3")
"/include/h3/h3api.h\n"))))))))
(native-inputs
(list cmake-minimal
python-cython
python-numpy
python-pytest
python-scikit-build
python-setuptools-scm))
(inputs (list h3))
(home-page "https://uber.github.io/h3-py")
(synopsis "Python bindings for H3")
(description "This package provides a Python bindings for H3, a
hierarchical hexagonal geospatial indexing system")
(license license:asl2.0)))
;; For python-timezonefinder, remove it when it starts supporting newer
;; version.
(define-public python-h3-3
(package
(inherit python-h3)
(name "python-h3")
(version "3.7.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber/h3-py")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "16gxa1sivghxw179rik87r918mjasars2qkzidlwq83qfa4axn20"))))
(inputs
(modify-inputs (package-inputs python-h3)
(replace "h3" h3-3)))))
(define-public memphis
(package
(name "memphis")

6
gnu/packages/gimp.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016-2018, 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
@ -261,7 +261,7 @@ provided, as well as a framework to add new color models and data types.")
("libnsgif" ,libnsgif)
("libpng" ,libpng)
("libraw" ,libraw)
("librsvg" ,librsvg)
("librsvg" ,(librsvg-for-system))
("libspiro" ,libspiro)
("libtiff" ,libtiff)
("libwebp" ,libwebp)
@ -350,7 +350,7 @@ buffers.")
lcms ;optional, color management
libheif ;optional, HEIF + AVIF support
libmng ;optional, MNG support
librsvg ;optional, SVG support
(librsvg-for-system) ;optional, SVG support
libxcursor ;optional, Mouse Cursor support
openexr-2 ;optional, EXR support
openjpeg ;optional, JPEG 2000 support

91
gnu/packages/gl.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -266,21 +267,17 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
(package
(name "mesa")
(version "22.2.4")
(version "23.0.3")
(source
(origin
(method url-fetch)
(uri (list (string-append "https://mesa.freedesktop.org/archive/"
(uri (list (string-append "https://archive.mesa3d.org/"
"mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
"mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
version "/mesa-" version ".tar.xz")))
"mesa-" version ".tar.xz")))
(sha256
(base32
"1azpr68pdg63yq3igmzwsgn2ypg49m0mp3hfkq0lcyswr99npmv5"))
(patches
(list (search-patch "mesa-fix-sporadic-test-failures.patch")))))
"1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq"))))
(build-system meson-build-system)
(propagated-inputs
;; The following are in the Requires.private field of gl.pc.
@ -314,8 +311,10 @@ also known as DXTn or DXTC) for Mesa.")
(@ (gnu packages base) which)))
(outputs '("out" "bin"))
(arguments
`(#:configure-flags
'(,@(match (%current-system)
(list
#:configure-flags
#~(list
#$@(match (%current-system)
("aarch64-linux"
;; TODO: Fix svga driver for non-Intel architectures.
'("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\
@ -327,7 +326,7 @@ r300,r600,swrast,tegra,v3d,vc4,virgl"))
((or "powerpc64le-linux" "powerpc-linux" "riscv64-linux")
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl"))
(_
'("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,\
'("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\
svga,swrast,virgl")))
;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio
@ -344,7 +343,7 @@ svga,swrast,virgl")))
"-Dshared-glapi=enabled"
;; Explicitly enable Vulkan on some architectures.
,@(match (%current-system)
#$@(match (%current-system)
((or "i686-linux" "x86_64-linux")
'("-Dvulkan-drivers=intel,amd"))
((or "powerpc64le-linux" "powerpc-linux")
@ -359,6 +358,10 @@ svga,swrast,virgl")))
;; Enable the Vulkan overlay layer on all architectures.
"-Dvulkan-layers=device-select,overlay"
;; Enable the codecs that were built by default as part of the
;; 21.3.x releases to avoid functionality regressions.
"-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc"
;; Also enable the tests.
"-Dbuild-tests=true"
@ -368,12 +371,12 @@ svga,swrast,virgl")))
;; documentation recommends using 'release' for performance anyway.
#:build-type "release"
#:modules ((ice-9 match)
(srfi srfi-1)
(guix build utils)
(guix build meson-build-system))
#:modules '((ice-9 match)
(srfi srfi-1)
(guix build utils)
(guix build meson-build-system))
#:phases
(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-test
(lambda _
;; Disable the intel vulkan (anv_state_pool) tests, as they may
@ -382,7 +385,7 @@ svga,swrast,virgl")))
(substitute* "src/intel/vulkan/meson.build"
(("if with_tests")
"if false"))
,@(match (%current-system)
#$@(match (%current-system)
("riscv64-linux"
;; According to the test logs the llvm JIT is not designed
;; for this architecture and the llvmpipe tests all segfault.
@ -427,8 +430,8 @@ svga,swrast,virgl")))
(_
'((display "No tests to disable on this architecture.\n"))))))
(add-before 'configure 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(lambda _
(let ((out #$output))
;; Remain agnostic to .so.X.Y.Z versions while doing
;; the substitutions so we're future-safe.
(substitute* "src/glx/meson.build"
@ -445,9 +448,9 @@ svga,swrast,virgl")))
(("\"gbm_dri\\.so")
(string-append "\"" out "/lib/dri/gbm_dri.so"))))))
(add-after 'install 'split-outputs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(bin (assoc-ref outputs "bin")))
(lambda _
(let ((out #$output)
(bin #$output:bin))
;; Not all architectures have the Vulkan overlay control script.
(mkdir-p (string-append out "/bin"))
(call-with-output-file (string-append out "/bin/.empty")
@ -456,13 +459,13 @@ svga,swrast,virgl")))
(string-append bin "/bin"))
(delete-file-recursively (string-append out "/bin")))))
(add-after 'install 'symlinks-instead-of-hard-links
(lambda* (#:key outputs #:allow-other-keys)
(lambda _
;; All the drivers and gallium targets create hard links upon
;; installation (search for "hardlink each megadriver instance"
;; in the makefiles). This is no good for us since we'd produce
;; nars that contain several copies of these files. Thus, turn
;; them into symlinks, which saves ~124 MiB.
(let* ((out (assoc-ref outputs "out"))
(let* ((out #$output)
(lib (string-append out "/lib"))
(files (find-files lib
(lambda (file stat)
@ -488,7 +491,33 @@ svga,swrast,virgl")))
file)
(symlink reference file)))
others))))
(delete-duplicates inodes))))))))
(delete-duplicates inodes)))))
(add-after 'install 'set-layer-path-in-manifests
(lambda _
(let* ((out #$output)
(implicit-path (string-append
out
"/share/vulkan/implicit_layer.d/"))
(explicit-path (string-append
out
"/share/vulkan/explicit_layer.d/"))
(fix-layer-path
(lambda (layer-name)
(let* ((explicit (string-append explicit-path layer-name ".json"))
(implicit (string-append implicit-path layer-name ".json"))
(manifest (if (file-exists? explicit)
explicit
implicit)))
(substitute* manifest
(((string-append "\"lib" layer-name ".so\""))
(string-append "\"" out "/lib/lib" layer-name ".so\"")))))))
(for-each fix-layer-path '("VkLayer_MESA_device_select"
"VkLayer_MESA_overlay"))))))))
(native-search-paths
(list (search-path-specification
;; Ensure the Mesa VDPAU drivers can be found.
(variable "VDPAU_DRIVER_PATH")
(files '("lib/vdpau")))))
(home-page "https://mesa3d.org/")
(synopsis "OpenGL and Vulkan implementations")
(description "Mesa is a free implementation of the OpenGL and Vulkan
@ -507,7 +536,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(arguments
(substitute-keyword-arguments (package-arguments mesa)
((#:configure-flags flags)
`(cons "-Dgallium-opencl=standalone" ,flags))))
#~(cons "-Dgallium-opencl=standalone" #$flags))))
(inputs
(modify-inputs (package-inputs mesa)
(prepend libclc)))
@ -521,10 +550,10 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(arguments
(substitute-keyword-arguments (package-arguments mesa)
((#:configure-flags flags)
`(cons "-Dgallium-opencl=icd"
,(delete "-Dgallium-opencl=standalone" flags)))
#~(cons "-Dgallium-opencl=icd"
(delete "-Dgallium-opencl=standalone" #$flags)))
((#:phases phases)
`(modify-phases ,phases
#~(modify-phases #$phases
(add-after 'install 'mesa-icd-absolute-path
(lambda _
;; Use absolute path for OpenCL platform library.
@ -532,7 +561,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
;; for ICD in our applications to find OpenCL platform.
(use-modules (guix build utils)
(ice-9 textual-ports))
(let* ((out (assoc-ref %outputs "out"))
(let* ((out #$output)
(mesa-icd (string-append out "/etc/OpenCL/vendors/mesa.icd"))
(old-path (call-with-input-file mesa-icd get-string-all))
(new-path (string-append out "/lib/" (string-trim-both old-path))))

54
gnu/packages/gnome.scm
View File

@ -1735,7 +1735,7 @@ client devices can handle.")
(define-public libnma
(package
(name "libnma")
(version "1.10.2")
(version "1.10.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -1743,14 +1743,26 @@ client devices can handle.")
name "-" version ".tar.xz"))
(sha256
(base32
"0h095a26w3sgbspsf7wzz8ddg62j3jb9ckrrv41k7cdp0k2dkhsg"))))
"1avdsw1l61gwr29lzvlr4dh3qz6ypsc3xvfahrcprlqa34mzp9jk"))))
(build-system meson-build-system)
(arguments
;; GTK 4.x depends on Rust (indirectly) so pull it only on platforms
;; where it is supported.
(list #:configure-flags (if (supported-package? gtk)
#~(list "-Dlibnma_gtk4=true")
#~(list "-Dlibnma_gtk4=false"))))
(list
#:configure-flags
(if (supported-package? gtk)
#~(list "-Dlibnma_gtk4=true")
#~(list "-Dlibnma_gtk4=false"))
#:phases
#~(modify-phases %standard-phases
;; We follow upstream's recommendation at
;; https://gitlab.gnome.org/GNOME/libnma/-/commit/9166164387b0367becbe3400af696f925fef0ab1
(add-after 'install 'delete-org.gnome.nm-applet.gschema
(lambda _
(delete-file
(string-append
#$output
"/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml")))))))
(native-inputs
(list docbook-xml-4.3
gettext-minimal
@ -3465,7 +3477,7 @@ for dealing with different structured file formats.")
(define-public librsvg
(package
(name "librsvg")
(version "2.54.4")
(version "2.54.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/librsvg/"
@ -3473,7 +3485,7 @@ for dealing with different structured file formats.")
"librsvg-" version ".tar.xz"))
(sha256
(base32
"0cs8qbn2khibb5w1r0f6cibfmkfb7zg713526vhc0hva7wj2l5ga"))
"0vmfgihhf35bxn7giqiskgsflr0zxp6xyy9aynhiyk9j8l7ij0sg"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "vendor")))))
@ -3554,6 +3566,17 @@ for dealing with different structured file formats.")
;; successfully with the '--locked' flag.
(substitute* '("Makefile.am" "Makefile.in")
(("--locked") ""))))
(add-after 'unpack 'loosen-test-boundaries
(lambda _
;; Increase reftest tolerance a bit to account for different
;; harfbuzz, pango, etc.
(setenv "RSVG_TEST_TOLERANCE" "20")
;; These two tests even fail after loosening the tolerance.
(for-each delete-file
'("tests/fixtures/reftests/bugs/730-font-scaling.svg"
"tests/fixtures/reftests/bugs/730-font-scaling-ref.png"
"tests/fixtures/reftests/svg1.1/text-text-03-b.svg"
"tests/fixtures/reftests/svg1.1/text-text-03-b-ref.png"))))
(add-before 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
@ -3671,10 +3694,9 @@ diagrams.")
(system (or (%current-target-system)
(%current-system))))
;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported
;; on x86_64 and aarch64 so far, use the ancient C version on other
;; on x86_64, aarch64 and riscv64 so far, use the ancient C version on other
;; platforms (FIXME).
(if (or (string-prefix? "x86_64-" system)
(string-prefix? "aarch64-" system))
(if (supported-package? librsvg)
librsvg
librsvg-2.40))
@ -5028,7 +5050,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
vala
curl
gnutls ;for 'certtool'
httpd))
httpd/pinned))
(propagated-inputs
;; libsoup-3.0.pc refers to all of these (except where otherwise noted)
(list brotli
@ -8218,7 +8240,9 @@ users.")
(define-public network-manager
(package
(name "network-manager")
(version "1.41.2")
;; Note: NetworkManager still follows the odd/even major version number
;; for development/stable releases scheme; be sure to use a stable one.
(version "1.42.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/"
@ -8228,7 +8252,7 @@ users.")
"network-manager-meson.patch"))
(sha256
(base32
"0v5a5fw1zwa94ksz6d7hyj14wwdxzmswgm81ryhxmyn3nrcf1akg"))))
"0y82xl84dyhdkyl98y86wspiq9iy5jz23bjzc3mvrijsfz1qlf4c"))))
(build-system meson-build-system)
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
@ -8621,7 +8645,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.")
(define-public network-manager-applet
(package
(name "network-manager-applet")
(version "1.30.0")
(version "1.32.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/network-manager-applet/"
@ -8629,7 +8653,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.")
"network-manager-applet-" version ".tar.xz"))
(sha256
(base32
"1lswxfxjfbiknspwli8d65i0bnyfazzcnrqckaw0s44zkm7bh5lm"))))
"0f5sxxi9rywg8mhglcyk3sqmgv5wwl4vxzar56847b852pxazdd2"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

20
gnu/packages/gnuzilla.scm
View File

@ -518,9 +518,9 @@ variable defined below. It requires guile-json to be installed."
;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method))
(define %icecat-base-version "102.10.0")
(define %icecat-base-version "102.11.0")
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
(define %icecat-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-build-id "20230509000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -540,12 +540,12 @@ variable defined below. It requires guile-json to be installed."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"1y7v19xxl6jchywd0zxy5vr4pj23pi6di4lhlivxpki2pkgm8scc"))))
"0cyfij00i9m1pwwyfhiq2qasbfr2ykdwziqykj8878kyjvkj1wg7"))))
;; The upstream-icecat-base-version may be older than the
;; %icecat-base-version.
(upstream-icecat-base-version "102.10.0")
(gnuzilla-commit "15c6c2229a053cdcc064eda89cee07f18efac35d")
(upstream-icecat-base-version "102.11.0")
(gnuzilla-commit "5a1894fc966840dc242110ec0459471c637a4675")
(gnuzilla-source
(origin
(method git-fetch)
@ -557,7 +557,7 @@ variable defined below. It requires guile-json to be installed."
(string-take gnuzilla-commit 8)))
(sha256
(base32
"0v3wak2fd9bmq1j8k8k5xw0i4xbqy7fbasycr4swaqmsaf22sdv4"))))
"1816lm4cl45l1zbc043827rfnzzzxckhxk16gvj3a8kyg7fxvv3v"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -1138,8 +1138,8 @@ standards of the IceCat project.")
"ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl"
"tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
(define %icedove-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-version "102.10.0")
(define %icedove-build-id "20230424000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-version "102.10.1")
;; Provides the "comm" folder which is inserted into the icecat source.
;; Avoids the duplication of Icecat's source tarball.
@ -1148,11 +1148,11 @@ standards of the IceCat project.")
(method hg-fetch)
(uri (hg-reference
(url "https://hg.mozilla.org/releases/comm-esr102")
(changeset "d8df3bebc4b529388b62b9cb4df152f13910fbe3")))
(changeset "6eabe0915354d878fe93e2b02547cebe83f1fd6d")))
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
(sha256
(base32
"1m46nxnq4jpp4p6qqw68pphhccxlz4zzbyyb8iq26zvp42x7ic8f"))))
"1hbakn0b7gvfy9ciqbjwkg1pl3d21b0bnafqf6280lv3v593rq08"))))
(define (comm-source->locales+changeset source)
"Given SOURCE, a checkout of the Thunderbird 'comm' component, return the

12
gnu/packages/gtk.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
@ -591,7 +591,7 @@ printing and other features typical of a source code editor.")
(define-public gtksourceview
(package
(name "gtksourceview")
(version "5.5.1")
(version "5.8.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
@ -599,7 +599,7 @@ printing and other features typical of a source code editor.")
"gtksourceview-" version ".tar.xz"))
(sha256
(base32
"068dqhacvs65gnmrryahm6qs0q050admlpqqi1gy8wgh2p6qrraa"))))
"0cw9h4aa84a48b3kd3rv0bb2mk7q1vz9hwkppxpqh8gg1p1d838i"))))
(build-system meson-build-system)
(arguments
'(#:phases
@ -705,8 +705,10 @@ highlighting and other features typical of a source code editor.")
(modify-phases %standard-phases
(add-before 'configure 'disable-failing-tests
(lambda _
(substitute* "tests/meson.build"
(("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],")
;; The test for the fix for issue 205 causes failures.
;; https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
(substitute* "tests/pixbuf-jpeg.c"
((".*/pixbuf/jpeg/issue205.*")
""))))
;; The slow tests take longer than the specified timeout.
,@(if (target-arm? (%current-system))

36
gnu/packages/guile-xyz.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016-2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016, 2019, 2020, 2021 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019-2021, 2023 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2021 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2016, 2021 Amirouche <amirouche@hypermove.net>
@ -311,8 +311,8 @@ currently does not do much, but it might in the future.")
(license license:gpl3+)))
(define-public guile-openai
(let ((commit "252f2d5660bb546015d18c60be96d3cf60c4dcfa")
(revision "1"))
(let ((commit "9265b641dea0246609b7bd5031f3f6780ef6a167")
(revision "2"))
(package
(name "guile-openai")
(version (git-version "0.1" revision commit))
@ -324,7 +324,7 @@ currently does not do much, but it might in the future.")
(file-name (git-file-name name version))
(sha256
(base32
"1qv0kr30d1x7ap1b0h03gl5pzp20xw4qd6b3l5v4iz4ka8qna9gi"))))
"0sydjsgdr6xxk1w5f8pf14wgimfy4fb1hpi8yml0nv83p7bfr1w3"))))
(build-system guile-build-system)
(arguments
(list
@ -850,14 +850,12 @@ is not available for Guile 2.0.")
(license license:lgpl3+)))
(define-public guile-fibers-next
(let ((commit "36a6cc707921f4ab503965fefd096d80afee72f0")
(revision "1"))
(let ((commit "745bd409bef17284648805fb985777d21dba79f7")
(revision "2"))
(package
(inherit guile-fibers-1.1)
(name "guile-fibers-next")
(version (git-version (package-version guile-fibers-1.1)
revision
commit))
(version (git-version "1.2.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -866,7 +864,7 @@ is not available for Guile 2.0.")
(file-name (git-file-name "guile-fibers" version))
(sha256
(base32
"0vcb1xck7wv1z9d7i9gzs1k2vav73yf6as5cbjgjjfz8dzm0rq7q")))))))
"0rn6v4phpnb443i0azfx33b38axd5asv40hhxx9b710hi22j4aic")))))))
(define-public guile-fibers
(package
@ -4145,7 +4143,7 @@ tests being run, resulting clearer and more specific output.")
"109p4n39ln44cxvwdccf9kgb96qx54makvd2ir521ssz6wchjyag"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
(list guile-3.0 pkg-config))
(inputs
(list guile-3.0))
(home-page "https://ngyro.com/software/guile-semver.html")
@ -4159,6 +4157,8 @@ the style of the Node Package Manager (NPM).")
(package
(inherit guile-semver)
(name "guile2.2-semver")
(native-inputs
(list guile-2.2 pkg-config))
(inputs
(list guile-2.2))))
@ -4518,11 +4518,17 @@ according to Bitorrent BEP003.")
"1jx8704200l29ndg9bfyamgxrzknya0f0vwb2sxhd0k3b8r94avw"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-gnutls=yes")))
`(#:configure-flags '("--enable-gnutls=yes")
#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'fix-autogen.sh
(lambda _
(substitute* "autogen.sh"
((" #!") "#!")))))))
(native-inputs
(list autoconf automake texinfo pkg-config))
(inputs
(list gnutls guile-3.0))
(list gnutls guile-gnutls guile-3.0))
(home-page "https://github.com/rekado/guile-irc")
(synopsis "IRC library for Guile")
(description "This package provides a Guile library for @dfn{Internet
@ -5585,7 +5591,7 @@ This module implements this interface by use of Guile's dynamic FFI.")
(define-public guile-goblins
(package
(name "guile-goblins")
(version "0.10")
(version "0.11.0")
(source
(origin
(method url-fetch)
@ -5594,7 +5600,7 @@ This module implements this interface by use of Guile's dynamic FFI.")
version ".tar.gz"))
(sha256
(base32
"13nzmwi4m0j27rmn2ks0p3k620npnhx736q25n8llj2ivkn2vxd2"))))
"1ic4f65kbziszi5cz1b7ypl6acph6kdq5pc3wasa1jns3gkzfl6l"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags

4
gnu/packages/haskell-xyz.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
@ -14501,7 +14501,7 @@ Haskell newer than 2.8.")
(properties '((upstream-name . "mysql")))
(arguments `(#:tests? #f)) ; TODO: Fails to connect to server.
(inputs
(list mysql zlib openssl))
(list (list mariadb "dev") zlib openssl))
(native-inputs (list ghc-hspec))
(home-page "https://github.com/paul-rouse/mysql")
(synopsis "Low-level MySQL client library")

11
gnu/packages/haxe.scm
View File

@ -66,7 +66,8 @@
(base32 "1xgw646pghsjjbzd8qlaq17vq96swlrazpivrvyrhdj36vb3sci3"))))
(build-system cmake-build-system)
(arguments
(list #:phases
(list #:disallowed-references (list httpd)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'prefix
(lambda _
@ -76,15 +77,17 @@
(inputs (list apr
apr-util
gtk+-2
httpd
libgc
mbedtls-apache
mysql
(list mariadb "dev")
(list mariadb "lib")
openssl
pcre
sqlite
zlib))
(native-inputs (list git pkg-config)) ; git for source_archive and applying patch
(native-inputs (list httpd
git ; git for source_archive and applying patch
pkg-config))
(home-page "https://nekovm.org/")
(synopsis "High-level dynamically typed programming language and virtual
machine")

72
gnu/packages/ibus.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@ -259,7 +259,7 @@ may also simplify input method development.")
(define-public ibus-libpinyin
(package
(name "ibus-libpinyin")
(version "1.12.0")
(version "1.15.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libpinyin/ibus-libpinyin/"
@ -267,40 +267,42 @@ may also simplify input method development.")
"/ibus-libpinyin-" version ".tar.gz"))
(sha256
(base32
"0xl2lmffy42f6h6za05z4vpazpza1a9gsrva65giwyv3kpf652dd"))))
"01zsx3aw9iwjm70mksgpjlqjj5f5wi9l0pdixprw5lj5hxd8siyp"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
'("--enable-opencc")
#:phases
(modify-phases %standard-phases
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'ibus-setup-libpinyin' runs with the correct
;; PYTHONPATH and GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/libexec/ibus-setup-libpinyin")
`("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH")
,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-libpinyin/setup/")))
`("GI_TYPELIB_PATH" ":" prefix
(,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-libpinyin/setup/"))))
#t))))))
(list
#:configure-flags
'(list "--enable-opencc")
#:phases
#~(modify-phases %standard-phases
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda _
;; Make sure 'ibus-setup-libpinyin' runs with the correct
;; PYTHONPATH and GI_TYPELIB_PATH.
(wrap-program (string-append #$output "/libexec/ibus-setup-libpinyin")
`("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH")
,(string-append #$(this-package-input "ibus")
"/lib/girepository-1.0")
,(string-append #$output
"/share/ibus-libpinyin/setup/")))
`("GI_TYPELIB_PATH" ":" prefix
(,(string-append #$(this-package-input "ibus")
"/lib/girepository-1.0")
,(string-append #$(this-package-input "gtk+")
"/lib/girepository-1.0")
,(string-append #$output
"/share/ibus-libpinyin/setup/")
,(getenv "GI_TYPELIB_PATH")))))))))
(inputs
`(("ibus" ,ibus)
("libpinyin" ,libpinyin)
("bdb" ,bdb)
("sqlite" ,sqlite)
("opencc" ,opencc)
("python" ,python)
("pygobject2" ,python-pygobject)
("gtk+" ,gtk+)))
(list ibus
libpinyin
bdb
sqlite
opencc
python
python-pygobject
gtk+))
(native-inputs
(list pkg-config intltool
`(,glib "bin")))
@ -314,7 +316,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
(define-public libpinyin
(package
(name "libpinyin")
(version "2.6.0")
(version "2.8.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libpinyin/libpinyin/"
@ -322,7 +324,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
"/libpinyin-" version ".tar.gz"))
(sha256
(base32
"10h5mjgv4ibhispvr3s1k36a4aclx4dcvcc2knd4sg1xibw0dp4w"))))
"0l4h1q2l5fql0fy9bmncyw0dpbfwn1yb5p3xnwvhgpbidpq58c9m"))))
(build-system gnu-build-system)
(inputs
(list glib bdb))

18
gnu/packages/icu4c.scm
View File

@ -124,15 +124,15 @@ C/C++ part.")
(if (target-riscv64?)
(substitute-keyword-arguments (package-arguments icu4c)
((#:phases phases)
`(modify-phases ,phases
(replace 'disable-failing-test
;; It is unknown why these tests are failing.
(lambda _
(substitute* "source/test/cintltst/ucptrietest.c"
((".*addTest.*") ""))
(substitute* "source/test/intltest/numbertest_api.cpp"
(("(TESTCASE_AUTO\\(unitUsage\\));" all)
(string-append "//" all))))))))
#~(modify-phases #$phases
(replace 'disable-failing-test
;; It is unknown why these tests are failing.
(lambda _
(substitute* "source/test/cintltst/ucptrietest.c"
((".*addTest.*") ""))
(substitute* "source/test/intltest/numbertest_api.cpp"
(("(TESTCASE_AUTO\\(unitUsage\\));" all)
(string-append "//" all))))))))
(package-arguments icu4c)))))
(define-public icu4c-69

4
gnu/packages/image.scm
View File

@ -1423,7 +1423,9 @@ channels.")
(lib (string-append out "/lib")))
(for-each delete-file (find-files lib "\\.a$")))))
,@(if (or (target-ppc64le?) (target-aarch64?))
,@(if (or (target-ppc64le?)
(target-aarch64?)
(target-riscv64?))
'((add-after 'unpack 'adjust-tests
(lambda _
;; Adjust test on ppc64 and aarch64, where no exception

19
gnu/packages/inkscape.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -192,6 +193,24 @@ endif()~%~%"
(("text-glyphs-combining") "")
(("text-glyphs-vertical") "")
(("test-rtl-vertical") ""))))
,@(if (or (target-aarch64?)
(target-ppc64le?)
(target-riscv64?))
`((add-after 'unpack 'disable-more-tests
(lambda _
;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035680690
(substitute* "testfiles/CMakeLists.txt"
(("lpe64-test") "#lpe64-test"))
;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035539888
;; According to upstream, this is a false positive.
(substitute* "testfiles/rendering_tests/CMakeLists.txt"
(("test-use") "#test-use"))
;; https://gitlab.com/inkscape/inkscape/-/issues/3554#note_1035539888
;; Allegedly a precision error in the gamma.
(substitute* "testfiles/cli_tests/CMakeLists.txt"
(("add_cli_test\\(export-png-color-mode-gray-8_png" all)
(string-append "#" all))))))
'())
(add-after 'unpack 'set-home
;; Mute Inkscape warnings during tests.
(lambda _

74
gnu/packages/instrumentation.scm
View File

@ -17,6 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages instrumentation)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
@ -93,7 +94,8 @@
(add-before 'configure 'set-environment-variables
(lambda _
(setenv "BABELTRACE_DEV_MODE" "1")
(setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE"))))))
(setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")
(invoke "autoreconf" "-vfi"))))))
(inputs
(list glib))
;; NOTE - elfutils is used for the LTTng debug information filter
@ -104,15 +106,28 @@
(list elfutils))
;; NOTE - python-3 is set here for generating the bindings. Users need to
;; install python-3 in their profile in order to use these bindings.
;;
;; NOTE - Babeltrace 2.0.4 is distributed with a aclocal.m4 that does not
;; support Python3.10. We can either disable Python's bindings or we can
;; reconfigure the project with our autoconf. This is because the
;; distribution tarballs are generated on Ubuntu LTS 18.04.
;;
;; `paredit-raise-sexp' on the first list of native inputs and remove the
;; 'autoreconf invokation whenever we bump to the next version that is
;; goind to be generated on Ubuntu LTS 22.04.
(native-inputs
(list asciidoc
bison
flex
pkg-config
python-3
python-sphinx
swig
xmltoman))
(append
(list asciidoc
bison
flex
pkg-config
python-3
python-sphinx
swig
xmltoman)
(list autoconf
automake
libtool)))
(home-page "https://babeltrace.org/")
(synopsis "Trace manipulation toolkit")
(description "Babeltrace 2 is a framework for viewing, converting,
@ -376,7 +391,10 @@ to ring buffers shared with a consumer daemon.")
(add-after 'unpack 'patch-default-man-path
(lambda _
(substitute* "src/common/defaults.h"
(("/usr/bin/man") "man")))))))
(("/usr/bin/man") "man"))))
(add-before 'configure 'autoreconf
(lambda _
(invoke "autoreconf" "-vfi"))))))
;; NOTE - Users have to install python-3 in their profile to use the
;; bindings. We don't put it in the inputs, because the rest of the tools
;; can work without it.
@ -384,19 +402,31 @@ to ring buffers shared with a consumer daemon.")
(list liburcu popt numactl))
(propagated-inputs
(list kmod module-init-tools))
;; NOTE - LTTng 2.13.9 is distributed with a aclocal.m4 that does not
;; support Python3.10. We can either disable Python's bindings or we can
;; reconfigure the project with our autoconf. This is because the
;; distribution tarballs are generated on Ubuntu LTS 18.04.
;;
;; `paredit-raise-sexp' on the first list of native inputs and remove the
;; 'autoreconf build step whenever we bump to the next version that is
;; goind to be generated on Ubuntu LTS 22.04.
(native-inputs
(list pkg-config
perl
libpfm4
python-3
swig
procps
which
flex
bison
asciidoc
libxml2
lttng-ust))
(append
(list pkg-config
perl
libpfm4
python-3
swig
procps
which
flex
bison
asciidoc
libxml2
lttng-ust)
(list autoconf
automake
libtool)))
(home-page "https://lttng.org/")
(synopsis "LTTng userspace tracer libraries")
(description "The lttng-tools project provides a session

4
gnu/packages/irc.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
@ -749,7 +749,7 @@ but can also be used independently as a logging bot.")
gnutls
libmaxminddb
mbedtls-apache
mysql
(list mariadb "dev")
openldap
openssl
`(,pcre "bin")

43
gnu/packages/java.scm
View File

@ -13509,6 +13509,49 @@ for the JVM. It supports colors, autocompletion, subcommands, and more. Writte
in Java, usable from Groovy, Kotlin, Scala, etc.")
(license license:asl2.0)))
(define-public java-pj
(package
(name "java-pj")
(version "20150107")
(source (origin
(method url-fetch)
(uri (string-append "https://www.cs.rit.edu/~ark/pjsrc"
version ".jar"))
(sha256
(base32
"078xwaivl2qqjc07r0vk6kzpqlcb1bcar80p8r5qigh34hpr86d3"))
(modules '((guix build utils)))
(snippet
'(for-each delete-file
(find-files "." "\\.class$")))))
(build-system ant-build-system)
(arguments
(list
#:tests? #false ;there are none
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _ (chdir "src/pj")))
(add-after 'chdir 'patch-source-directory
(lambda _
(substitute* "compile"
(("SRCDIR1=/home/ark/public_html/pj/lib")
(string-append "SRCDIR1=" (getcwd) "/lib")))))
(replace 'build
(lambda _
(invoke "bash" "./compile" "linux")
(with-directory-excursion "lib"
(apply invoke "jar" "cf" (string-append "pj" #$version ".jar")
(find-files "." "\\.class$")))))
(replace 'install (install-jars ".")))))
(home-page "https://www.cs.rit.edu/~ark/pj.shtml")
(synopsis "Parallel programming in Java")
(description "Parallel Java (PJ) is an API and middleware for parallel
programming in 100% Java on shared memory multiprocessor (SMP) parallel
computers, cluster parallel computers, and hybrid SMP cluster parallel
computers.")
(license license:gpl3+)))
(define-public java-jetbrains-annotations
(package
(name "java-jetbrains-annotations")

7
gnu/packages/kodi.scm
View File

@ -284,7 +284,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
(sha256
(base32
"1pfd1ajivr865h0fkpbv778626c4czrvq8650bzqv9aqzh8f36my"))
(patches (search-patches "kodi-set-libcurl-ssl-parameters.patch"))
(patches (search-patches "kodi-set-libcurl-ssl-parameters.patch"
"kodi-mesa-eglchromium.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -415,7 +416,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
ffmpeg-4
flac
flatbuffers
fmt-6
fmt
fontconfig
freetype
fribidi
@ -456,7 +457,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
python
rapidjson
samba
spdlog-for-kodi
spdlog
sqlite
taglib
tinyxml

49
gnu/packages/linux.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015-2018, 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
@ -485,7 +485,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-6.2-version "6.2.12")
(define-public linux-libre-6.2-version "6.2.14")
(define-public linux-libre-6.2-gnu-revision "gnu")
(define deblob-scripts-6.2
(linux-libre-deblob-scripts
@ -495,12 +495,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0560xc8l2z79qk2dnv15i0m4igw9mq2ymv2a40nw2z3lcqygcs5x")))
(define-public linux-libre-6.2-pristine-source
(let ((version linux-libre-6.2-version)
(hash (base32 "1j6cn1ifmcqfqvxp9h10y8yfxi918yzl3yjbf96gmb9p4ysldqf7")))
(hash (base32 "0ab756x6baza5wmi0r836g7z0hkvby65g0k6n1sd95nl16irzg0f")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.2)))
(define-public linux-libre-6.1-version "6.1.25")
(define-public linux-libre-6.1-version "6.1.27")
(define-public linux-libre-6.1-gnu-revision "gnu")
(define deblob-scripts-6.1
(linux-libre-deblob-scripts
@ -510,7 +510,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0cchdhjra74zanyk14brv2l2dvxpg8dn58rn477lgfb44mcnhq33")))
(define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version)
(hash (base32 "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb")))
(hash (base32 "01grx5y48scyyihpj176knn5yvgpxv2gfkli03rwj31xvnb4pdy2")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.1)))
@ -518,7 +518,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; 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-5.15-version "5.15.108")
(define-public linux-libre-5.15-version "5.15.110")
(define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15
(linux-libre-deblob-scripts
@ -528,12 +528,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "03hwhwbcicwyx5i30d6m715kwgrxz4h21xhk55wnawlk8zhx3r35")))
(define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version)
(hash (base32 "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb")))
(hash (base32 "0nqbhgafl513pdfn55j608829bsw8kn0v616gblxqy4rgg3zqacq")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.178")
(define-public linux-libre-5.10-version "5.10.179")
(define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
@ -543,12 +543,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1g4vabfswxzf9ahxc06k2ffksf84kcr2csx4m5kx680w0jqqnk80")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs")))
(hash (base32 "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.241")
(define-public linux-libre-5.4-version "5.4.242")
(define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
@ -558,12 +558,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1d6as1yk9svysh07hdybs8glvn8s9f8gwlbjl7f9m920pdam2r60")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z")))
(hash (base32 "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.281")
(define-public linux-libre-4.19-version "4.19.282")
(define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
@ -573,12 +573,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1q0fgpbdwc21wj9wnjjb49dp84ch6ymd5na3iaabadwjs2nmb6bd")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0")))
(hash (base32 "02z20879xl4ya957by1p35vi1a7myzxwiqd9cnvm541sgnci99a3")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.313")
(define-public linux-libre-4.14-version "4.14.314")
(define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
@ -588,7 +588,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1ccggm19nl7pdcxmsm08fkqy8phz8rqfmww5ypizibdmnrmpn2v9")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76")))
(hash (base32 "0lwiykv2ci7lrjvvykbiqavzzizdkf8xxqlybixi9l1as7q02v47")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
@ -5621,7 +5621,20 @@ Linux Device Mapper multipathing driver:
#:test-target "partcheck" ; need root for a full 'check'
#:phases
#~(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(delete 'configure) ; no configure script
#$@(if (target-riscv64?)
#~((add-after 'unpack 'patch-test
(lambda* (#:key build-inputs #:allow-other-keys)
(invoke "patch" "-p1" "-i"
#$(local-file
(search-patch
"libaio-riscv-test5.patch"))))))
#~()))))
(native-inputs
(if (target-riscv64?)
(list (search-patch "libaio-riscv-test5.patch")
patch)
'()))
(home-page "https://pagure.io/libaio")
(synopsis "Linux-native asynchronous I/O access library")
(description
@ -8070,7 +8083,7 @@ receiving to-be-logged packets from the kernel nfnetlink_log subsystem
libpcap
jansson
postgresql
mysql
(list mariadb "dev")
zlib
openssl))
(arguments
@ -8078,7 +8091,7 @@ receiving to-be-logged packets from the kernel nfnetlink_log subsystem
#~(list (string-append "--with-pgsql="
(assoc-ref %build-inputs "postgresql"))
(string-append "--with-mysql="
(assoc-ref %build-inputs "mysql")))
(assoc-ref %build-inputs "mariadb")))
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-doc

24
gnu/packages/lisp-xyz.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017-2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@ -13178,7 +13178,8 @@ interface for MySQL, PostgreSQL and SQLite.")
(inputs
`(("cffi" ,sbcl-cffi)
("md5" ,sbcl-md5)
("mysql" ,mysql)
("mariadb-dev" ,mariadb "dev")
("mariadb-lib" ,mariadb "lib")
("postgresql" ,postgresql)
("postmodern" ,sbcl-postmodern)
("sqlite" ,sqlite)
@ -13224,15 +13225,16 @@ interface for MySQL, PostgreSQL and SQLite.")
lib))
(substitute* "db-mysql/mysql-loader.lisp"
(("libmysqlclient" all)
(string-append (assoc-ref inputs "mysql") "/lib/" all))
(string-append (assoc-ref inputs "mariadb-lib") "/lib/" all))
(("clsql-mysql-system::\\*library-file-dir\\*")
lib)))
#t))
(add-before 'build 'build-helper-library
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((mysql (assoc-ref inputs "mysql"))
(inc-dir (string-append mysql "/include/mysql"))
(lib-dir (string-append mysql "/lib"))
(let* ((mariadb-dev (assoc-ref inputs "mariadb-dev"))
(mariadb-lib (assoc-ref inputs "mariadb-lib"))
(inc-dir (string-append mariadb-dev "/include/mysql"))
(lib-dir (string-append mariadb-lib "/lib"))
(shared-lib-dir (string-append (assoc-ref outputs "out")
"/lib"))
(shared-lib (string-append shared-lib-dir
@ -13242,7 +13244,7 @@ interface for MySQL, PostgreSQL and SQLite.")
"-I" inc-dir
"db-mysql/clsql_mysql.c"
"-Wl,-soname=clsql_mysql"
"-L" lib-dir "-lmysqlclient" "-lz"
"-L" lib-dir "-lmariadb" "-lz"
"-o" shared-lib)
#t)))
(add-after 'unpack 'fix-tests
@ -13265,7 +13267,7 @@ interfaces as well as a functional and an object oriented interface.")
(native-inputs
`(("rt" ,cl-rt)))
(inputs
(list mysql postgresql sqlite zlib))
(list (list mariadb "dev") postgresql sqlite zlib))
(propagated-inputs
`(("cffi" ,cl-cffi)
("md5" ,cl-md5)
@ -25672,7 +25674,7 @@ desktop files to the right directories.
(define-public sbcl-nclasses
(package
(name "sbcl-nclasses")
(version "0.4.0")
(version "0.5.0")
(source
(origin
(method git-fetch)
@ -25682,7 +25684,7 @@ desktop files to the right directories.
(file-name (git-file-name "cl-nclasses" version))
(sha256
(base32
"0g34xm32h0bc0zcyrkr2637jdb8mgb2zymqp6zfjc912sisgcs0l"))
"0aym0m12s5px139ragna0pr8jan8bx3akhjgamj6h0y28xksziji"))
(modules '((guix build utils)))
(snippet
`(begin
@ -25700,7 +25702,7 @@ desktop files to the right directories.
"NClasses provides helper macros to help write classes, conditions,
generic functions, and CLOS code in general with less boilerplate.
It's a fork of @code{hu.dwim.defclass-star}. It inclues some bug fixes and
It's a fork of @code{hu.dwim.defclass-star}. It includes some bug fixes and
extra features like type inference.")
(license license:public-domain)))

9
gnu/packages/lisp.scm
View File

@ -987,7 +987,7 @@ the HTML documentation of TXR.")
(define-public txr
(package
(name "txr")
(version "285")
(version "286")
(source
(origin
(method git-fetch)
@ -996,7 +996,7 @@ the HTML documentation of TXR.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ypsgakhak0znmg3wzblfcwd4s4nanzm61dz66gwi48rfnq35znl"))))
(base32 "0c5prq9ans4qv8dgfn85555by9rb22p276g21w4mns0rqhjd0ij8"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@ -1335,10 +1335,11 @@ C. It features inferred static typing, macros, automatic memory
management without a garbage collector, a REPL, and straightforward
integration with code written in C.")
(license license:asl2.0))))
(define-public lisp-repl-core-dumper
(package
(name "lisp-repl-core-dumper")
(version "0.7.0")
(version "0.8.0")
(source
(origin
(method git-fetch)
@ -1347,7 +1348,7 @@ integration with code written in C.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0yfsyxj462yi3bx587yssp4gwb54jdm6fjk9q93gjrfv8a65ilp7"))))
(base32 "04c12gi5izpkv8ha98z9qdkbmyrsq6ga060adrx53da8z31gnhk1"))))
(build-system copy-build-system)
(arguments
'(#:install-plan

14
gnu/packages/logging.scm
View File

@ -252,20 +252,6 @@ library.")
(sha256
(base32 "02xz017ba9fssm1rp1fcfld7h79awbr6fqai9dxaqp02akp3davk"))))))
(define-public spdlog-for-kodi
(package
(inherit spdlog)
(version "1.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gabime/spdlog")
(commit (string-append "v" version))))
(file-name (git-file-name "spdlog" version))
(sha256
(base32 "0dn44r3xbw1w0bk9yflnxkh3rzdq2bpxkks44skfmqig0rsj1f1x"))))))
(define-public rsyslog
(package
(name "rsyslog")

109
gnu/packages/lxqt.scm
View File

@ -100,7 +100,7 @@ to statistics about the system on which it's run.")
(define-public lxqt-build-tools
(package
(name "lxqt-build-tools")
(version "0.12.0")
(version "0.13.0")
(source
(origin
(method url-fetch)
@ -108,7 +108,7 @@ to statistics about the system on which it's run.")
"/download/" version
"/lxqt-build-tools-" version ".tar.xz"))
(sha256
(base32 "0c4mm167hk0yihryi46d80ghxx2lwzkpivs4yj5wsfvdpbv5q1qh"))))
(base32 "1kjrxc1aj7yfn3v72lwryn58hkwsribsspm480qg4qbw1nfijg7x"))))
(build-system cmake-build-system)
(arguments
(list
@ -148,7 +148,7 @@ itself as well as other components maintained by the LXQt project.")
(define-public libqtxdg
(package
(name "libqtxdg")
(version "3.10.0")
(version "3.11.0")
(source
(origin
(method url-fetch)
@ -156,7 +156,7 @@ itself as well as other components maintained by the LXQt project.")
"https://github.com/lxqt/libqtxdg/releases/download/"
version "/libqtxdg-" version ".tar.xz"))
(sha256
(base32 "18mz3mxcnz6awkkgxnfg5p43d4lv92vamxk1d0xzdxrp9symfd9v"))))
(base32 "0alphfvkwxaqfnckjxbrwjkj7wjl4yff7qxzmyjz67c8728lxbny"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
@ -183,7 +183,7 @@ in Qt.")
(define-public qtxdg-tools
(package
(name "qtxdg-tools")
(version "3.10.0")
(version "3.11.0")
(source
(origin
(method url-fetch)
@ -191,7 +191,7 @@ in Qt.")
"https://github.com/lxqt/qtxdg-tools/releases/download/"
version "/qtxdg-tools-" version ".tar.xz"))
(sha256
(base32 "0iyn0s2mck948vzlmq6hk4p93i9z59h50z6m2kdhzv9ck2axvlik"))))
(base32 "05bfff9hl1fjy59j89cbxkmzf8yswazb0yz9r01a8a1fw4sh7br9"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; no tests
(propagated-inputs (list libqtxdg))
@ -206,7 +206,7 @@ applications.")
(define-public liblxqt
(package
(name "liblxqt")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
@ -214,7 +214,7 @@ applications.")
"https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "057cdxmz6kh3p1vpbwah4i99hdknh22w2w8wqfiws2d4n6wwiavz"))))
(base32 "1vr43sd2dzs4gmiaidr1gpm64fl500k30rlxxq7yj9p3iwk5d3xp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests
@ -270,14 +270,14 @@ and memory usage or network traffic.")
(define-public lxqt-about
(package
(name "lxqt-about")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0xah1qhzr5q20dj637c91bjrv9gy0z65d3jv6pjsp1kz5cwa8gsr"))))
(base32 "08b922gyg4591b399pw0y9zl3gr2627dw20c33abqpl30iq1fmd9"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -305,14 +305,14 @@ LXQt and the system it's running on.")
(define-public lxqt-admin
(package
(name "lxqt-admin")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1bjmarrra43gcnzi8i0g0lcam12hhgr2yi8dji6klmrcp4k67y89"))))
(base32 "1p9959rvj5kh1svv2p9dsfnf008xvrhllcccrsxnk4s8vzjhdqjp"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -343,14 +343,14 @@ the operating system LXQt is running on.")
(define-public lxqt-config
(package
(name "lxqt-config")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0h0n5an1pp3k50g4p2dxymy0lsnsh7m46gb22ndam69hdkflw71y"))))
(base32 "13v9mrp6dswdw9vq39lfpd5cgz2bg74mk2kp1x7zinzqijsn17wj"))))
(build-system cmake-build-system)
(inputs
(list eudev
@ -393,7 +393,7 @@ configuration of both LXQt and the underlying operating system.")
(define-public lxqt-globalkeys
(package
(name "lxqt-globalkeys")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
@ -401,7 +401,7 @@ configuration of both LXQt and the underlying operating system.")
"releases/download/" version "/"
"lxqt-globalkeys-" version ".tar.xz"))
(sha256
(base32 "1s49b8kly027f3amxcf2bx8id3jmmrl8365x7676bd8x2g5v3va2"))))
(base32 "17km7yl5fqwhjy35w700s4rjxf9ann3vv6mw6l4r1cf7pvzmxhy7"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -423,14 +423,14 @@ as a whole and are not limited to distinct applications.")
(define-public lxqt-notificationd
(package
(name "lxqt-notificationd")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1qlvk12ldqwxskxy283h6yqhn8rp29vynqs1lhwn8byli792nb7y"))))
(base32 "182mjvc17dvavk8vznhgnk6j1lv594bqv4796p2p1f4zdhq6fgm6"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -451,14 +451,14 @@ according to the Desktop Notifications Specification.")
(define-public lxqt-openssh-askpass
(package
(name "lxqt-openssh-askpass")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0w662issh8cagmza881wdrxbngn33w8shp0jvzna1f8pf9g9f7bj"))))
(base32 "014jpyw4sgr63kjqdmksi6fsaz7pm5gkzr17f5rkaadx640ij4m0"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -479,14 +479,14 @@ of other programs.")
(define-public lxqt-panel
(package
(name "lxqt-panel")
(version "1.2.1")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1604rb4yg1lgivvd76gaqb6dvq8bv8xy5f2vzj46prh0rbvhnf2b"))))
(base32 "1lnqiw1rd5m9576rsg7lx8v95nc8krrj35fbi54ipc688na3j6s3"))))
(build-system cmake-build-system)
(inputs
(list alsa-lib
@ -538,14 +538,14 @@ of other programs.")
(define-public lxqt-policykit
(package
(name "lxqt-policykit")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "01wyqhrapim0pzkghr54g0z8drhlmcszwpb6p8qfqds90k1vq6gc"))))
(base32 "051lb4kx29rx3ls3whlrbi83r9z9pdiqwyb1wbni56aqilv0svh0"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -568,14 +568,14 @@ LXQt.")
(define-public lxqt-powermanagement
(package
(name "lxqt-powermanagement")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1b0m3nllfx5fcwpkp73ac7fbw0jn86h90k5y3r674csm46zs3c05"))))
(base32 "17d1wh50pjjzqyxv3w7b4qlc1ym1p16yvbhyah9bzl2825irz9ar"))))
(build-system cmake-build-system)
(inputs
(list kidletime
@ -600,14 +600,14 @@ when laptop batteries are low on power.")
(define-public lxqt-qtplugin
(package
(name "lxqt-qtplugin")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "06cdx4fffggk2wjfpi8zlbkiapmbqq2qsz25cngg4kqznq0kayb3"))))
(base32 "0hdxa9cb39vklx616ywcc7jgipij99p4bd16w0f0cvidh6p1rqhv"))))
(build-system cmake-build-system)
(inputs
(list libdbusmenu-qt
@ -637,14 +637,14 @@ Qt with LXQt.")
(define-public lxqt-runner
(package
(name "lxqt-runner")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0kighmlm9hqmw8h41fbmwqyy8qs06q2bbja6snw8j1a2yvz636qz"))))
(base32 "1916cl12v09x4iqrgvp2dwchy50wa97a0y68q4rdigarpdrp3x7j"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -668,15 +668,14 @@ allows for launching applications or shutting down the system.")
(define-public lxqt-session
(package
(name "lxqt-session")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0rjw3rw6kpaa3csrga005qg5bxmdxfgrnn1qngs2nrny35v97ckl"))
(patches (search-patches "lxqt-session-procps-4.patch"))))
(base32 "0xa5nqiq9mxwfynnw91i4c2cgpmpapl4nxys084nbs7yd88kbm2l"))))
(build-system cmake-build-system)
(inputs
(list eudev
@ -727,14 +726,14 @@ for the LXQt desktop environment.")
(define-public lxqt-sudo
(package
(name "lxqt-sudo")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0lx889bpadgizgca37rwll5hlxnbpqpzxnpscyc35n72vyix8m7k"))))
(base32 "0pqz2pkzwq3af70s90p9x3a8rvlpl2jjb4mnjwgs1wz30cb7jrii"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -757,14 +756,14 @@ permissions of other users including root.")
(define-public lxqt-themes
(package
(name "lxqt-themes")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1w566l7xcqscnx5k4f59c2cp4hb4bf2lvqgd9lvdv7dd43qb848z"))))
(base32 "013mqqjrqpjwm1a2zh97r7mgxyyic2lp1m07kcnbkmf1n9dyqzr1"))))
(build-system cmake-build-system)
(native-inputs
(list lxqt-build-tools))
@ -783,14 +782,14 @@ for LXQt.")
(define-public libfm-qt
(package
(name "libfm-qt")
(version "1.2.1")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "00r35gb4x6fnsv6z6digr3661cwykxn32xq23an1n044v38lry6x"))))
(base32 "1rjrbjw6ixn5yw4r2187xfs7xd6v0j28p7fnjwjnv29lvvzgfm8x"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no tests
@ -814,14 +813,14 @@ components to build desktop file managers which belongs to LXDE.")
(define-public pcmanfm-qt
(package
(name "pcmanfm-qt")
(version "1.2.1")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0nz66b9mv6hqaxf5k3ijaf1694za5nv121y6jfq39db3a1qx7rm5"))))
(base32 "190gfq6sp2z6hs7wy02xw831gdp2sxfrpy6jrhrf0zlfv26f6z3w"))))
(build-system cmake-build-system)
(arguments
(list
@ -874,14 +873,14 @@ manager Compton.")
(define-public lximage-qt
(package
(name "lximage-qt")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0qz40vlps82nzz62w7d9ar43gmzvlk9wqzm8lwga90vip8gb2zkm"))))
(base32 "1zrlzx72zqcnqk1j0slwc2jsaxf71v5y1zhcwgv0n4z5548x3n38"))))
(build-system cmake-build-system)
(inputs
(list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
@ -931,14 +930,14 @@ window manager OpenBox.")
(define-public pavucontrol-qt
(package
(name "pavucontrol-qt")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "19r3wgs18mc0m4l8znwhycf137xcd53119ribwb069g4j6hiyvz3"))))
(base32 "0alxsz9q1lw3jc9qv18w9rc1ggib8x85mk3d7c17nbsvld5wfwmc"))))
(build-system cmake-build-system)
(inputs
(list glib pcre pulseaudio qtbase-5 qtx11extras))
@ -955,14 +954,14 @@ window manager OpenBox.")
(define-public qps
(package
(name "qps")
(version "2.6.0")
(version "2.7.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1i8d11yfcx556cm3jb3j49dmnhizx2zrb7g09xfqdwnqbak3ak9r"))))
(base32 "126zkj9jvjwxrh2fcm9h0c2iq9m5rm5hbkh155swijn2i8airxgx"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -984,14 +983,14 @@ processes currently in existence, much like code{top} or code{ps}.")
(define-public qtermwidget
(package
(name "qtermwidget")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "13781ljapvk8dy0xd31grx43fqvn62msyb8rlnsa2fv893zl7fj4"))))
(base32 "0kl0lmd6np0lka60372sn8xd7l5h67hvy11x4gbf665p5fhsigkl"))))
(build-system cmake-build-system)
(inputs
(list qtbase-5 utf8proc))
@ -1007,14 +1006,14 @@ processes currently in existence, much like code{top} or code{ps}.")
(define-public qterminal
(package
(name "qterminal")
(version "1.2.0")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0px42vvmxf3lgd5wwxl260nm18a46943iiqhhmjb0l4xi5s0lhfr"))))
(base32 "1ibhl51mggf81xhvcmrkbsxl7ls8v0sn74rwhjxw4vqk6r6fhiby"))))
(build-system cmake-build-system)
(inputs
(list qtbase-5 qtx11extras qtermwidget))
@ -1031,14 +1030,14 @@ QTermWidget.")
(define-public screengrab
(package
(name "screengrab")
(version "2.5.0")
(version "2.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/screengrab/releases/download/"
version "/screengrab-" version ".tar.xz"))
(sha256
(base32 "0jqzpx44x2hbl5yvlx7md9zg2qrnchh54lbbmk8nmgrsa2wps9rv"))))
(base32 "0xc004h7i2hnl3jj4p8v6wkqav2v07k1mzdvys3ya171z4ffmc9j"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
@ -1056,14 +1055,14 @@ easily publishing them on internet image hosting services.")
(define-public lxqt-archiver
(package
(name "lxqt-archiver")
(version "0.7.0")
(version "0.8.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0vd4klwmg4rr0z4zilv6djd3mfin73hdf6jpw3fsrn24yncg7kgq"))))
(base32 "096fjx86w413k8z8vhmk44k08d25dmagv6w4gc88hpqq4r81klr9"))))
(build-system cmake-build-system)
(inputs
(list glib json-glib libfm-qt qtbase-5 qtx11extras))

317
gnu/packages/machine-learning.scm
View File

@ -102,6 +102,7 @@
#:use-module (gnu packages statistics)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages web)
@ -3271,7 +3272,7 @@ TensorFlow.js, PyTorch, and MediaPipe.")
(define-public python-pytorch
(package
(name "python-pytorch")
(version "1.12.0")
(version "1.13.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3281,7 +3282,7 @@ TensorFlow.js, PyTorch, and MediaPipe.")
(file-name (git-file-name name version))
(sha256
(base32
"0pdqi91qzgyx947zv4pw2fdj9vpqvdhfzw1ydjd4mpqm8g5njgnz"))
"17yxjzwp4zp75fz7czgz9acijzw7dpyqcza50v8y1x7hfg2gw369"))
(patches (search-patches "python-pytorch-system-libraries.patch"
"python-pytorch-runpath.patch"))
(modules '((guix build utils)))
@ -3301,7 +3302,10 @@ TensorFlow.js, PyTorch, and MediaPipe.")
"gloo" "googletest" "ios-cmake" "NNPACK"
"onnx" "protobuf" "pthreadpool"
"pybind11" "python-enum" "python-peachpy"
"python-six" "tbb" "XNNPACK" "zstd"))))))
"python-six" "tbb" "XNNPACK" "zstd"))
(substitute* "functorch/CMakeLists.txt"
(("\\$\\{_rpath_portable_origin\\}/../torch/lib")
"$ORIGIN/../torch/lib"))))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -3413,50 +3417,283 @@ PyTorch when needed.
Note: currently this package does not provide GPU support.")
(license license:bsd-3)))
(define-public python-pytorch-for-r-torch
(define-public python-pytorch-for-r-torch python-pytorch)
(define-public python-lightning-cloud
(package
(inherit python-pytorch)
(name "python-pytorch")
(version "1.13.1")
(name "python-lightning-cloud")
(version "0.5.34")
(source (origin
(method url-fetch)
(uri (pypi-uri "lightning_cloud" version))
(sha256
(base32
"0mqrhq3s23mn8n4i0q791pshn3dgplp0h9ny0pmmp798q0798dzs"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-click
python-fastapi
python-multipart
python-pyjwt
python-requests
python-rich
python-six
python-urllib3
python-uvicorn
python-websocket-client))
(home-page "https://lightning.ai")
(synopsis "Lightning Cloud command line client")
(description "This package provides a command line interface for Lightning
AI services.")
(license license:asl2.0)))
(define-public python-lightning-utilities
(package
(name "python-lightning-utilities")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "lightning-utilities" version))
(sha256
(base32
"084pn8fizxrcn1699jb8x2jsg4wcx01l65bwxpgnq0kzqp3rapcf"))))
(build-system python-build-system)
(propagated-inputs (list python-importlib-metadata python-packaging
python-typing-extensions))
(native-inputs (list python-coverage))
(home-page "https://github.com/Lightning-AI/utilities")
(synopsis "PyTorch Lightning sample project")
(description "This package provides common Python utilities and GitHub
Actions for the Lightning suite of libraries.")
(license license:asl2.0)))
(define-public python-readchar
(package
(name "python-readchar")
(version "4.0.5")
(source (origin
(method url-fetch)
(uri (pypi-uri "readchar" version))
(sha256
(base32
"09n8vl2jjbnbnrzfvkynijrnwrqvc91bb2267zg8r261sz15d908"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
;; This one file requires the msvcrt module, which we don't have.
(add-after 'unpack 'delete-windows-file
(lambda _
(delete-file "readchar/_win_read.py"))))))
(propagated-inputs (list python-setuptools))
(home-page "https://github.com/magmax/python-readchar")
(synopsis "Library to easily read single chars and key strokes")
(description "This package provides a Python library to easily read single
characters and key strokes.")
(license license:expat)))
(define-public python-inquirer
(package
(name "python-inquirer")
(version "3.1.3")
;; Pypi has no tests.
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pytorch/pytorch")
(commit (string-append "v" version))
(recursive? #t)))
(url "https://github.com/magmax/python-inquirer")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"17yxjzwp4zp75fz7czgz9acijzw7dpyqcza50v8y1x7hfg2gw369"))
(patches (search-patches "python-pytorch-system-libraries.patch"
"python-pytorch-runpath.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; XXX: Let's be clear: this package is a bundling fest. We
;; delete as much as we can, but there's still a lot left.
(for-each (lambda (directory)
(delete-file-recursively
(string-append "third_party/" directory)))
'("benchmark" "cpuinfo" "eigen"
"0kp6a0535n9ra5sk8bmb5qvhrv0fbn1zawydi0fkb7104jqcfrzc"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-blessed python-editor python-readchar))
(native-inputs
(list python-poetry-core python-pexpect python-pytest))
(home-page "https://github.com/magmax/python-inquirer")
(synopsis "Collection of common interactive command line user interfaces")
(description
"Inquirer should ease the process of asking end user questions, parsing,
validating answers, managing hierarchical prompts and providing error
feedback.")
(license license:expat)))
;; FIXME: QNNPACK (of which XNNPACK is a fork)
;; needs these.
;; "FP16" "FXdiv" "gemmlowp" "psimd"
(define-public python-pytorch-lightning
(package
(name "python-pytorch-lightning")
(version "2.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Lightning-AI/lightning")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1w4lajiql4y5nnhqf6i5wii1mrwnhp5f4bzbwdzb5zz0d0lysb1i"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list "-m" "not cloud and not tpu" "tests/tests_pytorch"
;; we don't have onnxruntime
"--ignore=tests/tests_pytorch/models/test_onnx.py"
"gloo" "googletest" "ios-cmake" "NNPACK"
"onnx" "protobuf" "pthreadpool"
"pybind11" "python-enum" "python-peachpy"
"python-six" "tbb" "XNNPACK" "zstd"))
(substitute* "functorch/CMakeLists.txt"
(("\\$\\{_rpath_portable_origin\\}/../torch/lib")
"$ORIGIN/../torch/lib"))))))))
;; We don't have tensorboard, so we skip all those tests that
;; require it for logging.
"--ignore=tests/tests_pytorch/checkpointing/test_model_checkpoint.py"
"--ignore=tests/tests_pytorch/loggers/test_all.py"
"--ignore=tests/tests_pytorch/loggers/test_logger.py"
"--ignore=tests/tests_pytorch/loggers/test_tensorboard.py"
"--ignore=tests/tests_pytorch/models/test_cpu.py"
"--ignore=tests/tests_pytorch/models/test_hparams.py"
"--ignore=tests/tests_pytorch/models/test_restore.py"
"--ignore=tests/tests_pytorch/profilers/test_profiler.py"
"--ignore=tests/tests_pytorch/trainer/flags/test_fast_dev_run.py"
"--ignore=tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py"
"--ignore=tests/tests_pytorch/trainer/logging_/test_train_loop_logging.py"
"--ignore=tests/tests_pytorch/trainer/properties/test_loggers.py"
"--ignore=tests/tests_pytorch/trainer/properties/test_log_dir.py"
"--ignore=tests/tests_pytorch/trainer/test_trainer.py"
;; This needs internet access
"--ignore=tests/tests_pytorch/helpers/test_models.py"
"--ignore=tests/tests_pytorch/helpers/test_datasets.py"
"--ignore=tests/tests_pytorch/helpers/datasets.py"
;; We have no legacy checkpoints
"--ignore=tests/tests_pytorch/checkpointing/test_legacy_checkpoints.py"
;; TypeError: _FlakyPlugin._make_test_flaky() got an unexpected keyword argument 'reruns'
"--ignore=tests/tests_pytorch/models/test_amp.py"
"--ignore=tests/tests_pytorch/profilers/test_profiler.py"
"--ignore=tests/tests_pytorch/graveyard/test_legacy_import_unpickler.py"
"-k"
(string-append
;; We don't have tensorboard
"not test_property_logger"
" and not test_cli_logger_shorthand"
;; Something wrong with Flaky
" and not test_servable_module_validator_with_trainer"))
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'patch-version-detection
(lambda _
;; We do have pytorch 1.13.1, but the version comparison fails.
(substitute* "src/lightning/fabric/utilities/imports.py"
(("_TORCH_GREATER_EQUAL_1_13 =.*")
"_TORCH_GREATER_EQUAL_1_13 = True\n"))))
(add-before 'build 'pre-build
(lambda _ (setenv "PACKAGE_NAME" "lightning")))
(add-after 'install 'pre-build-pytorch
(lambda _
;; pyproject-build-system only tolerates unicycles.
(for-each delete-file (find-files "dist" "\\.whl"))
(setenv "PACKAGE_NAME" "pytorch")))
(add-after 'pre-build-pytorch 'build-pytorch
(assoc-ref %standard-phases 'build))
(add-after 'build-pytorch 'install-pytorch
(assoc-ref %standard-phases 'install))
(add-before 'check 'pre-check
(lambda _
;; We don't have Tensorboard
(substitute* "tests/tests_pytorch/test_cli.py"
((" TensorBoardLogger\\(\".\"\\)") "")))))))
(propagated-inputs
(list python-arrow
python-beautifulsoup4
python-croniter
python-dateutils
python-deepdiff
python-fastapi-for-pytorch-lightning
python-fsspec
python-inquirer
python-jsonargparse
python-lightning-cloud
python-lightning-utilities
python-numpy
python-packaging
python-pytorch
python-pyyaml
python-starsessions-for-pytorch-lightning
python-torchmetrics
python-torchvision
python-tqdm
python-traitlets
python-typing-extensions))
(native-inputs
(list python-aiohttp
python-cloudpickle
python-coverage
python-flaky
python-pympler
python-pytest
python-psutil
python-requests-mock
python-scikit-learn))
(home-page "https://lightning.ai/")
(synopsis "Deep learning framework to train, deploy, and ship AI products")
(description
"PyTorch Lightning is just organized PyTorch; Lightning disentangles
PyTorch code to decouple the science from the engineering.")
(license license:asl2.0)))
(define-public python-torchmetrics
(package
(name "python-torchmetrics")
(version "0.11.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "torchmetrics" version))
(sha256
(base32
"150lcy6c20n42rwxl4d3m1b8s4js9ddds5wh3685vmjdnha5mr0z"))))
(build-system pyproject-build-system)
(propagated-inputs
(list python-numpy python-packaging python-pytorch
python-typing-extensions))
(native-inputs
(list python-cloudpickle
python-coverage
python-fire
python-mir-eval
python-mypy
python-pandas
python-psutil
python-pytest
python-pytest-cov
python-pytest-doctestplus
python-pytest-rerunfailures
python-pytest-timeout
python-requests
python-scikit-image
python-scikit-learn
python-scipy
python-types-protobuf
python-types-setuptools))
(home-page "https://github.com/Lightning-AI/metrics")
(synopsis "Machine learning metrics for PyTorch applications")
(description "TorchMetrics is a collection of 100+ PyTorch metrics
implementations and an easy-to-use API to create custom metrics. It offers:
@itemize
@item A standardized interface to increase reproducibility
@item Reduces boilerplate
@item Automatic accumulation over batches
@item Metrics optimized for distributed-training
@item Automatic synchronization between multiple devices
@end itemize
")
(license license:asl2.0)))
;; Keep this in sync with python-pytorch
(define-public python-torchvision
(package
(name "python-torchvision")
(version "0.13.0")
(version "0.15.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3466,17 +3703,11 @@ Note: currently this package does not provide GPU support.")
(file-name (git-file-name name version))
(sha256
(base32
"19f6s3ffwkdvjjbvib18c8n7vhysg58smxzq3rvii1c0z4g3b0cw"))))
(build-system python-build-system)
"1cq2s13vkgg9rljjbrm4g33yxq7q5zqp7f4xm5cq624gvs0wxmi8"))))
(build-system pyproject-build-system)
(arguments
`(#:tests? #false ;the test suite is expensive and there is no easy way
;to subset it.
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(list #:tests? #false)) ;the test suite is expensive and there is no easy
;way to subset it.
(inputs
(list libpng
libjpeg-turbo))

7
gnu/packages/mail.scm
View File

@ -1873,9 +1873,13 @@ addons which can add many functionalities to the base client.")
(bin (string-append out "/bin"))
(doc (string-append out "/share/doc/msmtp"))
(msmtpq "scripts/msmtpq")
(msmtpqueue "scripts/msmtpqueue")
(vimfiles (string-append out "/share/vim/vimfiles/syntax")))
(install-file (string-append msmtpq "/msmtpq") bin)
(install-file (string-append msmtpq "/msmtp-queue") bin)
(install-file (string-append msmtpqueue "/msmtp-enqueue.sh") bin)
(install-file (string-append msmtpqueue "/msmtp-listqueue.sh") bin)
(install-file (string-append msmtpqueue "/msmtp-runqueue.sh") bin)
(install-file (string-append msmtpq "/README.msmtpq") doc)
(install-file "scripts/vim/msmtp.vim" vimfiles)))))))
(properties
@ -3260,7 +3264,7 @@ to esoteric or niche requirements.")
(inputs
`(("libressl" ,libressl)
("libevent" ,libevent)
("mysql" ,mysql)
("mysql" ,mariadb "dev")
("opensmtpd" ,opensmtpd)
("postgresql" ,postgresql)
("python" ,python-2)
@ -4129,6 +4133,7 @@ It is a replacement for the @command{urlview} program.")
guile-email
guile-fibers
guile-gcrypt
guile-gnutls
guile-json-4
guile-kolam
guile-redis

12
gnu/packages/markup.scm
View File

@ -310,19 +310,25 @@ GitHub cmark fork (@code{cmark-gfm}).")
(define-public python-markdownify
(package
(name "python-markdownify")
(version "0.10.1")
(version "0.11.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "markdownify" version))
(sha256
(base32
"0msvrsgq9jigbgg7r7iq7ql5bgslmbxd8sq0nmpbxrjwqypgs7w2"))))
"1zlvwiapcvzaz7nmviffz3q147h1skf2amh83npqwk4z1h7296q0"))))
(build-system python-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests? (invoke "pytest" "-v" "tests")))))))
(native-inputs
(list python-pytest))
(propagated-inputs
(list python-flake8 python-beautifulsoup4 python-six))
(list python-beautifulsoup4 python-six))
(home-page
"https://github.com/matthewwithanm/python-markdownify")
(synopsis "Converts HTML to Markdown")

168
gnu/packages/maths.scm
View File

@ -34,7 +34,7 @@
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020–2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2020–2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
@ -4510,9 +4510,7 @@ full text searching.")
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; no test target
(inputs
`(("openblas" ,openblas)
("lapack" ,lapack)
("arpack" ,arpack-ng)))
(list openblas lapack arpack-ng))
(home-page "https://arma.sourceforge.net/")
(synopsis "C++ linear algebra library")
(description
@ -5756,12 +5754,14 @@ set.")
python-breathe
python-sphinx
(texlive-updmap.cfg (list texlive-adjustbox
texlive-alphalph
texlive-amsfonts
texlive-bibtex
texlive-capt-of
texlive-caption
texlive-cm
texlive-courier
texlive-enumitem
texlive-etoolbox
texlive-fancyhdr
texlive-fancyvrb
@ -6795,7 +6795,7 @@ linear algebra primitives specifically targeting graph analytics.")
(define-public dune-common
(package
(name "dune-common")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method url-fetch)
@ -6803,7 +6803,8 @@ linear algebra primitives specifically targeting graph analytics.")
version "/dune-common-" version ".tar.gz"))
(sha256
(base32
"0sidwdkyrrqjkqhpvrlc991pzi5xzlvxk91s2n7qk3widwy7fch2"))))
"04pzk8q0bibci8z5xlwndhh3y3vs63mw7kad62lbzfwrr5121hrd"))
(patches (search-patches "dune-common-skip-failing-tests.patch"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -6832,7 +6833,7 @@ Differences} (FD).")
(define-public dune-geometry
(package
(name "dune-geometry")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method url-fetch)
@ -6840,7 +6841,7 @@ Differences} (FD).")
version "/dune-geometry-" version ".tar.gz"))
(sha256
(base32
"068mh3fd110xl27rwxqlqy4d9cpqw2vqm2pzfrripiaqscb3byfy"))))
"1bl1abipcf7zysmyyy2ikfx0nip55kasrb1bbkh11ghdilxrwwqy"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -6873,7 +6874,7 @@ This package contains the basic DUNE geometry classes.")
(define-public dune-uggrid
(package
(name "dune-uggrid")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method git-fetch)
@ -6883,7 +6884,7 @@ This package contains the basic DUNE geometry classes.")
(file-name (git-file-name name version))
(sha256
(base32
"11qz52g9d5k96fqik2lyi80xryw174rnny074pj70ardl6zzz83p"))))
"1xwmiabb25nydi0yzhd64vq6fm3razix6k87afhq88q0ywzll65x"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -6913,7 +6914,7 @@ This package contains the DUNE UG grid classes.")
(define-public dune-grid
(package
(name "dune-grid")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method url-fetch)
@ -6921,7 +6922,9 @@ This package contains the DUNE UG grid classes.")
version "/dune-grid-" version ".tar.gz"))
(sha256
(base32
"15iws03hkbmr4a4rqqb0rriz1m8szl96wdr7gw0jmrcnlzbdbbx5"))))
"17l2vlr8q3rfifxv80r3jlzamx478xn0vfjkrl3ns1akk7miycq8"))
(patches (search-patches
"dune-grid-add-missing-include-cassert.patch"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -6959,7 +6962,7 @@ This package contains the basic DUNE grid classes.")
(define-public dune-istl
(package
(name "dune-istl")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method url-fetch)
@ -6967,7 +6970,8 @@ This package contains the basic DUNE grid classes.")
version "/dune-istl-" version ".tar.gz"))
(sha256
(base32
"1cy69s1266hvnh8blznlvvkrf8i2g640rc3mf7kp872wgvdz4nb9"))))
"0smghqr400xl84j0laabgwaj2p5jlj3n3s85bm7qp9m2vjz6rav6"))
(patches (search-patches "dune-istl-fix-solver-playground.patch"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -7020,7 +7024,7 @@ aggregation-based algebraic multigrid.")
(define-public dune-localfunctions
(package
(name "dune-localfunctions")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method url-fetch)
@ -7028,7 +7032,7 @@ aggregation-based algebraic multigrid.")
version "/dune-localfunctions-" version ".tar.gz"))
(sha256
(base32
"031i42anrhi0ngpvp42rdjbkic7v3008fwild9xg7flffwvnpshg"))))
"02zl49q40ifmic221fxlhi8zj9pybdyjavzvgn1zwh636ysgjbsp"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -7076,78 +7080,76 @@ assemble global function spaces on finite-element grids.")
(license license:gpl2)))
(define-public dune-alugrid
;; This was the last commit on the releases/2.7 branch as of 2021-12-17,
;; unfortunately there was no tag for any 2.7 release.
(let ((commit "51bde29a2dfa7cfac4fb73d40ffd42b9c1eb1d3d"))
(package
(name "dune-alugrid")
(version (git-version "2.7.1" "0" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.dune-project.org/extensions/dune-alugrid.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0z16wg6llzxs7vjg2yilg31vwnkz8k050j6bspg3blbym0razy15"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-include
(lambda _
(substitute* "dune/alugrid/test/test-alugrid.cc"
(("doc/grids/gridfactory/testgrids")
"doc/dune-grid/grids/gridfactory/testgrids"))
#t))
(add-after 'build 'build-tests
(lambda* (#:key inputs make-flags parallel-build? #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "dune-grid") "/share"))
(apply invoke "make" "build_tests"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))))
(inputs
(list dune-common
dune-geometry
dune-grid
;; Optional
metis
openblas
python
superlu
gmp
zlib))
(native-inputs
(list gfortran pkg-config))
(home-page "https://dune-project.org/")
(synopsis "Distributed and Unified Numerics Environment")
(description "ALUGrid is an adaptive, loadbalancing, unstructured
(package
(name "dune-alugrid")
(version "2.9.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.dune-project.org/extensions/dune-alugrid.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0s41jinsfpm56nx41vkmyv3y9n072ssw9hxjm7di64zcszgpjmzd"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-include
(lambda _
(substitute* "dune/alugrid/test/test-alugrid.cc"
(("doc/grids/gridfactory/testgrids")
"doc/dune-grid/grids/gridfactory/testgrids"))
#t))
(add-after 'build 'build-tests
(lambda* (#:key inputs make-flags parallel-build? #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "dune-grid") "/share"))
(apply invoke "make" "build_tests"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))))
(inputs
(list dune-common
dune-geometry
dune-grid
;; Optional
metis
openblas
python
superlu
gmp
zlib))
(native-inputs
(list gfortran pkg-config))
(home-page "https://dune-project.org/")
(synopsis "Distributed and Unified Numerics Environment")
(description "ALUGrid is an adaptive, loadbalancing, unstructured
implementation of the DUNE grid interface supporting either simplices or
cubes.")
(license license:gpl2+))))
(license license:gpl2+)))
(define-public dune-subgrid
;; This was the last commit on the releases/2.7 branch as of 2021-12-17.
;; Unfortunately the dune-subgrid repository contains no release tags.
(let ((commit "45d1ee9f3f711e209695deee97912f4954f7f280"))
; dune-subgrid does not tag its releases.
; The following commit is a few commits past the releases/2.9 branch
; to include some additional commits fixing compatibility with dune-uggrid.
(let ((commit "e83f3f919c2602425467ed767f279bc9c356c436"))
(package
(name "dune-subgrid")
(version (git-version "2.7.1" "0" commit))
(version (git-version "2.9.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid")
(url "https://gitlab.dune-project.org/extensions/dune-subgrid")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0xjf7865wil7kzym608kv3nc3ff3m3nlqich4k9wjyvy3lz6panh"))))
"1dv4zg5j17bldpgg02ycg9fbfmnc1kffixgzbkkz86f2dmwgh2b6"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -7180,7 +7182,7 @@ provides the full grid interface including adaptive mesh refinement.")
(define-public dune-typetree
(package
(name "dune-typetree")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method git-fetch)
@ -7190,7 +7192,7 @@ provides the full grid interface including adaptive mesh refinement.")
(file-name (git-file-name name version))
(sha256
(base32
"1kx9k8i7pdw6l6ny6nq85v5p1nd6yxldzaj8k3nizaz3q1j407pv"))))
"1qcnl8giivnn8zprszdwrqw4q29sv3c2pr8dlrz616j10i4r8p18"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -7222,7 +7224,7 @@ operating on statically typed trees of objects.")
(define-public dune-functions
(package
(name "dune-functions")
(version "2.7.1")
(version "2.9.0")
(source
(origin
(method git-fetch)
@ -7232,7 +7234,7 @@ operating on statically typed trees of objects.")
(file-name (git-file-name name version))
(sha256
(base32
"04dhr4asnl38bf1gp8hrk31maav33m7q71lhl2n5yk1q1x6i77nw"))))
"0pmi9vk0pdq9qp3xvknsndg8l6f2xkjr1rwbfbzsl9aj0qv9rn2p"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -7273,12 +7275,12 @@ implemented as callable objects, and bases of finite element spaces.")
(license (list license:lgpl3+ license:gpl2))))
(define-public dune-pdelab
;; This was the last commit on the releases/2.7 branch as of 2021-12-17,
;; unfortunately there was no tag for any 2.7 release.
(let ((commit "09aef74d95661d18a7789d2f517ae77797eec738"))
;; This was the last commit on the releases/2.8 branch as of 2023-04-12,
;; unfortunately there was no tag for any 2.8 release.
(let ((commit "d5dddb6b1c21b95e867ff53cca159ad676689f5c"))
(package
(name "dune-pdelab")
(version (git-version "2.7.1" "0" commit))
(version (git-version "2.8.0" "0" commit))
(source
(origin
(method git-fetch)
@ -7288,7 +7290,7 @@ implemented as callable objects, and bases of finite element spaces.")
(file-name (git-file-name name version))
(sha256
(base32
"0nv69ayr4gln9m1s94z9zkrxqi8nzar3z6awnvgqz595nmjf82ac"))))
"0l2idjp59a6x46vdd30xhhsnv7chql0z7msdsyra2h6pqm6xiqxk"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled
(inputs

4
gnu/packages/mc.scm
View File

@ -38,14 +38,14 @@
(define-public mc
(package
(name "mc")
(version "4.8.27")
(version "4.8.29")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.osuosl.org/pub/midnightcommander/mc-"
version ".tar.xz"))
(sha256
(base32 "1x2g5ahgzg951y4ldbsgkv8icni2mgh3p2wsds0j16gsbwi5kgii"))))
(base32 "1m0aai4paxpcf3lw1dd94zyxc7wd0ysmfwpibg50q62q9yws7n01"))))
(build-system gnu-build-system)
(native-inputs (list perl pkg-config))
(inputs (list aspell

112
gnu/packages/node-xyz.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2021 Charles <charles.b.jackson@protonmail.com>
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Jelle Licht <jlicht@fsfe.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -46,11 +47,59 @@
(base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa"))))
(build-system node-build-system)
(arguments
'(#:phases
'(#:tests? #f
#:modules
((guix build node-build-system)
(srfi srfi-1)
(ice-9 match)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "acorn"))))))
(chdir "acorn")))
(add-before 'configure 'avoid-prepare-scripts
(lambda _
;; We need to remove the prepare script from "package.json", as
;; it would try to use the build environment and would block the
;; automatic building by other packages making use of node-acorn.
;; TODO: Add utility function
(with-atomic-json-file-replacement "package.json"
(match-lambda
(('@ . pkg-meta-alist)
(cons '@ (map (match-lambda
(("scripts" @ . scripts-alist)
`("scripts" @ ,@(filter (match-lambda
(("prepare" . _)
#f)
(_
#t))
scripts-alist)))
(other other))
pkg-meta-alist)))))))
(replace 'build
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((esbuild (search-input-file (or native-inputs inputs)
"/bin/esbuild")))
(invoke esbuild
"src/index.js"
"--outfile=dist/acorn.js"
"--format=cjs"
"--bundle"
"--platform=node")
(invoke esbuild
"src/index.js"
"--outfile=dist/acorn.mjs"
"--format=esm"
"--bundle"
"--platform=node")
(invoke esbuild
"src/bin/acorn.js"
"--outfile=dist/bin.js"
"--format=cjs"
"--platform=node")))))))
(native-inputs
(list esbuild))
(home-page "https://github.com/acornjs/acorn/tree/master/acorn")
(synopsis "Javascript-based Javascript parser")
(description "Acornjs is a Javascript parser with many options and an
@ -74,10 +123,9 @@ architecture supporting plugins.")
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("tap")))))))
(home-page "https://github.com/brianloveswords/buffer-crc32")
(synopsis "CRC32 implementation in Javascript")
(description
@ -131,10 +179,16 @@ and fancy character sets, signed or unsigned data and has tests, for Node.")
(substitute* "lib/configuration.js"
(("mri")
"minimist"))))
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("c8"
"docdash"
"eslint"
"eslint-plugin-jsdoc"
"jsdoc"
"tap-diff"
"tape"
"tape-catch")))))))
(inputs (list node-minimist node-pbf node-yazl))
(home-page "https://github.com/ahwayakchih/crx3")
(synopsis "Create CRXv3 browser extensions with Javascript")
@ -259,10 +313,9 @@ random number generator.")
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("covert" "tap" "tape")))))))
(home-page "https://github.com/substack/minimist")
(synopsis "Parse CLI arguments in Javascript")
(description "This package can scan for CLI flags and arguments in
@ -311,10 +364,19 @@ while being as light-weight and simple as possible.")
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies
'("benchmark"
"browserify"
"eslint"
"eslint-config-mourner"
"mkdirp"
"protobufjs"
"protocol-buffers"
"tap"
"tile-stats-runner"
"uglify-js")))))))
(inputs (list node-ieee754 node-resolve-protobuf-schema))
(home-page "https://github.com/mapbox/pbf")
(synopsis "Decode and encode protocol buffers in Javascript")
@ -343,10 +405,9 @@ code.")
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("standard" "tape")))))))
(home-page "https://github.com/mafintosh/protocol-buffers-schema")
(synopsis "Protocol buffers schema parser written in Javascript")
(description "This package provides a protocol buffers schema parser
@ -370,10 +431,9 @@ written in Javascript.")
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("standard" "tape")))))))
(inputs (list node-protocol-buffers-schema))
(home-page "https://github.com/mafintosh/resolve-protobuf-schema")
(synopsis "Resolve protobuf imports")
@ -563,10 +623,9 @@ if desired.")
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("airtap" "standard" "tape")))))))
(home-page "https://github.com/feross/ieee754")
(synopsis "Read/write IEEE754 floating point numbers in Javascript")
(description "This package can read and write IEEE754 floating point
@ -1325,6 +1384,8 @@ after a (configurable) newline delimiter is received.")))
(_
#t))
scripts-alist)))
(("gypfile" . _)
'("gypfile" . #f))
(other
other))
pkg-meta-alist))))))))
@ -1529,10 +1590,9 @@ default set of parsers and bindings.")))
(arguments
'(#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'configure
(add-after 'patch-dependencies 'delete-dependencies
(lambda _
(invoke "npm" "--offline" "--ignore-scripts" "install"
"--production"))))))
(delete-dependencies '("airtap" "bl" "istanbul" "yauzl")))))))
(inputs (list node-buffer-crc32))
(home-page "https://github.com/thejoshwolfe/yazl")
(synopsis "Yet another zip library for node")

57
gnu/packages/node.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@ -668,7 +669,7 @@ parser definition into a C output.")
(define-public llhttp-bootstrap
(package
(name "llhttp")
(version "2.1.4")
(version "6.0.10")
(source (origin
(method git-fetch)
(uri (git-reference
@ -677,8 +678,7 @@ parser definition into a C output.")
(file-name (git-file-name name version))
(sha256
(base32
"115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x"))
(patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch"))
"0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8"))
(modules '((guix build utils)))
(snippet
'(begin
@ -738,23 +738,28 @@ source files.")
(define-public node-lts
(package
(inherit node)
(version "14.19.3")
(version "18.16.0")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
"/node-v" version ".tar.gz"))
(sha256
(base32
"15691j5zhiikyamiwwd7f282g6d9acfhq91nrwx54xya38gmpx2w"))
"0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva"))
(modules '((guix build utils)))
(snippet
`(begin
;; openssl.cnf is required for build.
(for-each delete-file-recursively
(find-files "deps/openssl"
(lambda (file stat)
(if (string-contains file "nodejs-openssl.cnf")
#f #t))))
;; Remove bundled software, where possible
(for-each delete-file-recursively
'("deps/cares"
"deps/icu-small"
"deps/nghttp2"
"deps/openssl"
"deps/zlib"))
(substitute* "Makefile"
;; Remove references to bundled software.
@ -770,7 +775,9 @@ source files.")
"--shared-openssl"
"--shared-zlib"
"--shared-brotli"
"--with-intl=system-icu"))
"--with-intl=system-icu"
;;Needed for correct snapshot checksums
"--v8-enable-snapshot-compression"))
((#:phases phases)
`(modify-phases ,phases
(replace 'set-bootstrap-host-rpath
@ -803,23 +810,31 @@ source files.")
libuv "/lib:"
zlib "/lib"
"'],"))))))
(add-after 'patch-hardcoded-program-references
'patch-additional-hardcoded-program-references
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "test/parallel/test-stdin-from-file-spawn.js"
(("'/bin/sh'") (string-append
"'" (search-input-file inputs "/bin/sh")
"'")))))
(replace 'delete-problematic-tests
(lambda* (#:key inputs #:allow-other-keys)
;; FIXME: These tests fail in the build container, but they don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
'("test/parallel/test-cluster-master-error.js"
"test/parallel/test-cluster-master-kill.js"))
'("test/parallel/test-cluster-primary-error.js"
"test/parallel/test-cluster-primary-kill.js"))
;; These require a DNS resolver.
(for-each delete-file
'("test/parallel/test-dns.js"
"test/parallel/test-dns-lookupService-promises.js"))
"test/parallel/test-dns-lookupService-promises.js"
"test/parallel/test-net-socket-connect-without-cb.js"
"test/parallel/test-tcp-wrap-listen.js"))
;; These tests require networking.
(for-each delete-file
'("test/parallel/test-https-agent-unref-socket.js"
"test/parallel/test-corepack-yarn-install.js"))
'("test/parallel/test-https-agent-unref-socket.js"))
;; This test is timing-sensitive, and fails sporadically on
;; slow, busy, or even very fast machines.
@ -867,9 +882,9 @@ source files.")
c-ares-for-node
brotli
icu4c
libuv-for-node
`(,nghttp2-for-node "lib")
openssl-1.1
libuv
`(,nghttp2 "lib")
openssl
zlib
;; Regular build-time dependencies.
perl
@ -882,18 +897,18 @@ source files.")
coreutils
c-ares-for-node
icu4c
libuv-for-node
libuv
llhttp-bootstrap
brotli
`(,nghttp2-for-node "lib")
openssl-1.1
`(,nghttp2 "lib")
openssl
zlib))))
(define-public libnode
(package/inherit node
(package/inherit node-lts
(name "libnode")
(arguments
(substitute-keyword-arguments (package-arguments node)
(substitute-keyword-arguments (package-arguments node-lts)
((#:configure-flags flags ''())
`(cons* "--shared" "--without-npm" ,flags))
((#:phases phases '%standard-phases)

5
gnu/packages/nss.scm
View File

@ -103,8 +103,9 @@ in the Mozilla clients.")
(define-public nss
(package
(name "nss")
;; Also update and test the nss-certs package, which duplicates version and
;; source to avoid a top-level variable reference & module cycle.
;; IMPORTANT: Also update and test the nss-certs package, which duplicates
;; version and source to avoid a top-level variable reference & module
;; cycle.
(version "3.88.1")
(source (origin
(method url-fetch)

7
gnu/packages/openldap.scm
View File

@ -178,14 +178,14 @@ an LDAP server.")
(define-public python-ldap
(package
(name "python-ldap")
(version "3.4.0")
(version "3.4.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-ldap" version))
(sha256
(base32
"04hd7rdm59i7wrykx0nggzxx1p42wkm296j483yy0wayqa7lqik0"))))
"1872bvrakypb96wrsf932f3xflnbqniiyf8h58x48apgl0cwa9mb"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -233,6 +233,7 @@ servers from Python programs.")
(guix build utils))
#:imported-modules `((guix build python-build-system)
,@%gnu-build-system-modules)
#:disallowed-references (list httpd)
#:configure-flags
#~(list "--enable-cmocka"
(string-append "--with-db="
@ -322,7 +323,6 @@ servers from Python programs.")
cracklib
cyrus-sasl
gnutls
httpd
icu4c
iproute
json-c
@ -353,6 +353,7 @@ servers from Python programs.")
cmocka
doxygen
gettext-minimal
httpd
libtool
rsync
pkg-config))

13
gnu/packages/package-management.scm
View File

@ -169,8 +169,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.4.0")
(commit "286cdf0bc55a29d5a63f7191edde7ea4dbd8cf2a")
(revision 5))
(commit "dc5430c9dc20ee53441995d9a89a90b0a86aeed3")
(revision 6))
(package
(name "guix")
@ -186,7 +186,7 @@
(commit commit)))
(sha256
(base32
"1jwi6z1mgp7drl384m40cbdqbv451mbhs2k7iplg7a5l7dg120nz"))
"192jxca7gdf8451kac58fq1f2rxn3624krmhz04bh7ln2sp5q0yd"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -476,6 +476,7 @@ $(prefix)/etc/openrc\n")))
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4)
("guile-lib" ,guile-lib)
("guile-semver" ,guile-semver)
("guile-sqlite3" ,guile-sqlite3)
("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git)
@ -1377,8 +1378,8 @@ environments.")
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator
(let ((commit "6a4e827f304178d3d20c2037b4f1bf62e969ddce")
(revision "79"))
(let ((commit "3f6473c0d296ed6efab1feebcacd76fc597bb6ef")
(revision "81"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@ -1389,7 +1390,7 @@ environments.")
(commit commit)))
(sha256
(base32
"1w4iqmv493rs94dc2h6l3dnhx2513pz1fknzl6a643d2z6bkb7zj"))
"0c2k2v15ga4bdmm74f4h385pwjimvsvrgjzsfd04il9a6r4qg319"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments

76
gnu/packages/pascal.scm
View File

@ -24,6 +24,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
@ -32,9 +33,13 @@
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages compression)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (ice-9 match))
(define %fpc-version "3.2.2")
@ -270,3 +275,74 @@ Pascal source code to C source code, and @command{p2cc}, a compiler for
Pascal programs.")
(home-page "http://users.fred.net/tds/lab/p2c/")
(license license:gpl2+)))
(define-public lazarus
(package
(name "lazarus")
(version "2.2.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://gitlab.com/freepascal.org/lazarus/lazarus.git")
(commit (string-append "lazarus_"
(string-join (string-split version
#\.)
"_")))))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0hpk6fxmy1h1q0df41jg1vnp8g8vynrg5v5ad43lv229nizfs3wj"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;No tests exist
#:make-flags #~(list (string-append "INSTALL_PREFIX="
#$output))
#:phases #~(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((libdirs (map (lambda (x)
(assoc-ref inputs x))
'("glib" "gdk-pixbuf"
"gtk+"
"libx11"
"libx11"
"pango"
"cairo"
"atk")))
(libs (append (map (lambda (name)
(string-append "-Fl"
name
"/lib"))
libdirs)
(map (lambda (name)
(string-append
"-k-rpath=" name
"/lib")) libdirs))))
(setenv "LAZARUS_LIBPATHS"
(string-join libs " "))
(setenv "MAKEFLAGS"
(string-append "LHELP_OPT="
(string-join libs "\\ "))))
(invoke "make" "bigide"))))))
(native-inputs (list fpc pkg-config))
(inputs (list glib
gdk-pixbuf
gtk+-2
libx11
pango
cairo
atk))
(synopsis "Integrated development environment for Pascal")
(description "This package provides an integrated development environment
for Pascal.")
(home-page "https://www.lazarus-ide.org/")
;; Some Android stuff is under asl2.0. Some artwork is under CC-BY-SA-3
;; or CC-BY-SA-4.
;; Some components are under MIT expat.
;; The Freetype components are under Freetype license.
;; A lot of components are under LGPL-2+.
;; synedit and turbopower_ipro are under MPL-1.1
;; PascalScript is under a zlib-like license.
(license (list license:gpl2+ license:lgpl2.0+))))

27
gnu/packages/patches/clitest-grep-compat.patch 100644
View File

@ -0,0 +1,27 @@
Suppress a warning from grep which causes tests to fail.
Taken from upstream pull request:
https://github.com/aureliojargas/clitest/pull/54
diff --git a/test/inline-match-egrep.sh b/test/inline-match-egrep.sh
--- a/test/inline-match-egrep.sh
+++ b/test/inline-match-egrep.sh
@@ -42,7 +42,7 @@ $ printf ' \t \t\t \n' #=> --egrep ^ $
# egrep regexes. You'll need to test in your system if that's the
# case. I recommend using a literal tab to avoid problems.
-$ printf 'may\tfail' #=> --egrep ^may\tfail$
+$ printf 'may\tfail' #=> --egrep ^may\\tfail$
$ printf 'may\tfail' #=> --egrep ^may[\t]fail$
$ printf 'will\tmatch' #=> --egrep ^will match$
@@ -51,7 +51,7 @@ $ printf 'will\tmatch' #=> --egrep ^will match$
# These tests will fail:
$ printf 'will\nfail' #=> --egrep will.*fail
-$ printf 'will\nfail' #=> --egrep will\nfail
+$ printf 'will\nfail' #=> --egrep will\\nfail
# If one line of a multiline results matches, the test is OK

28
gnu/packages/patches/dune-common-skip-failing-tests.patch 100644
View File

@ -0,0 +1,28 @@
Disable tests known to fail on AArch64:
https://gitlab.dune-project.org/core/dune-common/-/issues/262
https://issues.guix.gnu.org/62842
--- a/dune/common/test/eigenvaluestest.cc
+++ b/dune/common/test/eigenvaluestest.cc
@@ -340,20 +340,15 @@
testSymmetricFieldMatrix<double,200>();
testSymmetricFieldMatrix<float,4>();
testSymmetricFieldMatrix<float,200>();
- testSymmetricFieldMatrix<long double,4>();
- testSymmetricFieldMatrix<long double,200>();
#endif // HAVE_LAPACK
testSymmetricFieldMatrix<double,2>();
testSymmetricFieldMatrix<double,3>();
testSymmetricFieldMatrix<float,2>();
testSymmetricFieldMatrix<float,3>();
- testSymmetricFieldMatrix<long double,2>();
- testSymmetricFieldMatrix<long double,3>();
checkMultiplicity<double>();
checkMultiplicity<float>();
- checkMultiplicity<long double>();
return 0;
}

24
gnu/packages/patches/dune-grid-add-missing-include-cassert.patch 100644
View File

@ -0,0 +1,24 @@
From ef843b1a66308247ba4d2e2c116ff5517421a91b Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Tue, 6 Dec 2022 13:39:44 +0100
Subject: [PATCH] Add missing include <cassert>
---
dune/grid/test/yasp/test-yaspgrid-partitioner.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/dune/grid/test/yasp/test-yaspgrid-partitioner.cc b/dune/grid/test/yasp/test-yaspgrid-partitioner.cc
index 93ae042b0..9a4530201 100644
--- a/dune/grid/test/yasp/test-yaspgrid-partitioner.cc
+++ b/dune/grid/test/yasp/test-yaspgrid-partitioner.cc
@@ -6,6 +6,7 @@
#include <config.h>
#include <array>
+#include <cassert>
#include <iostream>
#include <dune/common/filledarray.hh>
--
2.39.2

61
gnu/packages/patches/dune-istl-fix-solver-playground.patch 100644
View File

@ -0,0 +1,61 @@
From fe929f17e98b577171f58ca520b5145be41730ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Thu, 16 Mar 2023 19:48:40 +0100
Subject: [PATCH] Adjust sequential and both parallel cases in
istl-solver-playground
Do same thing, independent of paralellel, distributed, or
sequential.
This fixes the test in the sequential case.
---
src/istl-solver-playground.hh | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/istl-solver-playground.hh b/src/istl-solver-playground.hh
index 0ff3abd5..11693cf5 100644
--- a/src/istl-solver-playground.hh
+++ b/src/istl-solver-playground.hh
@@ -66,7 +66,11 @@ std::shared_ptr<OOCOMM> loadSystem(std::shared_ptr<Mat>& m,
std::shared_ptr<OOCOMM> oocomm;
if(distributed){
oocomm = std::make_shared<OOCOMM>(MPI_COMM_WORLD);
- loadMatrixMarket(*m, matrixfilename, *oocomm);
+ if(matrixfilename != "laplacian"){
+ loadMatrixMarket(*m, matrixfilename, *oocomm);
+ }else{
+ setupLaplacian(*m, config.get("N", 20));
+ }
if(config.get("random_rhs", false)){
rhs->resize(m->N());
srand(42);
@@ -98,16 +102,22 @@ template<class Mat, class Vec>
void loadSystem(std::shared_ptr<Mat>& m,
std::shared_ptr<Vec>& rhs,
const Dune::ParameterTree& config){
- std::string matrixfilename = config.get<std::string>("matrix");
+ // generate Laplacian or load matrix
+ std::string matrixfilename = config.get<std::string>("matrix", "laplacian");
+ if(matrixfilename == "laplacian"){
+ setupLaplacian(*m, config.get("N", 20));
+ }else{
+ loadMatrixMarket(*m, matrixfilename);
+ }
+ // use random values or load right-hand side
std::string rhsfilename;
- if(!config.get("random_rhs", false))
- rhsfilename = config.get<std::string>("rhs");
- loadMatrixMarket(*m, matrixfilename);
if(config.get("random_rhs", false)){
rhs->resize(m->N());
fillRandom(*rhs);
- }else
+ }else{
+ rhsfilename = config.get<std::string>("rhs");
loadMatrixMarket(*rhs, rhsfilename);
+ }
}
#endif
--
2.39.2

287
gnu/packages/patches/git-header-cmd.patch 100644
View File

@ -0,0 +1,287 @@
Add a '--header-cmd' to git send-email.
Upstream status can be tracked at:
https://lore.kernel.org/git/20230423122744.4865-1-maxim.cournoyer@gmail.com/T/#t
diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt
index 51da7088a8..92a9ebe98c 100644
--- a/Documentation/config/sendemail.txt
+++ b/Documentation/config/sendemail.txt
@@ -61,6 +61,7 @@ sendemail.ccCmd::
sendemail.chainReplyTo::
sendemail.envelopeSender::
sendemail.from::
+sendemail.headerCmd::
sendemail.signedoffbycc::
sendemail.smtpPass::
sendemail.suppresscc::
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index b0f438ec99..4d2ae061f9 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -320,6 +320,17 @@ Automating
Output of this command must be single email address per line.
Default is the value of `sendemail.ccCmd` configuration value.
+--header-cmd=<command>::
+ Specify a command that is executed once per outgoing message
+ and output RFC 2822 style header lines to be inserted into
+ them. When the `sendemail.headerCmd` configuration variable is
+ set, its value is always used. When --header-cmd is provided
+ at the command line, its value takes precedence over the
+ `sendemail.headerCmd` configuration variable.
+
+--no-header-cmd::
+ Disable any header command in use.
+
--[no-]chain-reply-to::
If this is set, each email will be sent as a reply to the previous
email sent. If disabled with "--no-chain-reply-to", all emails after
diff --git a/git-send-email.perl b/git-send-email.perl
index 66c9171109..22a64e608f 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -87,8 +87,10 @@ sub usage {
Automating:
--identity <str> * Use the sendemail.<id> options.
- --to-cmd <str> * Email To: via `<str> \$patch_path`
- --cc-cmd <str> * Email Cc: via `<str> \$patch_path`
+ --to-cmd <str> * Email To: via `<str> \$patch_path`.
+ --cc-cmd <str> * Email Cc: via `<str> \$patch_path`.
+ --header-cmd <str> * Add headers via `<str> \$patch_path`.
+ --no-header-cmd * Disable any header command in use.
--suppress-cc <str> * author, self, sob, cc, cccmd, body, bodycc, misc-by, all.
--[no-]cc-cover * Email Cc: addresses in the cover letter.
--[no-]to-cover * Email To: addresses in the cover letter.
@@ -202,7 +204,7 @@ sub format_2822_time {
$author,$sender,$smtp_authpass,$annotate,$compose,$time);
# Things we either get from config, *or* are overridden on the
# command-line.
-my ($no_cc, $no_to, $no_bcc, $no_identity);
+my ($no_cc, $no_to, $no_bcc, $no_identity, $no_header_cmd);
my (@config_to, @getopt_to);
my (@config_cc, @getopt_cc);
my (@config_bcc, @getopt_bcc);
@@ -269,7 +271,7 @@ sub do_edit {
# Variables with corresponding config settings
my ($suppress_from, $signed_off_by_cc);
my ($cover_cc, $cover_to);
-my ($to_cmd, $cc_cmd);
+my ($to_cmd, $cc_cmd, $header_cmd);
my ($smtp_server, $smtp_server_port, @smtp_server_options);
my ($smtp_authuser, $smtp_encryption, $smtp_ssl_cert_path);
my ($batch_size, $relogin_delay);
@@ -318,6 +320,7 @@ sub do_edit {
"tocmd" => \$to_cmd,
"cc" => \@config_cc,
"cccmd" => \$cc_cmd,
+ "headercmd" => \$header_cmd,
"aliasfiletype" => \$aliasfiletype,
"bcc" => \@config_bcc,
"suppresscc" => \@suppress_cc,
@@ -519,6 +522,8 @@ sub config_regexp {
"compose" => \$compose,
"quiet" => \$quiet,
"cc-cmd=s" => \$cc_cmd,
+ "header-cmd=s" => \$header_cmd,
+ "no-header-cmd" => \$no_header_cmd,
"suppress-from!" => \$suppress_from,
"no-suppress-from" => sub {$suppress_from = 0},
"suppress-cc=s" => \@suppress_cc,
@@ -1780,16 +1785,16 @@ sub process_file {
$subject = $initial_subject;
$message = "";
$message_num++;
- # First unfold multiline header fields
+ # Retrieve and unfold header fields.
+ my @header_lines = ();
while(<$fh>) {
last if /^\s*$/;
- if (/^\s+\S/ and @header) {
- chomp($header[$#header]);
- s/^\s+/ /;
- $header[$#header] .= $_;
- } else {
- push(@header, $_);
- }
+ push(@header_lines, $_);
+ }
+ @header = unfold_headers(@header_lines);
+ # Add computed headers, if applicable.
+ unless ($no_header_cmd || ! $header_cmd) {
+ push @header, invoke_header_cmd($header_cmd, $t);
}
# Now parse the header
foreach(@header) {
@@ -2021,15 +2026,63 @@ sub process_file {
}
}
+# Execute a command and return its output lines as an array. Blank
+# lines which do not appear at the end of the output are reported as
+# errors.
+sub execute_cmd {
+ my ($prefix, $cmd, $file) = @_;
+ my @lines = ();
+ my $seen_blank_line = 0;
+ open my $fh, "-|", "$cmd \Q$file\E"
+ or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
+ while (my $line = <$fh>) {
+ die sprintf(__("(%s) Malformed output from '%s'"), $prefix, $cmd)
+ if $seen_blank_line;
+ if ($line =~ /^$/) {
+ $seen_blank_line = $line =~ /^$/;
+ next;
+ }
+ push @lines, $line;
+ }
+ close $fh
+ or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
+ return @lines;
+}
+
+# Process headers lines, unfolding multiline headers as defined by RFC
+# 2822.
+sub unfold_headers {
+ my @headers;
+ foreach(@_) {
+ last if /^\s*$/;
+ if (/^\s+\S/ and @headers) {
+ chomp($headers[$#headers]);
+ s/^\s+/ /;
+ $headers[$#headers] .= $_;
+ } else {
+ push(@headers, $_);
+ }
+ }
+ return @headers;
+}
+
+# Invoke the provided CMD with FILE as an argument, which should
+# output RFC 2822 email headers. Fold multiline headers and return the
+# headers as an array.
+sub invoke_header_cmd {
+ my ($cmd, $file) = @_;
+ my @lines = execute_cmd("header-cmd", $header_cmd, $file);
+ return unfold_headers(@lines);
+}
+
# Execute a command (e.g. $to_cmd) to get a list of email addresses
# and return a results array
sub recipients_cmd {
my ($prefix, $what, $cmd, $file) = @_;
-
+ my @lines = ();
my @addresses = ();
- open my $fh, "-|", "$cmd \Q$file\E"
- or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
- while (my $address = <$fh>) {
+ @lines = execute_cmd($prefix, $cmd, $file);
+ for my $address (@lines) {
$address =~ s/^\s*//g;
$address =~ s/\s*$//g;
$address = sanitize_address($address);
@@ -2038,8 +2091,6 @@ sub recipients_cmd {
printf(__("(%s) Adding %s: %s from: '%s'\n"),
$prefix, $what, $address, $cmd) unless $quiet;
}
- close $fh
- or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
return @addresses;
}
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 6520346246..6519eea1ed 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -374,13 +374,16 @@ test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email'
)
'
-test_expect_success $PREREQ 'setup tocmd and cccmd scripts' '
+test_expect_success $PREREQ 'setup cmd scripts' '
write_script tocmd-sed <<-\EOF &&
sed -n -e "s/^tocmd--//p" "$1"
EOF
- write_script cccmd-sed <<-\EOF
+ write_script cccmd-sed <<-\EOF &&
sed -n -e "s/^cccmd--//p" "$1"
EOF
+ write_script headercmd-sed <<-\EOF
+ sed -n -e "s/^headercmd--//p" "$1"
+ EOF
'
test_expect_success $PREREQ 'tocmd works' '
@@ -410,6 +413,70 @@ test_expect_success $PREREQ 'cccmd works' '
grep "^ cccmd@example.com" msgtxt1
'
+test_expect_success $PREREQ 'headercmd works' '
+ clean_fake_sendmail &&
+ cp $patches headercmd.patch &&
+ echo "headercmd--X-Debbugs-CC: dummy@example.com" >>headercmd.patch &&
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --header-cmd=./headercmd-sed \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ headercmd.patch \
+ &&
+ grep "^X-Debbugs-CC: dummy@example.com" msgtxt1
+'
+
+test_expect_success $PREREQ '--no-header-cmd works' '
+ clean_fake_sendmail &&
+ cp $patches headercmd.patch &&
+ echo "headercmd--X-Debbugs-CC: dummy@example.com" >>headercmd.patch &&
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --header-cmd=./headercmd-sed \
+ --no-header-cmd \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ headercmd.patch \
+ &&
+ ! grep "^X-Debbugs-CC: dummy@example.com" msgtxt1
+'
+
+test_expect_success $PREREQ 'multiline fields are correctly unfolded' '
+ clean_fake_sendmail &&
+ cp $patches headercmd.patch &&
+ write_script headercmd-multiline <<-\EOF &&
+ echo "X-Debbugs-CC: someone@example.com
+FoldedField: This is a tale
+ best told using
+ multiple lines."
+ EOF
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --header-cmd=./headercmd-multiline \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ headercmd.patch &&
+ grep "^FoldedField: This is a tale best told using multiple lines.$" msgtxt1
+'
+
+# Blank lines in the middle of the output of a command are invalid.
+test_expect_success $PREREQ 'malform output reported on blank lines in command output' '
+ clean_fake_sendmail &&
+ cp $patches headercmd.patch &&
+ write_script headercmd-malformed-output <<-\EOF &&
+ echo "X-Debbugs-CC: someone@example.com
+
+SomeOtherField: someone-else@example.com"
+ EOF
+ ! git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --header-cmd=./headercmd-malformed-output \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ headercmd.patch
+'
+
test_expect_success $PREREQ 'reject long lines' '
z8=zzzzzzzz &&
z64=$z8$z8$z8$z8$z8$z8$z8$z8 &&

56
gnu/packages/patches/kodi-mesa-eglchromium.patch 100644
View File

@ -0,0 +1,56 @@
From https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
From 5449652abf0bb9dddd0d796de4120e60f19f89a5 Mon Sep 17 00:00:00 2001
From: Alan Swanson <reiver@improbability.net>
Date: Mon, 19 Dec 2022 21:28:13 +0200
Subject: [PATCH] Work around Mesa eglchromium.h removal
I have polished Alan's snippet to buildable state and tested
on Kodi from Debian sid.
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
---
cmake/modules/FindEGL.cmake | 6 ++++++
xbmc/windowing/X11/GLContextEGL.h | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake
index b00fe08a25f95..a68a8db901222 100644
--- a/cmake/modules/FindEGL.cmake
+++ b/cmake/modules/FindEGL.cmake
@@ -9,6 +9,7 @@
# EGL_INCLUDE_DIRS - the EGL include directory
# EGL_LIBRARIES - the EGL libraries
# EGL_DEFINITIONS - the EGL definitions
+# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h
#
# and the following imported targets::
#
@@ -35,6 +36,11 @@ if(EGL_FOUND)
set(EGL_LIBRARIES ${EGL_LIBRARY})
set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
set(EGL_DEFINITIONS -DHAS_EGL=1)
+ include(CheckIncludeFiles)
+ check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE)
+ if(HAVE_EGLEXTANGLE)
+ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1")
+ endif()
if(NOT TARGET EGL::EGL)
add_library(EGL::EGL UNKNOWN IMPORTED)
diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h
index 99a6a9024e8c6..afea0b7c43eac 100644
--- a/xbmc/windowing/X11/GLContextEGL.h
+++ b/xbmc/windowing/X11/GLContextEGL.h
@@ -13,7 +13,11 @@
#include "threads/CriticalSection.h"
#include <EGL/eglext.h>
+#ifdef HAVE_EGLEXTANGLE
+#include <EGL/eglext_angle.h>
+#else
#include <EGL/eglextchromium.h>
+#endif
#include <X11/Xutil.h>
class CGLContextEGL : public CGLContext

47
gnu/packages/patches/libaio-riscv-test5.patch 100644
View File

@ -0,0 +1,47 @@
https://pagure.io/libaio/pull-request/23
From f68c69b6cbc1260a6034997d5f146e3d0a197ed8 Mon Sep 17 00:00:00 2001
From: Xiongchuan Tan <xc-tan@outlook.com>
Date: Jun 28 2022 15:53:38 +0000
Subject: As of June 28th, 2022, the RISC-V spec[1] reserves the PTE permission bit
combination of "write+!read", and the kernel would have incoherent behavior in
the last test case of "harness/cases/5.t". Since it leads to undefined behavior,
until further spec update, this test case should be disabled for RISC-V.
A patch to disallow such permission in mmap() can be found here[2].
[1]: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf
[2]: https://www.spinics.net/lists/kernel/msg4412421.html
---
diff --git a/harness/cases/5.t b/harness/cases/5.t
index b0a7c56..8d6c959 100644
--- a/harness/cases/5.t
+++ b/harness/cases/5.t
@@ -37,6 +37,14 @@ int test_main(void)
status |= attempt_rw(rwfd, buf, SIZE, 0, READ, -EFAULT);
res = munmap(buf, page_size); assert(res == 0);
+
+ /* As of June 28th, 2022, the RISC-V spec Volume 2 Section 4.3
+ * version "20211203 Privileged Architecture v1.12, Ratified"
+ * reserves the usage of the PTE permission bit combination of
+ * "write+!read", so the next test leads to undefined behavior
+ * and should be disabled. */
+#ifndef __riscv
+
buf = mmap(0, page_size, PROT_WRITE, MAP_SHARED, rwfd, 0);
assert(buf != (char *)-1);
@@ -48,6 +56,8 @@ int test_main(void)
status |= attempt_rw(rwfd, buf, SIZE, 0, READ, SIZE);
status |= attempt_rw(rwfd, buf, SIZE, 0, WRITE, res);
+#endif
+
return status;
}

100
gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch
View File

@ -1,100 +0,0 @@
This patch comes from upstream. It corresponds to a patch applied to
the generated C source code for llhttp included in Node.js 14.16.0
(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit
fixes CVE-2020-8287. With this patch, the output of our
llhttp-bootstrap package matches the files included in Node.js 14.16.0
exactly.
commit e9b36ea64709c35ca66094d5cf3787f444029601
Author: Fedor Indutny <fedor@indutny.com>
Date: Sat Oct 10 19:56:01 2020 -0700
http: unset `F_CHUNKED` on new `Transfer-Encoding`
Duplicate `Transfer-Encoding` header should be a treated as a single,
but with original header values concatenated with a comma separator. In
the light of this, even if the past `Transfer-Encoding` ended with
`chunked`, we should be not let the `F_CHUNKED` to leak into the next
header, because mere presence of another header indicates that `chunked`
is not the last transfer-encoding token.
diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts
index f4f1a6e..0a0c365 100644
--- a/src/llhttp/http.ts
+++ b/src/llhttp/http.ts
@@ -460,11 +460,19 @@ export class HTTP {
.match([ ' ', '\t' ], n('header_value_discard_ws'))
.otherwise(checkContentLengthEmptiness);
+ // Multiple `Transfer-Encoding` headers should be treated as one, but with
+ // values separate by a comma.
+ //
+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2
+ const toTransferEncoding = this.unsetFlag(
+ FLAGS.CHUNKED,
+ 'header_value_te_chunked');
+
n('header_value_start')
.otherwise(this.load('header_state', {
[HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback),
[HEADER_STATE.TRANSFER_ENCODING]: this.setFlag(
- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'),
+ FLAGS.TRANSFER_ENCODING, toTransferEncoding),
[HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'),
[HEADER_STATE.CONNECTION]: n('header_value_connection'),
}, 'header_value'));
@@ -847,6 +855,11 @@ export class HTTP {
return span.start(span.end(this.node(next)));
}
+ private unsetFlag(flag: FLAGS, next: string | Node): Node {
+ const p = this.llparse;
+ return p.invoke(p.code.and('flags', ~flag), this.node(next));
+ }
+
private setFlag(flag: FLAGS, next: string | Node): Node {
const p = this.llparse;
return p.invoke(p.code.or('flags', flag), this.node(next));
diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md
index a7d1681..b0891d6 100644
--- a/test/request/transfer-encoding.md
+++ b/test/request/transfer-encoding.md
@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0
off=106 error code=15 reason="Request has invalid `Transfer-Encoding`"
```
+## POST with `chunked` and duplicate transfer-encoding
+
+<!-- meta={"type": "request", "noScan": true} -->
+```http
+POST /post_identity_body_world?q=search#hey HTTP/1.1
+Accept: */*
+Transfer-Encoding: chunked
+Transfer-Encoding: deflate
+
+World
+```
+
+```log
+off=0 message begin
+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey"
+off=44 url complete
+off=54 len=6 span[header_field]="Accept"
+off=61 header_field complete
+off=62 len=3 span[header_value]="*/*"
+off=67 header_value complete
+off=67 len=17 span[header_field]="Transfer-Encoding"
+off=85 header_field complete
+off=86 len=7 span[header_value]="chunked"
+off=95 header_value complete
+off=95 len=17 span[header_field]="Transfer-Encoding"
+off=113 header_field complete
+off=114 len=7 span[header_value]="deflate"
+off=123 header_value complete
+off=125 headers complete method=3 v=1/1 flags=200 content_length=0
+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`"
+```
+
## POST with `chunked` before other transfer-coding (lenient)
TODO(indutny): should we allow it even in lenient mode? (Consider disabling

82
gnu/packages/patches/lxqt-session-procps-4.patch
View File

@ -1,82 +0,0 @@
From d1db1c791195f3c0cf148e2be8bd46c5a51ca535 Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Tue, 7 Mar 2023 14:21:40 +0100
Subject: [PATCH 978/978] reaper: Build/Run on systems with procps-ng >= 4.0.0
(#456)
On Linux, make it possible to use libproc2 or libprocps whichever is
available.
---
CMakeLists.txt | 6 +++++-
lxqt-session/src/procreaper.cpp | 24 +++++++++++++++++++++++-
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3c5e0d..f208600 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,11 @@ find_package(X11 REQUIRED)
message(STATUS "Building with Qt${Qt5Core_VERSION}")
find_package(PkgConfig REQUIRED)
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
- pkg_search_module(PROCPS REQUIRED libprocps)
+ pkg_search_module(PROCPS REQUIRED libproc2 libprocps)
+ message(STATUS "Using PROCPS -> ${PROCPS_MODULE_NAME} v${PROCPS_VERSION}")
+ if (PROCPS_VERSION VERSION_GREATER_EQUAL 4.0.0)
+ add_definitions("-DUSING_LIBPROC2")
+ endif()
endif()
# Please don't move, must be after lxqt
diff --git a/lxqt-session/src/procreaper.cpp b/lxqt-session/src/procreaper.cpp
index 2acd030..1ea4bdc 100644
--- a/lxqt-session/src/procreaper.cpp
+++ b/lxqt-session/src/procreaper.cpp
@@ -29,7 +29,11 @@
#include "log.h"
#if defined(Q_OS_LINUX)
#include <sys/prctl.h>
-#include <proc/readproc.h>
+# if defined(USING_LIBPROC2)
+# include <libproc2/pids.h>
+# else
+# include <proc/readproc.h>
+# endif
#elif defined(Q_OS_FREEBSD)
#include <sys/procctl.h>
#include <libutil.h>
@@ -109,6 +113,23 @@ void ProcReaper::stop(const std::set<int64_t> & excludedPids)
const pid_t my_pid = ::getpid();
std::vector<pid_t> children;
#if defined(Q_OS_LINUX)
+# if defined(USING_LIBPROC2)
+ constexpr pids_item items[] = { PIDS_ID_PPID, PIDS_ID_TGID };
+ enum rel_items { rel_ppid, rel_tgid };
+ pids_info * info = nullptr;
+ procps_pids_new(&info, const_cast<pids_item *>(items), sizeof(items) / sizeof(pids_item));
+ pids_stack * stack = nullptr;
+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY)))
+ {
+ const int ppid = PIDS_VAL(rel_ppid, s_int, stack, info);
+ if (ppid == my_pid)
+ {
+ const int tgid = PIDS_VAL(rel_tgid, s_int, stack, info);
+ children.push_back(tgid);
+ }
+ }
+ procps_pids_unref(&info);
+# else
PROCTAB * proc_dir = ::openproc(PROC_FILLSTAT);
while (proc_t * proc = ::readproc(proc_dir, nullptr))
{
@@ -119,6 +140,7 @@ void ProcReaper::stop(const std::set<int64_t> & excludedPids)
::freeproc(proc);
}
::closeproc(proc_dir);
+# endif
#elif defined(Q_OS_FREEBSD)
int cnt = 0;
if (kinfo_proc *proc_info = kinfo_getallproc(&cnt))
--
2.39.2

17
gnu/packages/patches/mars-install.patch
View File

@ -1,17 +0,0 @@
Remove install target for non-existant directory.
--- a/src/CMakeLists.txt 2015-09-13 20:52:28.517344327 +0200
+++ b/src/CMakeLists.txt 2015-09-13 20:53:04.842453987 +0200
@@ -122,12 +122,6 @@
DESTINATION
${CMAKE_INSTALL_PREFIX}/share/applications
)
- install(
- FILES
- ${MARS_SOURCE_DIR}/resources/mars
- DESTINATION
- ${CMAKE_INSTALL_PREFIX}/share/menu
- )
else(UNIX)
# executable

151
gnu/packages/patches/mars-sfml-2.3.patch
View File

@ -1,151 +0,0 @@
This is a concatenation of the following two patches:
https://github.com/jcowgill/M.A.R.S./commit/33d5affabf8ff84f2c028b9303c6a9e83cc824ad.patch
https://patch-diff.githubusercontent.com/raw/thelaui/M.A.R.S./pull/2.patch
Their purpose is to allow Mars to be built against the latest version of SFML.
From 33d5affabf8ff84f2c028b9303c6a9e83cc824ad Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Sat, 9 May 2015 01:54:14 +0100
Subject: [PATCH] Remove dependency on GLU - fixes build with SFML 2.3
---
premake4.lua | 8 ++++----
src/Shaders/postFX.cpp | 2 +-
src/System/window.cpp | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/premake4.lua b/premake4.lua
index 023dddd..5af4495 100755
--- a/premake4.lua
+++ b/premake4.lua
@@ -11,11 +11,11 @@ project "mars"
defines { "NDEBUG" }
flags { "Optimize" }
if os.get() == "windows" then
- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
elseif os.get() == "macosx" then
links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
else
- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
libdirs { "/usr/lib", "/usr/local/lib" }
end
@@ -23,10 +23,10 @@ project "mars"
defines { "_DEBUG", "DEBUG" }
flags { "Symbols" }
if os.get() == "windows" then
- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
elseif os.get() == "macosx" then
links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
else
- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
libdirs { "/usr/lib", "/usr/local/lib" }
end
diff --git a/src/Shaders/postFX.cpp b/src/Shaders/postFX.cpp
index 987f411..f767a47 100644
--- a/src/Shaders/postFX.cpp
+++ b/src/Shaders/postFX.cpp
@@ -78,7 +78,7 @@ namespace postFX {
postFX_.loadFromFile(settings::C_dataPath + "shaders/bump.frag", sf::Shader::Fragment);
bumpMap_.create(SPACE_X_RESOLUTION*0.5f, SPACE_Y_RESOLUTION*0.5f);
glViewport(0,0,SPACE_X_RESOLUTION*0.5f,SPACE_Y_RESOLUTION*0.5f);
- gluOrtho2D(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0);
+ glOrtho(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0, -1, 1);
glEnable(GL_BLEND);
glMatrixMode(GL_MODELVIEW);
postFX_.setParameter("BumpMap", bumpMap_.getTexture());
diff --git a/src/System/window.cpp b/src/System/window.cpp
index e9a099a..8e12dcc 100644
--- a/src/System/window.cpp
+++ b/src/System/window.cpp
@@ -222,7 +222,7 @@ namespace window {
glLoadIdentity();
// Setup translation (according to left-upper corner)
- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
// probably improves performance...
glDisable(GL_LIGHTING);
@@ -247,7 +247,7 @@ namespace window {
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@ -255,7 +255,7 @@ namespace window {
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
}
@@ -270,7 +270,7 @@ namespace window {
glLoadIdentity();
setViewPort();
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@ -284,7 +284,7 @@ namespace window {
glLoadIdentity();
setViewPort();
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@ -294,7 +294,7 @@ namespace window {
else {
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
}
From a97d0d6a19b5b43e3c53081e36f1f1747b6674e6 Mon Sep 17 00:00:00 2001
From: Sylvain BOILARD <boilard@crans.org>
Date: Wed, 23 Jan 2013 02:02:47 +0100
Subject: [PATCH] Use sf::Shader::Bind() correctly after latest update of the
SFML's API.
---
src/System/window.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/System/window.cpp b/src/System/window.cpp
index e9a099a..3ffcf65 100644
--- a/src/System/window.cpp
+++ b/src/System/window.cpp
@@ -307,13 +307,11 @@ namespace window {
window_.setActive(true);
glEnable(GL_TEXTURE_2D);
- if (shader)
- shader->bind();
+ sf::Shader::bind(shader);
window_.draw(toBeDrawn, states);
- if (shader)
- shader->unbind();
+ sf::Shader::bind(NULL);
window_.popGLStates();
glPopMatrix();

27
gnu/packages/patches/mesa-fix-sporadic-test-failures.patch
View File

@ -1,27 +0,0 @@
commit 7749599d737d205a88bbb6fa755ba095d9b581fa
Author: Gert Wollny <gert.wollny@collabora.com>
Date: Mon Aug 15 17:15:43 2022 +0200
r600/sfn: Initialize out buffer when printing op
79ca456b4837b3bc21cf9ef3c03c505c4b4909f6
r600/sfn: rewrite NIR backend
Closes: #7021
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18130>
diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp
index 3d40ea1796a..00826ed6457 100644
--- a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp
@@ -206,7 +206,7 @@ bool WriteScratchInstr::do_ready() const
void WriteScratchInstr::do_print(std::ostream& os) const
{
- char buf[6];
+ char buf[6] = {0};
os << "WRITE_SCRATCH ";
if (m_address)

180
gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch
View File

@ -1,4 +1,4 @@
From debc32a287209e1d1bb6fedb479bd923fd016399 Mon Sep 17 00:00:00 2001
From 82e98cf24808754578ab26adef5c33acc949f75e Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 5 Jun 2021 22:47:00 -0400
Subject: [PATCH] ppsspp: Remove upgrade code and gold support.
@ -6,7 +6,7 @@ Subject: [PATCH] ppsspp: Remove upgrade code and gold support.
Original patch from Liliana Marie Prikler.
Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by
Maxim Cournoyer.
Revised once again by Liliana Marie Prikler for version 1.12.3.
Revised again by Liliana Marie Prikler for versions 1.12.3 and 1.14.4.
---
Common/System/System.h | 1 -
Core/Config.cpp | 12 -------
@ -16,24 +16,23 @@ Revised once again by Liliana Marie Prikler for version 1.12.3.
Qt/mainwindow.h | 1 -
SDL/SDLMain.cpp | 6 ----
UI/DevScreens.cpp | 3 --
UI/GameSettingsScreen.cpp | 4 +--
UI/MainScreen.cpp | 70 +------------------------------------
UI/GameSettingsScreen.cpp | 2 --
UI/MainScreen.cpp | 71 +------------------------------------
UI/MemStickScreen.cpp | 8 -----
UI/MiscScreens.cpp | 31 ++--------------
UI/MiscScreens.cpp | 33 +++--------------
UWP/PPSSPP_UWPMain.cpp | 6 ----
Windows/MainWindowMenu.cpp | 8 +----
Windows/WindowsHost.cpp | 4 ---
Windows/main.cpp | 6 ----
Windows/resource.h | 1 -
android/jni/app-android.cpp | 6 ----
ios/main.mm | 6 ----
19 files changed, 6 insertions(+), 181 deletions(-)
18 files changed, 6 insertions(+), 178 deletions(-)
diff --git a/Common/System/System.h b/Common/System/System.h
index 09560191e..5df68a120 100644
index 6f1524ab0..cbc51c840 100644
--- a/Common/System/System.h
+++ b/Common/System/System.h
@@ -83,7 +83,6 @@ enum SystemProperty {
@@ -91,7 +91,6 @@ enum SystemProperty {
SYSPROP_DISPLAY_SAFE_INSET_BOTTOM,
SYSPROP_DEVICE_TYPE,
@ -42,10 +41,10 @@ index 09560191e..5df68a120 100644
// Exposed on Android. Choosing the optimal sample rate for audio
// will result in lower latencies. Buffer size is automatically matched
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 305098f47..9c28a3315 100644
index 4971f9a8d..8a8386c0a 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -512,7 +512,6 @@ static ConfigSetting generalSettings[] = {
@@ -534,7 +534,6 @@ static ConfigSetting generalSettings[] = {
ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true),
ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""),
ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false),
@ -53,8 +52,8 @@ index 305098f47..9c28a3315 100644
ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion),
ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true),
ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound...
@@ -1395,17 +1394,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
upgradeMessage = "";
@@ -1453,17 +1452,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
upgradeMessage.clear();
}
- // Check for new version on every 10 runs.
@ -72,10 +71,10 @@ index 305098f47..9c28a3315 100644
bSaveSettings = true;
diff --git a/Core/Config.h b/Core/Config.h
index 7bbbf2798..1bc1c2296 100644
index 8f10a5089..5e4054be1 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -109,7 +109,6 @@ struct Config {
@@ -113,7 +113,6 @@ struct Config {
bool bFastMemory;
int iCpuCore;
@ -83,19 +82,19 @@ index 7bbbf2798..1bc1c2296 100644
bool bForceLagSync;
bool bFuncReplacements;
bool bHideSlowWarnings;
@@ -562,4 +561,3 @@ std::string CreateRandMAC();
@@ -596,4 +595,3 @@ std::string CreateRandMAC();
// TODO: Find a better place for this.
extern http::Downloader g_DownloadManager;
extern Config g_Config;
-
diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp
index b642f7442..a880d7c94 100644
index f5a930061..d966d79ea 100644
--- a/Qt/QtMain.cpp
+++ b/Qt/QtMain.cpp
@@ -219,12 +219,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
case SYSPROP_HAS_FILE_BROWSER:
case SYSPROP_HAS_FOLDER_BROWSER:
@@ -238,12 +238,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true;
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
return true; // FileUtil.cpp: OpenFileInEditor
- case SYSPROP_APP_GOLD:
-#ifdef GOLD
- return true;
@ -104,12 +103,12 @@ index b642f7442..a880d7c94 100644
-#endif
case SYSPROP_CAN_JIT:
return true;
default:
case SYSPROP_HAS_KEYBOARD:
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 1f56e0e76..0b7680427 100644
index 26707a76e..aae5fe133 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -413,11 +413,6 @@ void MainWindow::forumAct()
@@ -421,11 +421,6 @@ void MainWindow::forumAct()
QDesktopServices::openUrl(QUrl("https://forums.ppsspp.org/"));
}
@ -121,7 +120,7 @@ index 1f56e0e76..0b7680427 100644
void MainWindow::gitAct()
{
QDesktopServices::openUrl(QUrl("https://github.com/hrydgard/ppsspp/"));
@@ -666,7 +661,6 @@ void MainWindow::createMenus()
@@ -673,7 +668,6 @@ void MainWindow::createMenus()
MenuTree* helpMenu = new MenuTree(this, menuBar(), QT_TR_NOOP("&Help"));
helpMenu->add(new MenuAction(this, SLOT(websiteAct()), QT_TR_NOOP("Visit www.&ppsspp.org")));
helpMenu->add(new MenuAction(this, SLOT(forumAct()), QT_TR_NOOP("PPSSPP &forums")));
@ -130,10 +129,10 @@ index 1f56e0e76..0b7680427 100644
helpMenu->add(new MenuAction(this, SLOT(discordAct()), QT_TR_NOOP("Discord")));
helpMenu->addSeparator();
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index 99c9fc3ad..8cd6cbf79 100644
index 705a3dd00..4c8abe452 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -197,7 +197,6 @@ private slots:
@@ -189,7 +189,6 @@ private slots:
// Help
void websiteAct();
void forumAct();
@ -142,10 +141,10 @@ index 99c9fc3ad..8cd6cbf79 100644
void discordAct();
void aboutAct();
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index f0f74f979..f963f36e9 100644
index 415860069..a8a2285be 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -381,12 +381,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
@@ -415,12 +415,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) {
case SYSPROP_HAS_BACK_BUTTON:
return true;
@ -157,12 +156,12 @@ index f0f74f979..f963f36e9 100644
-#endif
case SYSPROP_CAN_JIT:
return true;
default:
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 389fdf096..8442ee8c6 100644
index 568cc7c2f..051f147e2 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -649,9 +649,6 @@ void SystemInfoScreen::CreateViews() {
@@ -691,9 +691,6 @@ void SystemInfoScreen::CreateViews() {
#ifdef _M_SSE
buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE)));
#endif
@ -173,32 +172,23 @@ index 389fdf096..8442ee8c6 100644
ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt");
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 99fb151b9..90f26d5dc 100644
index e0d12bc97..1e63d5d9d 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1023,7 +1023,6 @@ void GameSettingsScreen::CreateViews() {
@@ -1004,8 +1004,6 @@ void GameSettingsScreen::CreateViews() {
}
}
#endif
- systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP")));
-
systemSettings->Add(new Choice(sy->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings);
systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups")));
@@ -2076,8 +2075,7 @@ void GestureMappingScreen::CreateViews() {
vert->Add(new PopupMultiChoice(&g_Config.iSwipeRight, mc->T("Swipe Right"), gestureButton, 0, ARRAY_SIZE(gestureButton), mc->GetName(), screenManager()))->SetEnabledPtr(&g_Config.bGestureControlEnabled);
vert->Add(new PopupSliderChoiceFloat(&g_Config.fSwipeSensitivity, 0.01f, 1.0f, co->T("Swipe sensitivity"), 0.01f, screenManager(), "x"))->SetEnabledPtr(&g_Config.bGestureControlEnabled);
vert->Add(new PopupSliderChoiceFloat(&g_Config.fSwipeSmoothing, 0.0f, 0.95f, co->T("Swipe smoothing"), 0.05f, screenManager(), "x"))->SetEnabledPtr(&g_Config.bGestureControlEnabled);
-
+
vert->Add(new ItemHeader(co->T("Double tap")));
vert->Add(new PopupMultiChoice(&g_Config.iDoubleTapGesture, mc->T("Double tap button"), gestureButton, 0, ARRAY_SIZE(gestureButton), mc->GetName(), screenManager()))->SetEnabledPtr(&g_Config.bGestureControlEnabled);
}
-
static const char *autoLoadSaveStateChoices[] = { "Off", "Oldest Save", "Newest Save", "Slot 1", "Slot 2", "Slot 3", "Slot 4", "Slot 5" };
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 4e86ac1ab..be49c3add 100644
index cc273ebbd..6623025de 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -1100,11 +1100,7 @@ void MainScreen::CreateViews() {
@@ -1111,11 +1111,7 @@ void MainScreen::CreateViews() {
sprintf(versionString, "%s", PPSSPP_GIT_VERSION);
rightColumnItems->SetSpacing(0.0f);
AnchorLayout *logos = new AnchorLayout(new AnchorLayoutParams(FILL_PARENT, 60.0f, false));
@ -211,19 +201,20 @@ index 4e86ac1ab..be49c3add 100644
logos->Add(new ImageView(ImageID("I_LOGO"), "PPSSPP", IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false)));
#if !defined(MOBILE_DEVICE)
@@ -1127,11 +1123,6 @@ void MainScreen::CreateViews() {
rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings);
@@ -1140,12 +1136,6 @@ void MainScreen::CreateViews() {
rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits);
rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg);
- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) {
- if (!System_GetPropertyBool(SYSPROP_APP_GOLD) && (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_VR)) {
- Choice *gold = rightColumnItems->Add(new Choice(mm->T("Buy PPSSPP Gold")));
- gold->OnClick.Handle(this, &MainScreen::OnSupport);
- gold->SetIcon(ImageID("I_ICONGOLD"), 0.5f);
- }
-
#if !PPSSPP_PLATFORM(UWP)
// Having an exit button is against UWP guidelines.
@@ -1156,32 +1147,6 @@ void MainScreen::CreateViews() {
rightColumnItems->Add(new Spacer(25.0));
@@ -1169,32 +1159,6 @@ void MainScreen::CreateViews() {
} else if (tabHolder_->GetVisibility() != V_GONE) {
root_->SetDefaultFocusView(tabHolder_);
}
@ -256,7 +247,7 @@ index 4e86ac1ab..be49c3add 100644
}
UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) {
@@ -1189,30 +1154,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) {
@@ -1202,30 +1166,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) {
return UI::EVENT_DONE;
}
@ -287,7 +278,7 @@ index 4e86ac1ab..be49c3add 100644
void MainScreen::sendMessage(const char *message, const char *value) {
// Always call the base class method first to handle the most common messages.
UIScreenWithBackground::sendMessage(message, value);
@@ -1386,15 +1327,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) {
@@ -1392,15 +1332,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) {
return UI::EVENT_DONE;
}
@ -304,7 +295,7 @@ index 4e86ac1ab..be49c3add 100644
LaunchBrowser("https://www.ppsspp.org");
return UI::EVENT_DONE;
diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp
index ef617c5b5..664614c62 100644
index 374c4683a..4a3d54155 100644
--- a/UI/MemStickScreen.cpp
+++ b/UI/MemStickScreen.cpp
@@ -157,23 +157,16 @@ static void AddExplanation(UI::ViewGroup *viewGroup, MemStickScreen::Choice choi
@ -340,23 +331,32 @@ index ef617c5b5..664614c62 100644
}
if (choice_ == CHOICE_BROWSE_FOLDER || choice_ == CHOICE_SET_MANUAL) {
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 04e5df6c3..fb6c29725 100644
index fef1fae1b..942997925 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -769,11 +769,7 @@ void LogoScreen::render() {
@@ -657,7 +657,7 @@ void NewLanguageScreen::OnCompleted(DialogResult result) {
g_Config.sLanguageIni = code;
bool iniLoadedSuccessfully = false;
- // Allow the lang directory to be overridden for testing purposes (e.g. Android, where it's hard to
+ // Allow the lang directory to be overridden for testing purposes (e.g. Android, where it's hard to
// test new languages without recompiling the entire app, which is a hassle).
const Path langOverridePath = GetSysDirectory(DIRECTORY_SYSTEM) / "lang";
@@ -781,11 +781,7 @@ void LogoScreen::render() {
char temp[256];
// Manually formatting UTF-8 is fun. \xXX doesn't work everywhere.
snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5);
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
- dc.Draw()->DrawImage(ImageID("I_ICONGOLD"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER);
- dc.Draw()->DrawImage(ImageID("I_ICONGOLD"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, 0xFFFFFFFF, ALIGN_CENTER);
- } else {
- dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER);
- dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, 0xFFFFFFFF, ALIGN_CENTER);
- }
+ dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, textColor, ALIGN_CENTER);
dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER);
+ dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, 0xFFFFFFFF, ALIGN_CENTER);
dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, 0xFFFFFFFF, ALIGN_CENTER);
//dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", bounds.w / 2, bounds.h / 2 - 30, textColor, ALIGN_CENTER);
dc.SetFontScale(1.0f, 1.0f);
@@ -809,10 +805,6 @@ void CreditsScreen::CreateViews() {
@@ -821,10 +817,6 @@ void CreditsScreen::CreateViews() {
// Really need to redo this whole layout with some linear layouts...
int rightYOffset = 0;
@ -367,7 +367,7 @@ index 04e5df6c3..fb6c29725 100644
root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums);
root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord);
root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg);
@@ -821,20 +813,7 @@ void CreditsScreen::CreateViews() {
@@ -833,20 +825,7 @@ void CreditsScreen::CreateViews() {
#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS)
root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare);
#endif
@ -389,7 +389,7 @@ index 04e5df6c3..fb6c29725 100644
}
UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) {
@@ -1024,11 +1003,7 @@ void CreditsScreen::render() {
@@ -1033,11 +1012,7 @@ void CreditsScreen::render() {
// TODO: This is kinda ugly, done on every frame...
char temp[256];
@ -403,10 +403,10 @@ index 04e5df6c3..fb6c29725 100644
UIContext &dc = *screenManager()->getUIContext();
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 29afda806..b7028fc0c 100644
index b734f6e3d..ef694fcd3 100644
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@@ -426,12 +426,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
@@ -418,12 +418,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return false;
case SYSPROP_HAS_BACK_BUTTON:
return true;
@ -418,9 +418,9 @@ index 29afda806..b7028fc0c 100644
-#endif
case SYSPROP_CAN_JIT:
return true;
default:
case SYSPROP_HAS_KEYBOARD:
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 006fed4f4..4761171ff 100644
index 25af2cd08..19ffd0a52 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -136,7 +136,6 @@ namespace MainWindow {
@ -439,7 +439,7 @@ index 006fed4f4..4761171ff 100644
AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_GITHUB, gitHub.c_str());
AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_DISCORD, discord.c_str());
AppendMenu(helpMenu, MF_SEPARATOR, 0, 0);
@@ -1015,10 +1013,6 @@ namespace MainWindow {
@@ -924,10 +922,6 @@ namespace MainWindow {
ShellExecute(NULL, L"open", L"https://www.ppsspp.org/", NULL, NULL, SW_SHOWNORMAL);
break;
@ -450,7 +450,7 @@ index 006fed4f4..4761171ff 100644
case ID_HELP_OPENFORUM:
ShellExecute(NULL, L"open", L"https://forums.ppsspp.org/", NULL, NULL, SW_SHOWNORMAL);
break;
@@ -1397,7 +1391,7 @@ namespace MainWindow {
@@ -1280,7 +1274,7 @@ namespace MainWindow {
{
W32Util::CenterWindow(hDlg);
HWND versionBox = GetDlgItem(hDlg, IDC_VERSION);
@ -459,27 +459,11 @@ index 006fed4f4..4761171ff 100644
windowText.append(PPSSPP_GIT_VERSION);
SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str());
}
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index 610b79890..3d5926fce 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -155,11 +155,7 @@ void WindowsHost::ShutdownGraphics() {
}
void WindowsHost::SetWindowTitle(const char *message) {
-#ifdef GOLD
- const char *name = "PPSSPP Gold ";
-#else
const char *name = "PPSSPP ";
-#endif
std::wstring winTitle = ConvertUTF8ToWString(std::string(name) + PPSSPP_GIT_VERSION);
if (message != nullptr) {
winTitle.append(ConvertUTF8ToWString(" - "));
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 9395233e2..90abec570 100644
index 9351202be..30c75e092 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -304,12 +304,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
@@ -333,12 +333,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true;
case SYSPROP_HAS_BACK_BUTTON:
return true;
@ -491,12 +475,12 @@ index 9395233e2..90abec570 100644
-#endif
case SYSPROP_CAN_JIT:
return true;
default:
case SYSPROP_HAS_KEYBOARD:
diff --git a/Windows/resource.h b/Windows/resource.h
index ce21b3a85..1f8002c10 100644
index 83ef88957..bdaef6234 100644
--- a/Windows/resource.h
+++ b/Windows/resource.h
@@ -322,7 +322,6 @@
@@ -339,7 +339,6 @@
// Dummy option to let the buffered rendering hotkey cycle through all the options.
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500
#define IDC_STEPOUT 40501
@ -505,13 +489,13 @@ index ce21b3a85..1f8002c10 100644
#define IDC_STATIC -1
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index df395e304..cebdf5804 100644
index 18ef723d4..61d8e5c2d 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -458,12 +458,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
// Doesn't actually mean it's usable though, in many early versions of Android
// this dialog is complete garbage and only lets you select subfolders of the Downloads folder.
@@ -480,12 +480,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return androidVersion >= 21; // when ACTION_OPEN_DOCUMENT_TREE was added
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
return false; // Update if we add support in FileUtil.cpp: OpenFileInEditor
- case SYSPROP_APP_GOLD:
-#ifdef GOLD
- return true;
@ -522,10 +506,10 @@ index df395e304..cebdf5804 100644
return true;
case SYSPROP_ANDROID_SCOPED_STORAGE:
diff --git a/ios/main.mm b/ios/main.mm
index e53b7c7ab..fe69647ed 100644
index b10db1a79..c410befdc 100644
--- a/ios/main.mm
+++ b/ios/main.mm
@@ -148,12 +148,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
@@ -153,12 +153,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) {
case SYSPROP_HAS_BACK_BUTTON:
return false;
@ -536,8 +520,8 @@ index e53b7c7ab..fe69647ed 100644
- return false;
-#endif
case SYSPROP_CAN_JIT:
return g_jitAvailable;
return get_debugged();
--
2.34.0
2.39.2

32
gnu/packages/patches/python-scikit-optimize-1148.patch 100644
View File

@ -0,0 +1,32 @@
From 3a5d5eb90ec9d8d4905c05387748486157cadbbb Mon Sep 17 00:00:00 2001
From: valtron <valtron2000@gmail.com>
Date: Tue, 14 Feb 2023 09:56:10 -0700
Subject: [PATCH] `np.int` -> `int`
`np.int is int` and it was deprecated in numpy 1.20: https://numpy.org/doc/1.20/release/1.20.0-notes.html#deprecations
---
skopt/space/transformers.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skopt/space/transformers.py b/skopt/space/transformers.py
index 68892952..f2dfb164 100644
--- a/skopt/space/transformers.py
+++ b/skopt/space/transformers.py
@@ -259,7 +259,7 @@ def transform(self, X):
if (self.high - self.low) == 0.:
return X * 0.
if self.is_int:
- return (np.round(X).astype(np.int) - self.low) /\
+ return (np.round(X).astype(int) - self.low) /\
(self.high - self.low)
else:
return (X - self.low) / (self.high - self.low)
@@ -272,7 +272,7 @@ def inverse_transform(self, X):
raise ValueError("All values should be greater than 0.0")
X_orig = X * (self.high - self.low) + self.low
if self.is_int:
- return np.round(X_orig).astype(np.int)
+ return np.round(X_orig).astype(int)
return X_orig

275
gnu/packages/patches/python-scikit-optimize-1150.patch 100644
View File

@ -0,0 +1,275 @@
From cd74e00d0e4f435d548444e1a5edc20155e371d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
Date: Wed, 15 Feb 2023 18:47:52 +0100
Subject: [PATCH 1/5] Update RandomForesetRegressor criterion to be inline with
scikit-learn change from mse to squared error this has the same funcitonality
---
requirements.txt | 6 +++---
setup.py | 6 +++---
skopt/learning/forest.py | 30 +++++++++++++++---------------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 1eaa3083a..23ab3d856 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-numpy>=1.13.3
-scipy>=0.19.1
-scikit-learn>=0.20
+numpy>=1.23.2
+scipy>=1.10.0
+scikit-learn>=1.2.1
matplotlib>=2.0.0
pytest
pyaml>=16.9
diff --git a/setup.py b/setup.py
index 8879da880..e7f921765 100644
--- a/setup.py
+++ b/setup.py
@@ -42,9 +42,9 @@
classifiers=CLASSIFIERS,
packages=['skopt', 'skopt.learning', 'skopt.optimizer', 'skopt.space',
'skopt.learning.gaussian_process', 'skopt.sampler'],
- install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.13.3',
- 'scipy>=0.19.1',
- 'scikit-learn>=0.20.0'],
+ install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.23.2',
+ 'scipy>=1.10.0',
+ 'scikit-learn>=1.2.1'],
extras_require={
'plots': ["matplotlib>=2.0.0"]
}
diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
index 096770c1d..ebde568f5 100644
--- a/skopt/learning/forest.py
+++ b/skopt/learning/forest.py
@@ -27,7 +27,7 @@ def _return_std(X, trees, predictions, min_variance):
-------
std : array-like, shape=(n_samples,)
Standard deviation of `y` at `X`. If criterion
- is set to "mse", then `std[i] ~= std(y | X[i])`.
+ is set to "squared_error", then `std[i] ~= std(y | X[i])`.
"""
# This derives std(y | x) as described in 4.3.2 of arXiv:1211.0906
@@ -61,9 +61,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
n_estimators : integer, optional (default=10)
The number of trees in the forest.
- criterion : string, optional (default="mse")
+ criterion : string, optional (default="squared_error")
The function to measure the quality of a split. Supported criteria
- are "mse" for the mean squared error, which is equal to variance
+ are "squared_error" for the mean squared error, which is equal to variance
reduction as feature selection criterion, and "mae" for the mean
absolute error.
@@ -194,7 +194,7 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
.. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
"""
- def __init__(self, n_estimators=10, criterion='mse', max_depth=None,
+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
min_samples_split=2, min_samples_leaf=1,
min_weight_fraction_leaf=0.0, max_features='auto',
max_leaf_nodes=None, min_impurity_decrease=0.,
@@ -228,20 +228,20 @@ def predict(self, X, return_std=False):
Returns
-------
predictions : array-like of shape = (n_samples,)
- Predicted values for X. If criterion is set to "mse",
+ Predicted values for X. If criterion is set to "squared_error",
then `predictions[i] ~= mean(y | X[i])`.
std : array-like of shape=(n_samples,)
Standard deviation of `y` at `X`. If criterion
- is set to "mse", then `std[i] ~= std(y | X[i])`.
+ is set to "squared_error", then `std[i] ~= std(y | X[i])`.
"""
mean = super(RandomForestRegressor, self).predict(X)
if return_std:
- if self.criterion != "mse":
+ if self.criterion != "squared_error":
raise ValueError(
- "Expected impurity to be 'mse', got %s instead"
+ "Expected impurity to be 'squared_error', got %s instead"
% self.criterion)
std = _return_std(X, self.estimators_, mean, self.min_variance)
return mean, std
@@ -257,9 +257,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
n_estimators : integer, optional (default=10)
The number of trees in the forest.
- criterion : string, optional (default="mse")
+ criterion : string, optional (default="squared_error")
The function to measure the quality of a split. Supported criteria
- are "mse" for the mean squared error, which is equal to variance
+ are "squared_error" for the mean squared error, which is equal to variance
reduction as feature selection criterion, and "mae" for the mean
absolute error.
@@ -390,7 +390,7 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
.. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
"""
- def __init__(self, n_estimators=10, criterion='mse', max_depth=None,
+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
min_samples_split=2, min_samples_leaf=1,
min_weight_fraction_leaf=0.0, max_features='auto',
max_leaf_nodes=None, min_impurity_decrease=0.,
@@ -425,19 +425,19 @@ def predict(self, X, return_std=False):
Returns
-------
predictions : array-like of shape=(n_samples,)
- Predicted values for X. If criterion is set to "mse",
+ Predicted values for X. If criterion is set to "squared_error",
then `predictions[i] ~= mean(y | X[i])`.
std : array-like of shape=(n_samples,)
Standard deviation of `y` at `X`. If criterion
- is set to "mse", then `std[i] ~= std(y | X[i])`.
+ is set to "squared_error", then `std[i] ~= std(y | X[i])`.
"""
mean = super(ExtraTreesRegressor, self).predict(X)
if return_std:
- if self.criterion != "mse":
+ if self.criterion != "squared_error":
raise ValueError(
- "Expected impurity to be 'mse', got %s instead"
+ "Expected impurity to be 'squared_error', got %s instead"
% self.criterion)
std = _return_std(X, self.estimators_, mean, self.min_variance)
return mean, std
From 6eb2d4ddaa299ae47d9a69ffb31ebc4ed366d1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
Date: Thu, 16 Feb 2023 11:34:58 +0100
Subject: [PATCH 2/5] Change test to be consistent with code changes.
---
skopt/learning/tests/test_forest.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skopt/learning/tests/test_forest.py b/skopt/learning/tests/test_forest.py
index 0711cde9d..c6ed610f3 100644
--- a/skopt/learning/tests/test_forest.py
+++ b/skopt/learning/tests/test_forest.py
@@ -35,7 +35,7 @@ def test_random_forest():
assert_array_equal(clf.predict(T), true_result)
assert 10 == len(clf)
- clf = RandomForestRegressor(n_estimators=10, criterion="mse",
+ clf = RandomForestRegressor(n_estimators=10, criterion="squared_error",
max_depth=None, min_samples_split=2,
min_samples_leaf=1,
min_weight_fraction_leaf=0.,
@@ -80,7 +80,7 @@ def test_extra_forest():
assert_array_equal(clf.predict(T), true_result)
assert 10 == len(clf)
- clf = ExtraTreesRegressor(n_estimators=10, criterion="mse",
+ clf = ExtraTreesRegressor(n_estimators=10, criterion="squared_error",
max_depth=None, min_samples_split=2,
min_samples_leaf=1, min_weight_fraction_leaf=0.,
max_features="auto", max_leaf_nodes=None,
From 52c620add07d845debbaff2ce2b1c5faf3eae79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
Date: Wed, 22 Feb 2023 16:59:03 +0100
Subject: [PATCH 3/5] Update skopt/learning/forest.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix max line width
Co-authored-by: Roland Laurès <roland@laures-valdivia.net>
---
skopt/learning/forest.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
index ebde568f5..07dc42664 100644
--- a/skopt/learning/forest.py
+++ b/skopt/learning/forest.py
@@ -194,8 +194,8 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
.. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
"""
- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
- min_samples_split=2, min_samples_leaf=1,
+ def __init__(self, n_estimators=10, criterion='squared_error',
+ max_depth=None, min_samples_split=2, min_samples_leaf=1,
min_weight_fraction_leaf=0.0, max_features='auto',
max_leaf_nodes=None, min_impurity_decrease=0.,
bootstrap=True, oob_score=False,
From 52a7db95cb567186fb4e9003139fea4592bdbf05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
Date: Wed, 22 Feb 2023 17:03:25 +0100
Subject: [PATCH 4/5] Fix line widht issues
---
skopt/learning/forest.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
index 07dc42664..d4c24456b 100644
--- a/skopt/learning/forest.py
+++ b/skopt/learning/forest.py
@@ -390,8 +390,8 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
.. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001.
"""
- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None,
- min_samples_split=2, min_samples_leaf=1,
+ def __init__(self, n_estimators=10, criterion='squared_error',
+ max_depth=None, min_samples_split=2, min_samples_leaf=1,
min_weight_fraction_leaf=0.0, max_features='auto',
max_leaf_nodes=None, min_impurity_decrease=0.,
bootstrap=False, oob_score=False,
From 6b185e489fb4a56625e8505292a20c80434f0633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com>
Date: Wed, 22 Feb 2023 18:37:11 +0100
Subject: [PATCH 5/5] Fix lin width issues for comments.
---
skopt/learning/forest.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py
index d4c24456b..eb3bd6648 100644
--- a/skopt/learning/forest.py
+++ b/skopt/learning/forest.py
@@ -63,9 +63,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor):
criterion : string, optional (default="squared_error")
The function to measure the quality of a split. Supported criteria
- are "squared_error" for the mean squared error, which is equal to variance
- reduction as feature selection criterion, and "mae" for the mean
- absolute error.
+ are "squared_error" for the mean squared error, which is equal to
+ variance reduction as feature selection criterion, and "mae" for the
+ mean absolute error.
max_features : int, float, string or None, optional (default="auto")
The number of features to consider when looking for the best split:
@@ -259,9 +259,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor):
criterion : string, optional (default="squared_error")
The function to measure the quality of a split. Supported criteria
- are "squared_error" for the mean squared error, which is equal to variance
- reduction as feature selection criterion, and "mae" for the mean
- absolute error.
+ are "squared_error" for the mean squared error, which is equal to
+ variance reduction as feature selection criterion, and "mae" for the
+ mean absolute error.
max_features : int, float, string or None, optional (default="auto")
The number of features to consider when looking for the best split:

42
gnu/packages/patches/python-wxwidgets-type-errors.patch 100644
View File

@ -0,0 +1,42 @@
Merged upstream but not yet released (see:
https://github.com/wxWidgets/Phoenix/pull/2387/commits/5d9f7aa185cd18da3e93ae1d0033fb9172d7a714).
From 5d9f7aa185cd18da3e93ae1d0033fb9172d7a714 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 1 May 2023 13:53:55 -0400
Subject: [PATCH] agw: Fix TypeError caused by floats with Python 3.10
extensions.
This fixes the following error:
File "/lib/python3.10/site-packages/wx/lib/agw/pygauge.py", line 380, in OnPaint
dc.DrawText(drawString, textXPos, textYPos)
TypeError: DC.DrawText(): arguments did not match any overloaded call:
overload 1: argument 2 has unexpected type 'float'
overload 2: argument 2 has unexpected type 'float'
TimeLeft: 3.0
Visible when using Python 3.10 or newer.
---
wx/lib/agw/pygauge.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wx/lib/agw/pygauge.py b/wx/lib/agw/pygauge.py
index b8654436a..da42e6f61 100644
--- a/wx/lib/agw/pygauge.py
+++ b/wx/lib/agw/pygauge.py
@@ -367,12 +367,12 @@ def OnPaint(self, event):
drawString = self._drawIndicatorText_formatString.format(drawValue)
rect = self.GetClientRect()
(textWidth, textHeight, descent, extraLeading) = dc.GetFullTextExtent(drawString)
- textYPos = (rect.height-textHeight)/2
+ textYPos = (rect.height-textHeight)//2
if textHeight > rect.height:
textYPos = 0-descent+extraLeading
- textXPos = (rect.width-textWidth)/2
+ textXPos = (rect.width-textWidth)//2
if textWidth>rect.width:
textXPos = 0

145
gnu/packages/patches/quilt-grep-compat.patch 100644
View File

@ -0,0 +1,145 @@
From upstream
https://git.savannah.nongnu.org/cgit/quilt.git/patch/?id=f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f
From f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 9 Sep 2022 10:10:37 +0200
Subject: Avoid warnings with grep 3.8
GNU grep version 3.8 became more strict about needless quoting in
patterns. We have one occurrence of that in quilt, where "/"
characters are being quoted by default. There are cases where they
indeed need to be quoted (typically when used in a sed s/// command)
but most of the time they do not, and this results in the following
warning:
grep: warning: stray \ before /
So rename quote_bre() to quote_sed_re(), and introduce
quote_grep_re() which does not quote "/".
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
quilt/diff.in | 2 +-
quilt/patches.in | 2 +-
quilt/scripts/patchfns.in | 20 +++++++++++++-------
quilt/upgrade.in | 4 ++--
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/quilt/diff.in b/quilt/diff.in
index e90dc33..07788ff 100644
--- a/quilt/diff.in
+++ b/quilt/diff.in
@@ -255,7 +255,7 @@ then
# Add all files in the snapshot into the file list (they may all
# have changed).
files=( $(find $QUILT_PC/$snap_subdir -type f \
- | sed -e "s/^$(quote_bre $QUILT_PC/$snap_subdir/)//" \
+ | sed -e "s/^$(quote_sed_re $QUILT_PC/$snap_subdir/)//" \
| sort) )
printf "%s\n" "${files[@]}" >&4
unset files
diff --git a/quilt/patches.in b/quilt/patches.in
index bb17a46..eac45a9 100644
--- a/quilt/patches.in
+++ b/quilt/patches.in
@@ -60,7 +60,7 @@ scan_unapplied()
# Quote each file name only once
for file in "${opt_files[@]}"
do
- files_bre[${#files_bre[@]}]=$(quote_bre "$file")
+ files_bre[${#files_bre[@]}]=$(quote_grep_re "$file")
done
# "Or" all files in a single pattern
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index c2d5f9d..1bd7233 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -78,8 +78,14 @@ array_join()
done
}
-# Quote a string for use in a basic regular expression.
-quote_bre()
+# Quote a string for use in a regular expression for a grep pattern.
+quote_grep_re()
+{
+ echo "$1" | sed -e 's:\([][^$.*\\]\):\\\1:g'
+}
+
+# Quote a string for use in a regular expression for a sed s/// command.
+quote_sed_re()
{
echo "$1" | sed -e 's:\([][^$/.*\\]\):\\\1:g'
}
@@ -215,7 +221,7 @@ patch_in_series()
if [ -e "$SERIES" ]
then
- grep -q "^$(quote_bre $patch)\([ \t]\|$\)" "$SERIES"
+ grep -q "^$(quote_grep_re $patch)\([ \t]\|$\)" "$SERIES"
else
return 1
fi
@@ -365,7 +371,7 @@ is_applied()
{
local patch=$1
[ -e $DB ] || return 1
- grep -q "^$(quote_bre $patch)\$" $DB
+ grep -q "^$(quote_grep_re $patch)\$" $DB
}
applied_patches()
@@ -465,7 +471,7 @@ remove_from_db()
local tmpfile
if tmpfile=$(gen_tempfile)
then
- grep -v "^$(quote_bre $patch)\$" $DB > $tmpfile
+ grep -v "^$(quote_grep_re $patch)\$" $DB > $tmpfile
cat $tmpfile > $DB
rm -f $tmpfile
[ -s $DB ] || rm -f $DB
@@ -520,7 +526,7 @@ find_patch()
fi
local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/}
- local bre=$(quote_bre "$patch")
+ local bre=$(quote_sed_re "$patch")
set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\|\.lz\)\([ "$'\t'"]\|$\)/!d" \
-e 's/[ '$'\t''].*//' "$SERIES")
if [ $# -eq 1 ]
@@ -631,7 +637,7 @@ files_in_patch()
then
find "$path" -type f \
-a ! -path "$(quote_glob "$path")/.timestamp" |
- sed -e "s/$(quote_bre "$path")\///"
+ sed -e "s/$(quote_sed_re "$path")\///"
fi
}
diff --git a/quilt/upgrade.in b/quilt/upgrade.in
index dbf7d05..866aa33 100644
--- a/quilt/upgrade.in
+++ b/quilt/upgrade.in
@@ -74,7 +74,7 @@ printf $"Converting meta-data to version %s\n" "$DB_VERSION"
for patch in $(applied_patches)
do
- proper_name="$(grep "^$(quote_bre $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)"
+ proper_name="$(grep "^$(quote_grep_re $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)"
proper_name=${proper_name#$QUILT_PATCHES/}
proper_name=${proper_name%% *}
if [ -z "$proper_name" ]
@@ -84,7 +84,7 @@ do
fi
if [ "$patch" != "$proper_name" -a -d $QUILT_PC/$patch ] \
- && grep -q "^$(quote_bre $patch)\$" \
+ && grep -q "^$(quote_grep_re $patch)\$" \
$QUILT_PC/applied-patches
then
mv $QUILT_PC/$patch $QUILT_PC/$proper_name \
--
cgit v1.1

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