me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into emacs-team

master
Liliana Marie Prikler 2023-08-01 22:21:09 +02:00
parent 15406013fe 45b7a8bfda
commit 8de4131b2d
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
278 changed files with 116093 additions and 41158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -410,6 +410,8 @@ AUX_FILES = \
gnu/packages/aux-files/chromium/master-preferences.json \
gnu/packages/aux-files/emacs/guix-emacs.el \
gnu/packages/aux-files/guix.vim \
gnu/packages/aux-files/linux-libre/6.4-i686.conf \
gnu/packages/aux-files/linux-libre/6.4-x86_64.conf \
gnu/packages/aux-files/linux-libre/6.3-arm.conf \
gnu/packages/aux-files/linux-libre/6.3-arm64.conf \
gnu/packages/aux-files/linux-libre/6.3-i686.conf \
@ -556,6 +558,7 @@ SCM_TESTS = \
tests/services/lightdm.scm \
tests/services/linux.scm \
tests/services/telephony.scm \
tests/services/vpn.scm \
tests/sets.scm \
tests/size.scm \
tests/status.scm \

15
build-aux/cuirass/hurd-manifest.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -31,7 +31,7 @@
(srfi srfi-1))
(use-package-modules
base commencement compression file gawk gdb gettext guile
base bootloaders commencement compression file gawk gdb gettext guile
hurd less m4 package-management python ssh version-control)
(define (input->package input)
@ -64,11 +64,14 @@
;; development packages
gcc-toolchain gdb-minimal git-minimal gnu-make
gettext-minimal python-minimal
;; guix environment guix --without-tests=python-minimal --without-tests=gettext-minimal
(package-without-tests gettext-minimal)
(package-without-tests python-minimal)
;; ourselves!
(package-without-tests guix)
;; system
grub-minimal grub
(append
guix-dependencies
(delete guile-3.0 %base-packages/hurd))))
%base-packages/hurd)))

7
doc/build.scm
View File

@ -912,11 +912,8 @@ makeinfo OPTIONS."
sed
tar
texinfo
texlive-base
texlive-bin ;for GUIX_TEXMF
texlive-epsf
texlive-fonts-ec
texlive-tex-texinfo)))))
(texlive-updmap.cfg
(list texlive-epsf texlive-texinfo)))))))
(define build
(with-imported-modules '((guix build utils))

6
doc/contributing.texi
View File

@ -1252,9 +1252,9 @@ Take a look at the profile reported by @command{guix size}
(@pxref{Invoking guix size}). This will allow you to notice references
to other packages unwillingly retained. It may also help determine
whether to split the package (@pxref{Packages with Multiple Outputs}),
and which optional dependencies should be used. In particular, avoid adding
@code{texlive} as a dependency: because of its extreme size, use
the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
and which optional dependencies should be used. In particular, avoid
adding @code{texlive} as a dependency: because of its extreme size, use
@code{texlive-updmap.cfg} procedure instead.
@item
Check that dependent packages (if applicable) are not affected by the

2
doc/environment-gdb.scm
View File

@ -9,4 +9,4 @@
(package
(inherit gdb)
(native-inputs (modify-inputs (package-native-inputs gdb)
(prepend autoconf-2.64 automake texinfo))))
(prepend autoconf-2.69 automake texinfo))))

47
doc/guix-cookbook.texi
View File

@ -234,10 +234,11 @@ A list structure can be created with the @code{list} procedure:
@end lisp
@item
The @dfn{quote} disables evaluation of a parenthesized expression: the
first term is not called over the other terms (@pxref{Expression Syntax,
quote,, guile, GNU Guile Reference Manual}). Thus it effectively
returns a list of terms.
@cindex S-expression
The @dfn{quote} disables evaluation of a parenthesized expression, also
called an S-expression or ``s-exp'': the first term is not called over
the other terms (@pxref{Expression Syntax, quote,, guile, GNU Guile
Reference Manual}). Thus it effectively returns a list of terms.
@lisp
'(display (string-append "Hello " "Guix" "\n"))
@ -248,9 +249,10 @@ returns a list of terms.
@end lisp
@item
The @dfn{quasiquote} disables evaluation of a parenthesized expression
until @dfn{unquote} (a comma) re-enables it. Thus it provides us with
fine-grained control over what is evaluated and what is not.
The @code{quasiquote} (@code{`}, a backquote) disables evaluation of a
parenthesized expression until @code{unquote} (@code{,}, a comma)
re-enables it. Thus it provides us with fine-grained control over what
is evaluated and what is not.
@lisp
`(2 a 5 7 (2 ,a 5 ,(+ a 4)))
@ -260,6 +262,37 @@ fine-grained control over what is evaluated and what is not.
Note that the above result is a list of mixed elements: numbers, symbols (here
@code{a}) and the last element is a list itself.
@item
@cindex G-expressions, syntax
@cindex gexps, syntax
@findex #~
@findex #$
@findex gexp
@findex ungexp
Guix defines a variant of S-expressions on steroids called
@dfn{G-expressions} or ``gexps'', which come with a variant of
@code{quasiquote} and @code{unquote}: @code{#~} (or @code{gexp}) and
@code{#$} (or @code{ungexp}). They let you @emph{stage code for later
execution}.
For example, you'll encounter gexps in some package definitions where
they provide code to be executed during the package build process. They
look like this:
@lisp
;; Below is a G-expression representing staged code.
#~(begin
;; Invoke 'ls' from the package defined by the 'coreutils'
;; variable.
(system* #$(file-append coreutils "/bin/ls") "-l")
;; Create this package's output directory.
(mkdir #$output))
@end lisp
@xref{G-Expressions,,, guix, GNU Guix Reference Manual}, for more on
gexps.
@item
Multiple variables can be named locally with @code{let} (@pxref{Local
Bindings,,, guile, GNU Guile Reference Manual}):

248
doc/guix.texi
View File

@ -5776,7 +5776,7 @@ a package collection. This involves the following steps:
@enumerate
@item
Channels live in a Git repository so the first step, when creating a
A channel lives in a Git repository so the first step, when creating a
channel, is to create its repository:
@example
@ -5790,7 +5790,7 @@ The next step is to create files containing package modules
(@pxref{Package Modules}), each of which will contain one or more
package definitions (@pxref{Defining Packages}). A channel can provide
things other than packages, such as build systems or services; we're
using packages as most common use case.
using packages as it's the most common use case.
For example, Alice might want to provide a module called @code{(alice
packages greetings)} that will provide her favorite ``hello world''
@ -5815,7 +5815,7 @@ that.
@item
With this first module in place, the next step is to test the packages
it provides. This can be done with @command{guix build}, which needs to
be fold to look for modules in the Git checkout. For example, assuming
be told to look for modules in the Git checkout. For example, assuming
@code{(alice packages greetings)} provides a package called
@code{hi-from-alice}, Alice will run this command from the Git checkout:
@ -5856,7 +5856,7 @@ example, @code{(alice packages greetings)} will automatically be found
by the @command{guix} command.
@end enumerate
Voilà!
Voilà!
@c What follows stems from discussions at
@c <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22629#134> as well as
@ -10001,17 +10001,30 @@ used to build TeX packages in batch mode with a specified engine. The
build system sets the @env{TEXINPUTS} variable to find all TeX source
files in the inputs.
By default it runs @code{luatex} on all files ending on @code{ins}. A
different engine and format can be specified with the
@code{#:tex-format} argument. Different build targets can be specified
with the @code{#:build-targets} argument, which expects a list of file
names. The build system adds only @code{texlive-bin} and
@code{texlive-latex-base} (both from @code{(gnu packages tex}) to the
inputs. Both can be overridden with the arguments @code{#:texlive-bin}
and @code{#:texlive-latex-base}, respectively.
By default it tries to run @code{luatex} on all @file{.ins} files, and
if it fails to find any, on all @file{.dtx} files. A different engine
and format can be specified with, respectively, the @code{#:tex-engine}
and @code{#:tex-format} arguments. Different build targets can be
specified with the @code{#:build-targets} argument, which expects a list
of file names.
The @code{#:tex-directory} parameter tells the build system where to
install the built files under the texmf tree.
It also generates font metrics (i.e., @file{.tfm} files) out of Metafont
files whenever possible. Likewise, it can also create TeX formats
(i.e., @file{.fmt} files) listed in the @code{#:create-formats}
argument, and generate a symbolic link from @file{bin/} directory to any
script located in located in @file{texmf-dist/scripts/}, provided its
file name is listed in @code{#:link-scripts} argument.
The build system adds @code{texlive-bin} from @code{(gnu packages tex)}
to the native inputs. It can be overridden with the
@code{#:texlive-bin} argument.
The package @code{texlive-latex-bin}, from the same module, contains
most of the tools for building TeX Live packages; for convenience, it is
also added by default to the native inputs. However, this can be
troublesome when building a dependency of @code{texlive-latex-bin}
itself. In this particular situation, the @code{#:texlive-latex-bin?}
argument should be set to @code{#f}.
@end defvar
@defvar ruby-build-system
@ -14075,9 +14088,10 @@ TeX packages that are part of the @uref{https://www.tug.org/texlive/,
TeX Live distribution}.
Information about the package is obtained from the TeX Live package
database, a plain text file that is included in the @code{texlive-bin}
package. The source code is downloaded from possibly multiple locations
in the SVN repository of the Tex Live project.
database, a plain text file that is included in the
@code{texlive-scripts} package. The source code is downloaded from
possibly multiple locations in the SVN repository of the Tex Live
project.
The command command below imports metadata for the @code{fontspec}
TeX package:
@ -32938,12 +32952,25 @@ The IP addresses to be assigned to the above interface.
@item @code{port} (default: @code{51820})
The port on which to listen for incoming connections.
@item @code{dns} (default: @code{#f})
@item @code{dns} (default: @code{'())})
The DNS server(s) to announce to VPN clients via DHCP.
@item @code{monitor-ips?} (default: @code{#f})
@cindex Dynamic IP, with Wireguard
@cindex dyndns, usage with Wireguard
Whether to monitor the resolved Internet addresses (IPs) of the
endpoints of the configured peers, resetting the peer endpoints using an
IP address that no longer correspond to their freshly resolved host
name. Set this to @code{#t} if one or more endpoints use host names
provided by a dynamic DNS service to keep the sessions alive.
@item @code{monitor-ips-internal} (default: @code{'(next-minute (range 0 60 5))})
The time interval at which the IP monitoring job should run, provided as
an mcron time specification (@pxref{Guile Syntax,,,mcron}).
@item @code{private-key} (default: @code{"/etc/wireguard/private.key"})
The private key file for the interface. It is automatically generated if
the file does not exist.
The private key file for the interface. It is automatically generated
if the file does not exist.
@item @code{peers} (default: @code{'()})
The authorized peers on this interface. This is a list of
@ -34214,36 +34241,57 @@ The Music Player Daemon (MPD) is a service that can play music while
being controlled from the local machine or over the network by a variety
of clients.
The following example shows how one might run @code{mpd} as user
@code{"bob"} on port @code{6666}. It uses pulseaudio for output.
The following example shows the simplest configuration to locally
expose, via PulseAudio, a music collection kept at @file{/srv/music},
with @command{mpd} running as the default @samp{mpd} user. This user
will spawn its own PulseAudio daemon, which may compete for the sound
card access with that of your own user. In this configuration, you may
have to stop the playback of your user audio applications to hear MPD's
output and vice-versa.
@lisp
(service mpd-service-type
(mpd-configuration
(user "bob")
(port "6666")))
(music-directory "/srv/music")))
@end lisp
@quotation Important
The music directory must be readable to the MPD user, by default,
@samp{mpd}. Permission problems will be reported via @samp{Permission
denied} errors in the MPD logs, which appear in @file{/var/log/messages}
by default.
@end quotation
Most MPD clients will trigger a database update upon connecting, but you
can also use the @code{update} action do to so:
@example
herd update mpd
@end example
All the MPD configuration fields are documented below, and a more
complex example follows.
@defvar mpd-service-type
The service type for @command{mpd}
@end defvar
@c %start of fragment
@deftp {Data Type} mpd-configuration
Data type representing the configuration of @command{mpd}.
Available @code{mpd-configuration} fields are:
@table @asis
@item @code{package} (default: @code{mpd}) (type: file-like)
The MPD package.
@item @code{user} (default: @code{%mpd-user}) (type: user-account)
@item @code{user} (type: user-account)
The user to run mpd as.
The default @code{%mpd-user} is a system user with the name ``mpd'',
who is a part of the group @var{group} (see below).
@item @code{group} (default: @code{%mpd-group}) (type: user-group)
@item @code{group} (type: user-group)
The group to run mpd as.
The default @code{%mpd-group} is a system group with name ``mpd''.
@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbol)
A list of symbols naming Shepherd services that this service
will depend on.
@ -34251,24 +34299,31 @@ will depend on.
@item @code{environment-variables} (default: @code{'("PULSE_CLIENTCONFIG=/etc/pulse/client.conf" "PULSE_CONFIG=/etc/pulse/daemon.conf")}) (type: list-of-strings)
A list of strings specifying environment variables.
@item @code{log-file} (default: @code{"/var/log/mpd/log"}) (type: maybe-string)
The location of the log file. Set to @code{syslog} to use the local
syslog daemon or @code{%unset-value} to omit this directive from the
configuration file.
@item @code{log-file} (type: maybe-string)
The location of the log file. Unless specified, logs are sent to the
local syslog daemon. Alternatively, a log file name can be specified,
for example @file{/var/log/mpd.log}.
@item @code{log-level} (type: maybe-string)
Suppress any messages below this threshold. Available values:
@code{notice}, @code{info}, @code{verbose}, @code{warning} and
@code{error}.
Supress any messages below this threshold. The available values, in
decreasing order of verbosity, are: @code{verbose}, @code{info},
@code{notice}, @code{warning} and @code{error}.
@item @code{music-directory} (type: maybe-string)
The directory to scan for music files.
@item @code{music-dir} (type: maybe-string)
The directory to scan for music files.
@item @code{playlist-directory} (type: maybe-string)
The directory to store playlists.
@item @code{playlist-dir} (type: maybe-string)
The directory to store playlists.
@item @code{db-file} (type: maybe-string)
The location of the music database.
The location of the music database. When left unspecified,
@file{~/.cache/db} is used.
@item @code{state-file} (type: maybe-string)
The location of the file that stores current MPD's state.
@ -34276,15 +34331,19 @@ The location of the file that stores current MPD's state.
@item @code{sticker-file} (type: maybe-string)
The location of the sticker database.
@item @code{default-port} (default: @code{6600}) (type: maybe-integer)
@item @code{default-port} (default: @code{6600}) (type: maybe-port)
The default port to run mpd on.
@item @code{endpoints} (type: maybe-list-of-strings)
The addresses that mpd will bind to. A port different from @var{default-port}
may be specified, e.g. @code{localhost:6602} and IPv6 addresses must be
enclosed in square brackets when a different port is used.
To use a Unix domain socket, an absolute path or a path starting with @code{~}
can be specified here.
The addresses that mpd will bind to. A port different from
@var{default-port} may be specified, e.g. @code{localhost:6602} and
IPv6 addresses must be enclosed in square brackets when a different port
is used. To use a Unix domain socket, an absolute path or a path
starting with @code{~} can be specified here.
@item @code{address} (type: maybe-string)
The address that mpd will bind to. To use a Unix domain socket, an
absolute path can be specified here.
@item @code{database} (type: maybe-mpd-plugin)
MPD database plugin configuration.
@ -34301,6 +34360,10 @@ List of MPD input plugin configurations.
@item @code{archive-plugins} (default: @code{'()}) (type: list-of-mpd-plugin)
List of MPD archive plugin configurations.
@item @code{auto-update?} (type: maybe-boolean)
Whether to automatically update the music database when files are
changed in the @var{music-directory}.
@item @code{input-cache-size} (type: maybe-string)
MPD input cache size.
@ -34326,6 +34389,7 @@ appended to the configuration.
@end table
@end deftp
@c %end of fragment
@deftp {Data Type} mpd-plugin
Data type representing a @command{mpd} plugin.
@ -34365,8 +34429,9 @@ Partitions} for available options.
@end table
@end deftp
@c %start of fragment
@deftp {Data Type} mpd-output
Data type representing a @command{mpd} audio output.
Available @code{mpd-output} fields are:
@table @asis
@item @code{name} (default: @code{"MPD"}) (type: string)
@ -34393,15 +34458,16 @@ is only useful for output plugins that can receive tags, for example the
@item @code{always-on?} (default: @code{#f}) (type: boolean)
If set to @code{#t}, then MPD attempts to keep this audio output always
open. This may be useful for streaming servers, when you don?t want to
open. This may be useful for streaming servers, when you don’t want to
disconnect all listeners even when playback is accidentally stopped.
@item @code{mixer-type} (default: @code{"none"}) (type: string)
@item @code{mixer-type} (type: maybe-string)
This field accepts a string that specifies which mixer should be used
for this audio output: the @code{hardware} mixer, the @code{software}
mixer, the @code{null} mixer (allows setting the volume, but with no
effect; this can be used as a trick to implement an external mixer
External Mixer) or no mixer (@code{none}).
External Mixer) or no mixer (@code{none}). When left unspecified, a
@code{hardware} mixer is used for devices that support it.
@item @code{replay-gain-handler} (type: maybe-string)
This field accepts a string that specifies how
@ -34416,6 +34482,7 @@ appended to the audio output configuration.
@end table
@end deftp
@c %end of fragment
The following example shows a configuration of @command{mpd} that
configures some of its plugins and provides a HTTP audio streaming output.
@ -34513,11 +34580,10 @@ HTTP port to listen on.
How much detail to include in logs, possible values: @code{0} to
@code{7}.
@item @code{log-to} (default: @code{"/var/log/mympd/log"}) (type: string-or-symbol)
Where to send logs. By default, the service logs to
@file{/var/log/mympd.log}. The alternative is @code{'syslog}, which
sends output to the running syslog service under the @samp{daemon}
facility.
@item @code{log-to} (type: maybe-string)
Where to send logs. Unless specified, the service logs to the local
syslog service under the @samp{daemon} facility. Alternatively, a log
file name can be specified, for example @file{/var/log/mympd.log}.
@item @code{lualibs} (default: @code{"all"}) (type: maybe-string)
See
@ -35159,9 +35225,9 @@ Its value must be a @code{virtlog-configuration}.
@end lisp
@end defvar
@deftypevar {@code{libvirt} parameter} package libvirt
@deftypevr {@code{libvirt} parameter} package libvirt
Libvirt package.
@end deftypevar
@end deftypevr
@deftypevr {@code{virtlog-configuration} parameter} integer log-level
Logging level. 4 errors, 3 warnings, 2 information, 1 debug.
@ -40078,7 +40144,29 @@ For example:
@item @code{multiboot-arguments} (default: @code{'()})
The list of extra command-line arguments for the multiboot-kernel.
@item @code{multiboot-modules} (default: @code{'()})
For example, when running in QEMU it can be useful to use a text-based
console (use options @option{--nographic} @option{--serial mon:stdio}):
@lisp
'("console=com0")
@end lisp
To use the new and still experimental
@uref{https://darnassus.sceen.net/~hurd-web/rump_kernel/, rumpdisk
user-level disk driver} instead of GNU@tie{}Mach's in-kernel IDE driver,
set @code{kernel-arguments} to:
@lisp
'("noide")
@end lisp
Of course, these options can be combined:
@lisp
'("console=com0" "noide")
@end lisp
+@item @code{multiboot-modules} (default: @code{'()})
The list of commands for loading Multiboot modules. For example:
@lisp
@ -45371,14 +45459,19 @@ single @TeX{} Live package} (more than 7,000 of them), but it is huge
(more than 4@tie{}GiB for a single package!).
@item
The ``modular'' @code{texlive-} packages: you install
@code{texlive-base}, which provides core functionality and the main
The ``modular'' @samp{texlive-} packages: you start off with
a combination of @TeX{} Live @dfn{collections} and
@dfn{schemes}---``meta-packages'' such as
@code{texlive-collection-fontsrecommended}, or
@code{texlive-collection-context}, that provide the set of packages
needed in this particular domain, schemes being the name for collections
of such collections. This grants you core functionality and the main
commands---@command{pdflatex}, @command{dvips}, @command{luatex},
@command{mf}, etc.---together with individual packages that provide just
the features you need---@code{texlive-listings} for the
@code{listings} package, @code{texlive-hyperref} for @code{hyperref},
@code{texlive-beamer} for Beamer, @code{texlive-pgf} for PGF/TikZ,
and so on.
@command{mf}, etc. You can then complete your selection with additional
collections or individual packages that provide just the features you
need---@code{texlive-listings} for the @code{listings} package,
@code{texlive-beamer} for Beamer, @code{texlive-pgf} for PGF/TikZ, and
so on.
@end itemize
We recommend using the modular package set because it is much less
@ -45386,29 +45479,29 @@ resource-hungry. To build your documents, you would use commands such
as:
@example
guix shell texlive-base texlive-wrapfig \
texlive-hyperref texlive-cm-super -- pdflatex doc.tex
guix shell texlive-scheme-basic texlive-cm-super -- pdflatex doc.tex
@end example
You can quickly end up with unreasonably long command lines though. The
solution is to instead write a manifest, for example like this one:
solution is to instead write a manifest, for example like this one,
which would probably be a reasonable starting point for a French
@LaTeX{} user:
@lisp
(specifications->manifest
'("rubber"
"texlive-base"
"texlive-wrapfig"
"texlive-scheme-basic"
"texlive-collection-latexrecommended"
"texlive-collection-fontsrecommended"
"texlive-microtype"
"texlive-listings" "texlive-hyperref"
"texlive-babel-french"
;; PGF/TikZ
"texlive-pgf"
;; Additional fonts.
"texlive-cm-super" "texlive-amsfonts"
"texlive-times" "texlive-helvetic" "texlive-courier"))
;; Additional font.
"texlive-kpfonts"))
@end lisp
You can then pass it to any command with the @option{-m} option:
@ -45417,12 +45510,9 @@ You can then pass it to any command with the @option{-m} option:
guix shell -m manifest.scm -- pdflatex doc.tex
@end example
@xref{Writing Manifests}, for more on
manifests. In the future, we plan to provide packages for @TeX{} Live
@dfn{collections}---``meta-packages'' such as @code{fontsrecommended},
@code{humanities}, or @code{langarabic} that provide the set of packages
needed in this particular domain. That will allow you to list fewer
packages.
@xref{Writing Manifests}, for more on manifests. In the future, we plan
to provide more collections and schemes. That will allow you to list
fewer packages.
The main difficulty here is that using the modular package set forces
you to select precisely the packages that you need. You can use
@ -45458,7 +45548,7 @@ you can search the @TeX{} Live package database using the @command{tlmgr}
command:
@example
$ guix shell texlive-base -- tlmgr info phvr7t
$ guix shell texlive-bin -- tlmgr info phvr7t
tlmgr: cannot find package phvr7t, searching for other matches:
Packages containing `phvr7t' in their title/description:

67
etc/guix-install.sh
View File

@ -434,36 +434,27 @@ sys_enable_guix_daemon()
_msg "${PAS}enabled Guix daemon via upstart"
;;
systemd)
{ # systemd .mount units must be named after the target directory.
# Here we assume a hard-coded name of /gnu/store.
# XXX Work around <https://issues.guix.gnu.org/41356> until next release.
if [ -f ~root/.config/guix/current/lib/systemd/system/gnu-store.mount ]; then
cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \
/etc/systemd/system/;
chmod 664 /etc/systemd/system/gnu-store.mount;
systemctl daemon-reload &&
systemctl enable gnu-store.mount;
fi
{ install_unit()
{
local dest="/etc/systemd/system/$1"
rm -f "$dest"
cp ~root/.config/guix/current/lib/systemd/system/"$1" "$dest"
chmod 664 "$dest"
systemctl daemon-reload
systemctl enable "$1"
}
cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \
/etc/systemd/system/;
chmod 664 /etc/systemd/system/guix-daemon.service;
# Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
sed -i /etc/systemd/system/guix-daemon.service \
-e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
# Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null;
then sed -i /etc/systemd/system/guix-daemon.service \
-e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8';
fi;
install_unit guix-daemon.service
configure_substitute_discovery \
/etc/systemd/system/guix-daemon.service
# Install after guix-daemon.service to avoid a harmless warning.
# systemd .mount units must be named after the target directory.
# Here we assume a hard-coded name of /gnu/store.
install_unit gnu-store.mount
systemctl daemon-reload &&
systemctl enable guix-daemon &&
systemctl start guix-daemon; } &&
_msg "${PAS}enabled Guix daemon via systemd"
;;
@ -590,7 +581,8 @@ sys_create_shell_completion()
sys_customize_bashrc()
{
prompt_yes_no "Customize users Bash shell prompt for Guix?" || return
prompt_yes_no "Customize users Bash shell prompt for Guix?" || return 0
for bashrc in /home/*/.bashrc /root/.bashrc; do
test -f "$bashrc" || continue
grep -Fq '$GUIX_ENVIRONMENT' "$bashrc" && continue
@ -609,15 +601,26 @@ fi
sys_maybe_setup_selinux()
{
if [ -f /sys/fs/selinux/policy ]
if ! [ -f /sys/fs/selinux/policy ]
then
prompt_yes_no "Install SELinux policy required to run guix-daemon?" \
|| return
local var_guix=/var/guix/profiles/per-user/root/current-guix
semodule -i "${var_guix}/share/selinux/guix-daemon.cil"
restorecon -R /gnu /var/guix
return
fi
local c
for c in semodule restorecon
do
if ! command -v "$c" &>/dev/null
then
return
fi
done
prompt_yes_no "Install SELinux policy that might be required to run guix-daemon?" \
|| return 0
local var_guix=/var/guix/profiles/per-user/root/current-guix
semodule -i "${var_guix}/share/selinux/guix-daemon.cil"
restorecon -R /gnu /var/guix
}
welcome()

29
etc/teams.scm.in
View File

@ -128,6 +128,17 @@ the haskell-build-system."
"guix/import/stackage.scm"
"guix/scripts/import/hackage.scm")))
(define-team qt
(team 'qt
#:name "Qt team"
#:description
"The Qt toolkit/library and the qt-build-system,
as well as some packages using Qt."
#:scope (list "gnu/packages/qt.scm"
"guix/build-system/qt.scm"
"guix/build/qt-build-system.scm"
"guix/build/qt-utils.scm")))
(define-team r
(team 'r
#:name "R team"
@ -142,6 +153,20 @@ and the r-build-system."
"guix/scripts/import/cran.scm"
"tests/cran.scm")))
(define-team telephony
(team 'telephony
#:name "Telephony team"
#:description
"Telephony packages and services such as Jami, Linphone, etc."
#:scope (list "gnu/build/jami-service.scm"
"gnu/packages/jami.scm"
"gnu/packages/linphone.scm"
"gnu/packages/telephony.scm"
"gnu/services/telephony.scm"
"gnu/tests/data/jami-dummy-account.dat"
"gnu/tests/telephony.scm"
"tests/services/telephony.scm")))
(define-team tex
(team 'tex
#:name "TeX team"
@ -542,7 +567,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
r core mentors tex)
(define-member (person "Christopher Baines"
"mail@cbaines.net")
"guix@cbaines.net")
core mentors ruby)
(define-member (person "Andrew Tropin"
@ -587,7 +612,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
(define-member (person "Maxim Cournoyer"
"maxim.cournoyer@gmail.com")
gnome)
gnome qt telephony)
(define (find-team name)

20
gnu/bootloader/grub.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
@ -404,17 +404,23 @@ when booting a root file system on a Btrfs subvolume."
#$linux (string-join (list #$@arguments))
#$initrd)))
(multiboot-kernel
(let ((kernel (menu-entry-multiboot-kernel entry))
(arguments (menu-entry-multiboot-arguments entry))
(modules (menu-entry-multiboot-modules entry))
(root-index 1)) ; XXX EFI will need root-index 2
(let* ((kernel (menu-entry-multiboot-kernel entry))
(arguments (menu-entry-multiboot-arguments entry))
;; Choose between device names as understood by Mach's built-in
;; IDE driver ("hdX") and those understood by rumpdisk ("wdX"
;; in the "noide" case).
(disk (if (member "noide" arguments) "w" "h"))
(modules (menu-entry-multiboot-modules entry))
(root-index 1)) ; XXX EFI will need root-index 2
#~(format port "
menuentry ~s {
multiboot ~a root=device:hd0s~a~a~a
multiboot ~a root=part:~a:device:~ad0~a~a
}~%"
#$label
#$kernel
#$root-index (string-join (list #$@arguments) " " 'prefix)
#$root-index
#$disk
(string-join (list #$@arguments) " " 'prefix)
(string-join (map string-join '#$modules)
"\n module " 'prefix))))
(chain-loader

37
gnu/build/hurd-boot.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -105,7 +105,7 @@ Return the value associated with OPTION, or #f on failure."
;; TODO: Set the 'gnu.translator' extended attribute for passive translator
;; settings?
)
(mkdir-p (scope "servers/bus/pci")))
(define (passive-translator-xattr? file-name)
"Return true if FILE-NAME has an extended @code{gnu.translator} attribute
@ -183,7 +183,8 @@ set."
(mkdir-p dir))))
(define servers
'(("servers/crash-dump-core" ("/hurd/crash" "--dump-core"))
'(("servers/bus/pci" ("/hurd/pci-arbiter"))
("servers/crash-dump-core" ("/hurd/crash" "--dump-core"))
("servers/crash-kill" ("/hurd/crash" "--kill"))
("servers/crash-suspend" ("/hurd/crash" "--suspend"))
("servers/password" ("/hurd/password"))
@ -213,6 +214,15 @@ set."
;; 'fd_to_filename' in libc expects it.
("dev/fd" ("/hurd/magic" "--directory" "fd") #o555)
("dev/rumpdisk" ("/hurd/rumpdisk") #o660)
("dev/netdde" ("/hurd/netdde") #o660)
("dev/eth0" ("/hurd/devnode" "--master-device=/dev/net"
"eth0")
#o660)
("dev/eth1" ("/hurd/devnode" "--master-device=/dev/net"
"eth1")
#o660)
;; Create a number of ttys; syslogd writes to tty12 by default.
;; FIXME: Creating /dev/tty12 leads the console client to switch to
;; tty12 when syslogd starts, which is confusing for users. Thus, do
@ -236,7 +246,22 @@ set."
("/hurd/term" ,(string-append "/dev/ttyp" n)
"pty-slave" ,(string-append "/dev/ptyp" n))
#o666))))
(iota 10 0))))
(iota 10 0))
,@(append-map (lambda (n)
(let* ((n (number->string n))
(drive (string-append "dev/wd" n))
(disk (string-append "@/dev/disk:wd" n)))
`((,drive ("/hurd/storeio" ,disk) #o600)
,@(map (lambda (p)
(let ((p (number->string p)))
`(,(string-append drive "s" p)
("/hurd/storeio"
"--store-type=typed"
,(string-append
"part:" p ":device:" disk))
#o660)))
(iota 4 1)))))
(iota 4 0))))
(for-each scope-set-translator servers)
(mkdir* "dev/vcs/1")
@ -249,6 +274,10 @@ set."
(false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout")))
(false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))
(false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash")))
(false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk")))
(false-if-EEXIST (symlink "/dev/netdde" (scope "dev/net")))
(false-if-EEXIST (symlink "/servers/socket/2" (scope "servers/socket/inet")))
(false-if-EEXIST (symlink "/servers/socket/26" (scope "servers/socket/inet6")))
;; Make sure /etc/mtab is a symlink to /proc/mounts.
(false-if-exception (delete-file (scope "etc/mtab")))

41
gnu/build/marionette.scm
View File

@ -1,7 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@ -36,6 +37,7 @@
wait-for-unix-socket
marionette-control
wait-for-screen-text
%default-ocrad-arguments
%qwerty-us-keystrokes
marionette-type
@ -287,23 +289,30 @@ Monitor\")."
;; The "quit" command terminates QEMU immediately, with no output.
(unless (string=? command "quit") (wait-for-monitor-prompt monitor)))))
(define* (invoke-ocrad-ocr image #:key (ocrad "ocrad"))
(define %default-ocrad-arguments
'("--invert" "--scale=10"))
(define* (invoke-ocrad-ocr image #:key (ocrad "ocrad")
(ocr-arguments %default-ocrad-arguments))
"Invoke the OCRAD command on image, and return the recognized text."
(let* ((pipe (open-pipe* OPEN_READ ocrad "-i" "-s" "10" image))
(let* ((command (string-join `(,ocrad ,@ocr-arguments ,image)))
(pipe (open-input-pipe command))
(text (get-string-all pipe)))
(unless (zero? (close-pipe pipe))
(error "'ocrad' failed" ocrad))
text))
(define* (invoke-tesseract-ocr image #:key (tesseract "tesseract"))
(define* (invoke-tesseract-ocr image #:key (tesseract "tesseract")
(ocr-arguments '()))
"Invoke the TESSERACT command on IMAGE, and return the recognized text."
(let* ((output-basename (tmpnam))
(output-basename* (string-append output-basename ".txt")))
(output-basename* (string-append output-basename ".txt"))
(arguments (cons* image output-basename ocr-arguments)))
(dynamic-wind
(const #t)
(lambda ()
(let ((exit-val (status:exit-val
(system* tesseract image output-basename))))
(apply system* tesseract arguments))))
(unless (zero? exit-val)
(error "'tesseract' failed" tesseract))
(call-with-input-file output-basename* get-string-all)))
@ -311,7 +320,8 @@ Monitor\")."
(false-if-exception (delete-file output-basename))
(false-if-exception (delete-file output-basename*))))))
(define* (marionette-screen-text marionette #:key (ocr "ocrad"))
(define* (marionette-screen-text marionette #:key (ocr "ocrad")
ocr-arguments)
"Take a screenshot of MARIONETTE, perform optical character
recognition (OCR), and return the text read from the screen as a string, along
the screen dump image used. Do this by invoking OCR, which should be the file
@ -324,14 +334,22 @@ if it is not needed."
;; Process it via the OCR.
(cond
((string-contains ocr "ocrad")
(values (invoke-ocrad-ocr image #:ocrad ocr) image))
(values (invoke-ocrad-ocr image
#:ocrad ocr
#:ocr-arguments
(or ocr-arguments %default-ocrad-arguments))
image))
((string-contains ocr "tesseract")
(values (invoke-tesseract-ocr image #:tesseract ocr) image))
(values (invoke-tesseract-ocr image
#:tesseract ocr
#:ocr-arguments (or ocr-arguments '()))
image))
(else (error "unsupported ocr command"))))
(define* (wait-for-screen-text marionette predicate
#:key
(ocr "ocrad")
ocr-arguments
(timeout 30)
pre-action
post-action)
@ -359,7 +377,10 @@ Likewise for POST-ACTION, except it runs at the end of a successful OCR."
'ocr-text: last-text
'screendump: screendump-backup))
(let* ((_ (and (procedure? pre-action) (pre-action)))
(text screendump (marionette-screen-text marionette #:ocr ocr))
(text screendump
(marionette-screen-text marionette
#:ocr ocr
#:ocr-arguments ocr-arguments))
(_ (and (procedure? post-action) (post-action)))
(result (predicate text)))
(cond (result

35
gnu/local.mk
View File

@ -580,6 +580,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/smalltalk.scm \
%D%/packages/sml.scm \
%D%/packages/solidity.scm \
%D%/packages/sourcehut.scm \
%D%/packages/speech.scm \
%D%/packages/sphinx.scm \
%D%/packages/spice.scm \
@ -905,6 +906,7 @@ dist_patch_DATA = \
%D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/ark-skip-xar-test.patch \
%D%/packages/patches/arpack-ng-propagate-rng-state.patch \
%D%/packages/patches/aspell-CVE-2019-25051.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
@ -956,7 +958,6 @@ dist_patch_DATA = \
%D%/packages/patches/bsd-games-stdio.h.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/biber-adapt-perl-5.36.patch \
%D%/packages/patches/bidiv-update-fribidi.patch \
%D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
@ -1038,6 +1039,10 @@ dist_patch_DATA = \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/curlftpfs-fix-error-closing-file.patch \
%D%/packages/patches/curlftpfs-fix-file-names.patch \
%D%/packages/patches/curlftpfs-fix-memory-leak.patch \
%D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/d-feet-drop-unused-meson-argument.patch \
@ -1065,6 +1070,7 @@ dist_patch_DATA = \
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/dovecot-opensslv3.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/doxygen-hurd.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 \
@ -1144,6 +1150,7 @@ dist_patch_DATA = \
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
%D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \
%D%/packages/patches/fontconfig-cache-ignore-mtime.patch \
%D%/packages/patches/fontforge-hurd.patch \
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
@ -1235,6 +1242,9 @@ dist_patch_DATA = \
%D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \
%D%/packages/patches/ghc-bytestring-handle-ghc9.patch \
%D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghostscript-CVE-2023-36664.patch \
%D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch \
%D%/packages/patches/ghostscript-leptonica-hurd.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
@ -1258,6 +1268,9 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \
%D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \
%D%/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch \
%D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \
%D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \
%D%/packages/patches/glibc-2.37-versioned-locpath.patch \
%D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \
%D%/packages/patches/glibc-hurd-gettyent.patch \
%D%/packages/patches/glibc-hurd-mach-print.patch \
@ -1282,7 +1295,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch \
%D%/packages/patches/gnumach-support-noide.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
@ -1362,6 +1375,8 @@ dist_patch_DATA = \
%D%/packages/patches/hubbub-maybe-uninitialized.patch \
%D%/packages/patches/hueplusplus-mbedtls.patch \
%D%/packages/patches/hurd-add-without-rump-configure-option.patch \
%D%/packages/patches/hurd-fix-rumpdisk-build.patch \
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \
%D%/packages/patches/hwloc-1-test-btrfs.patch \
@ -1439,6 +1454,7 @@ dist_patch_DATA = \
%D%/packages/patches/kinit-kdeinit-extra_libs.patch \
%D%/packages/patches/kio-search-smbd-on-PATH.patch \
%D%/packages/patches/kismet-unbundle-boost.patch \
%D%/packages/patches/kitty-fix-wayland-protocols.patch \
%D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
%D%/packages/patches/kobodeluxe-paths.patch \
@ -1492,6 +1508,7 @@ dist_patch_DATA = \
%D%/packages/patches/libmad-length-check.patch \
%D%/packages/patches/libmad-md_size.patch \
%D%/packages/patches/libmad-mips-newgcc.patch \
%D%/packages/patches/libmateweather-use-TZDIR.patch \
%D%/packages/patches/libmp4v2-c++11.patch \
%D%/packages/patches/libmpeg2-arm-private-symbols.patch \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \
@ -1533,6 +1550,7 @@ dist_patch_DATA = \
%D%/packages/patches/linphone-desktop-without-sdk.patch \
%D%/packages/patches/linux-libre-infodocs-target.patch \
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
%D%/packages/patches/linux-libre-wireguard-postup-privkey.patch \
%D%/packages/patches/linux-pam-no-setfsuid.patch \
%D%/packages/patches/linux-pam-unix_chkpwd.patch \
%D%/packages/patches/linuxdcpp-openssl-1.1.patch \
@ -1557,7 +1575,7 @@ dist_patch_DATA = \
%D%/packages/patches/lua-5.4-pkgconfig.patch \
%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/mactelnet-remove-init.patch \
%D%/packages/patches/mailutils-variable-lookup.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mariadb-rocksdb-atomic-linking.patch \
@ -1584,7 +1602,6 @@ dist_patch_DATA = \
%D%/packages/patches/mia-vtk9.patch \
%D%/packages/patches/mia-vtk92.patch \
%D%/packages/patches/mia-vtk-version.patch \
%D%/packages/patches/mig-cpu.h-generation.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
%D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
%D%/packages/patches/mingw-w64-reproducible-gendef.patch \
@ -1605,12 +1622,14 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutter-fix-inverted-test.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
%D%/packages/patches/nautilus-extension-search-path.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netdde-build-fix.patch \
%D%/packages/patches/netpbm-CVE-2017-2586.patch \
%D%/packages/patches/netpbm-CVE-2017-2587.patch \
%D%/packages/patches/netsurf-message-timestamp.patch \
@ -1633,7 +1652,6 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/oath-toolkit-xmlsec-compat.patch \
%D%/packages/patches/obs-modules-location.patch \
%D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
%D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
@ -1712,6 +1730,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-wxwidgets-type-errors.patch \
%D%/packages/patches/quodlibet-fix-invalid-glob.patch \
%D%/packages/patches/quodlibet-fix-mtime-tests.patch \
%D%/packages/patches/qxlsx-fix-include-directory.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 \
@ -1872,6 +1891,7 @@ dist_patch_DATA = \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
%D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \
%D%/packages/patches/racket-rktboot-riscv64-support.patch \
%D%/packages/patches/racket-rktio-bin-sh.patch \
%D%/packages/patches/racket-zuo-bin-sh.patch \
%D%/packages/patches/remake-impure-dirs.patch \
@ -1971,7 +1991,6 @@ dist_patch_DATA = \
%D%/packages/patches/telegram-purple-adjust-test.patch \
%D%/packages/patches/texi2html-document-encoding.patch \
%D%/packages/patches/texi2html-i18n.patch \
%D%/packages/patches/texlive-hyph-utf8-no-byebug.patch \
%D%/packages/patches/thefuck-test-environ.patch \
%D%/packages/patches/tidy-CVE-2015-5522+5523.patch \
%D%/packages/patches/timewarrior-time-sensitive-tests.patch \
@ -1998,8 +2017,7 @@ dist_patch_DATA = \
%D%/packages/patches/twinkle-bcg729.patch \
%D%/packages/patches/u-boot-allow-disabling-openssl.patch \
%D%/packages/patches/u-boot-fix-build-python-3.10.patch \
%D%/packages/patches/u-boot-infodocs-target.patch \
%D%/packages/patches/u-boot-patman-guix-integration.patch \
%D%/packages/patches/u-boot-fix-u-boot-lib-build.patch \
%D%/packages/patches/u-boot-nintendo-nes-serial.patch \
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
%D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
@ -2101,6 +2119,7 @@ dist_patch_DATA = \
%D%/packages/patches/xygrib-fix-finding-data.patch \
%D%/packages/patches/xygrib-newer-proj.patch \
%D%/packages/patches/yggdrasil-extra-config.patch \
%D%/packages/patches/zig-0.9-riscv-support.patch \
%D%/packages/patches/zig-do-not-link-against-librt.patch \
%D%/packages/patches/zig-use-system-paths.patch \
%D%/packages/patches/zsh-egrep-failing-test.patch

94
gnu/packages/accessibility.scm
View File

@ -93,66 +93,56 @@ terminals.")
(define-public brltty
(package
(name "brltty")
(version "6.5")
(version "6.6")
(source
(origin
(method url-fetch)
(uri
(string-append "https://brltty.app/archive/brltty-" version ".tar.gz"))
(sha256
(base32 "1h62xzd5k0aaq2k4v3w93rizxnb8psvkxrlx62wr08ybwpspgp7z"))))
(base32 "1z54rin4zhg3294pq47gamzjy2c56zfkl07rx2qy2khlpyczds0k"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; No target
;; High parallelism may cause errors such as:
;; ranlib: ./libbrlapi_stubs.a: error reading brlapi_stubs.o: file truncated
#:parallel-build? #f
#:configure-flags
(list
(string-append "--with-libbraille="
(assoc-ref %build-inputs "libbraille"))
(string-append "--with-espeak_ng="
(assoc-ref %build-inputs "espeak-ng"))
(string-append "--with-espeak="
(assoc-ref %build-inputs "espeak"))
(string-append "--with-flite="
(assoc-ref %build-inputs "flite"))
;; Required for RUNPATH validation.
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib"))
#:make-flags
(list
(string-append "JAVA_JAR_DIR="
(assoc-ref %outputs "out"))
(string-append "JAVA_JNI_DIR="
(assoc-ref %outputs "out"))
(string-append "OCAML_DESTDIR="
(assoc-ref %outputs "out")
"/lib")
(string-append "PYTHON_PREFIX="
(assoc-ref %outputs "out"))
"PYTHON_ROOT=/"
(string-append "TCL_DIR="
(assoc-ref %outputs "out")
"/lib")
"INSTALL_WRITABLE_DIRECTORY=no-thanks")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-errors
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "configure"
(("/sbin/ldconfig")
(which "true")))
;; Make Python bindings use rpath.
(substitute* "Bindings/Python/setup.py.in"
(("extra_compile_args =")
(string-append "extra_link_args = ['-Wl,-rpath="
(assoc-ref outputs "out")
"/lib'], "
"extra_compile_args = "))))))))
(list
#:tests? #f ; no target
;; High parallelism may cause errors such as:
;; ranlib: ./libbrlapi_stubs.a: error reading brlapi_stubs.o: file truncated
#:parallel-build? #f
#:configure-flags
#~(list
(string-append "--with-libbraille="
#$(this-package-input "libbraille"))
(string-append "--with-espeak_ng="
#$(this-package-input "espeak-ng"))
(string-append "--with-espeak="
#$(this-package-input "espeak"))
(string-append "--with-flite="
#$(this-package-input "flite"))
;; Required for RUNPATH validation.
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
#:make-flags
#~(list
(string-append "JAVA_JAR_DIR=" #$output)
(string-append "JAVA_JNI_DIR=" #$output)
(string-append "OCAML_DESTDIR=" #$output "/lib")
(string-append "PYTHON_PREFIX=" #$output)
"PYTHON_ROOT=/"
(string-append "TCL_DIR=" #$output "/lib")
"INSTALL_WRITABLE_DIRECTORY=no-thanks")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-errors
(lambda _
(substitute* "configure"
(("/sbin/ldconfig")
(which "true")))
;; Make Python bindings use rpath.
(substitute* "Bindings/Python/setup.py.in"
(("extra_compile_args =")
(string-append "extra_link_args = ['-Wl,-rpath="
#$output
"/lib'], "
"extra_compile_args = "))))))))
(native-inputs
(list clisp
python-cython

82
gnu/packages/admin.scm
View File

@ -59,6 +59,7 @@
;;; Copyright © 2023 Lu Hui <luhux76@gmail.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@ -113,6 +114,7 @@
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages dns)
#:use-module (gnu packages elf)
#:use-module (gnu packages file)
@ -370,14 +372,14 @@ interface and is based on GNU Guile.")
(define-public shepherd-0.10
(package
(inherit shepherd-0.9)
(version "0.10.1")
(version "0.10.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
(sha256
(base32
"1720czfchg4pzw44v0zj3rc3k6jhl3ixwnpw4v4v9bqx98ad49yw"))))
"0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj"))))
(native-inputs (modify-inputs (package-native-inputs shepherd-0.9)
(replace "guile-fibers" guile-fibers-1.3)))
(inputs (modify-inputs (package-inputs shepherd-0.9)
@ -1958,7 +1960,7 @@ system administrator.")
(define-public sudo
(package
(name "sudo")
(version "1.9.13p2")
(version "1.9.14p1")
(source (origin
(method url-fetch)
(uri
@ -1968,7 +1970,7 @@ system administrator.")
version ".tar.gz")))
(sha256
(base32
"0kapjhgyzaqk2nfzzz04ss9x6cy61s79afd3vhgkn0y1wkyh886z"))
"1bwg2bn1sbc6l2gx2r9vfqyf8dyvgp7nad0wj3p5gn095vpza6z9"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1987,9 +1989,9 @@ system administrator.")
;; 'visudo.c' expects _PATH_MV to be defined, but glibc doesn't
;; provide it.
(string-append "CPPFLAGS=-D_PATH_MV='\""
(string-append "CPPFLAGS=-D_PATH_MV=\\\""
(assoc-ref %build-inputs "coreutils")
"/bin/mv\"'"))
"/bin/mv\\\""))
;; Avoid non-determinism; see <http://bugs.gnu.org/21918>.
#:parallel-build? #f
@ -2452,13 +2454,13 @@ development, not the kernel implementation of ACPI.")
(define-public s-tui
(package
(name "s-tui")
(version "1.1.3")
(version "1.1.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "s-tui" version))
(sha256
(base32 "1l2ik5iwmb8vxa2aqdy62zfy3zfzbpq5a0pgpka2vvlw9ivpqy5p"))))
(base32 "1vf9gpfk9x6sqpz7n420ijkn3ykws8g9b77kmbmlrjsm76dnp1dj"))))
(build-system python-build-system)
(inputs
(list python-psutil python-urwid))
@ -2472,14 +2474,14 @@ utilization, temperature and power.")
(define-public stress
(package
(name "stress")
(version "1.0.5")
(version "1.0.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://debian/pool/main/s/stress/stress_"
version ".orig.tar.gz"))
(sha256
(base32
"09shpd85g8dvpiw0mnwykss676g0s7lbi8ab37xjinb5lfff960p"))))
"1cg0mklfrwfyzwqkzidd0151r8n2jgbiiqz1v0p3w4q62mkmdand"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake))
@ -2978,7 +2980,7 @@ modules and plugins that extend Ansible.")
(inputs
(list ansible
encfs
fuse
fuse-2
util-linux ;; for umount
findutils
gnupg
@ -4217,7 +4219,7 @@ hard-coded.")
(define-public thermald
(package
(name "thermald")
(version "2.5.2")
(version "2.5.3")
(source
(origin
(method git-fetch)
@ -4226,7 +4228,7 @@ hard-coded.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08w0lanhk2rncvshrvxrpm84y9f9x7aa63vxi7fg6329c94cf78k"))))
(base32 "0hpk7pjlrnj62m5zdmih7gf3nihhyphyslh5xakdjb64cvx5z25d"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -4406,7 +4408,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
(version "3.3.25-1")
(version "3.3.28-1")
(source
(origin
(method git-fetch)
@ -4415,7 +4417,7 @@ Python loading in HPC environments.")
(commit version)))
(file-name (git-file-name real-name version))
(sha256
(base32 "0mak2f06xzalccgaij9fsi20600sg05v0pmg0blvy6hvq5kh97k3"))))
(base32 "0h00dasmw3crci8kwpa503jljy3c5r2fsdhpbbczhsgznhlr8pbi"))))
(build-system trivial-build-system)
(inputs
(list bash-minimal
@ -4826,7 +4828,7 @@ LUKS volumes encrypted with the user's log-in password.")
(define-public jc
(package
(name "jc")
(version "1.23.2")
(version "1.23.3")
(source
(origin
;; The PyPI tarball lacks the test suite.
@ -4836,7 +4838,7 @@ LUKS volumes encrypted with the user's log-in password.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "17g2q0h3jwzfm80ldl8inpyh5y0qzzmgvyg10gkk1rp8i34wfgly"))))
(base32 "02rylrh2dr593xf2l865lvvxnsb9337nd4fiqbahfyz4cbqgzq3x"))))
(build-system pyproject-build-system)
(arguments
(list #:phases
@ -5852,3 +5854,49 @@ file or files to several hosts.")
(description "This package provides a graphical disk usage analyzer in
text mode.")
(license license:asl2.0)))
(define-public mactelnet
(package
(name "mactelnet")
(version "0.4.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/haakonnessjoen/MAC-Telnet")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1z63dz22crrvrm0sh2cwpyqb7wqd9m45m6f2641mwmyp6hcpf4k4"))
(patches (search-patches "mactelnet-remove-init.patch"))
(modules '((guix build utils)))
(snippet
#~(begin
(delete-file "src/utlist.h")
(substitute* (find-files "src/" "\\.c$")
(("\"utlist\\.h\"") "<utlist.h>"))))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f)) ; no tests
(native-inputs (list autoconf automake gettext-minimal))
(inputs (list uthash))
(synopsis "MAC-Telnet utilities for communicating with RouterOS devices")
(description "This package provides an implementation of the MAC-Telnet protocol
used by RouterOS devices. It provides the following commands:
@table @command
@item{macping}
Ping RouterOS devices or @command{mactelnetd} hosts.
@item{mactelnetd}
MAC-Telnet daemon.
@item{mactelnet}
MAC-Telnet client.
@item{mndp}
Discover other RouterOS devices or @command{mactelnetd} hosts.
@end table")
(home-page "https://lunatic.no/2010/10/routeros-mac-telnet-application-for-linux-users/")
(license
(list license:gpl2+
;; Note: applies to src/md5.{c,h}
;; This file is likely to be gone in the next release.
license:zlib))))

68
gnu/packages/adns.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -20,9 +21,11 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages adns)
#:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (gnu packages m4)
@ -76,18 +79,69 @@ scripts.")
"1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'filter-live-tests
(lambda _
;; Filter tests that require internet access.
(setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))))))
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'filter-live-tests
(lambda _
;; Filter tests that require internet access.
(setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
#$@(if (system-hurd?)
#~((add-after 'unpack 'skip-tests
(lambda _
(substitute* "test/ares-test-main.cc"
(("(^| )main *\\(.*" all)
(string-append all " exit (77);\n")))))
(add-after 'filter-live-tests 'filter-hurd-tests
(lambda _
(setenv "GTEST_FILTER"
(string-append
(getenv "GTEST_FILTER")
":.*Basic/2"
":.*CancelImmediate/2"
":.*CancelImmediateGetHostByAddr/2"
":.*CancelLater/1"
":.*FamilyUnspecified/2"
":.*FamilyV6/2"
":.*GetAddrInfoParallelLookups/1"
":.*GetHostByAddrDestroy/2"
":.*GetHostByNameCNAMENoData/2"
":.*GetHostByNameDestroyAbsolute/2"
":.*GetHostByNameDestroyRelative/2"
":.*GetHostByNameParallelLookups/1"
":.*HostAlias/2"
":.*HostAliasMissing/2"
":.*HostAliasMissingFile/2"
":.*NotImplResponse/2"
":.*RefusedResponse/2"
":.*Resend/1"
":.*RetryWithoutEDNS/2"
":.*SearchDomains/2"
":.*SearchDomainsBare/2"
":.*SearchDomainsServFailOnAAAA/2"
":.*SearchDomainsWithResentReply/1"
":.*SearchHighNdots/2"
":.*SearchNoDataThenFail/2"
":.*SearchNoDataThenNoDataBare/2"
":.*SearchNoDataThenSuccess/2"
":.*ServFailResponse/2"
":.*SimpleQuery/2"
":.*SockCallback/2"
":.*SockConfigureCallback/2"
":.*SortListV4/2"
":.*SortListV6/2"
":.*ThirdServer/2"
":.*TruncationRetry/1"
":.*UnspecifiedFamilyCname6A4/2"
":.*UnspecifiedFamilyV4/2"
":.*UnspecifiedFamilyV6/2")))))
#~()))))
(native-inputs
(list pkg-config))
(home-page "https://c-ares.haxx.se/")
(synopsis "C library for asynchronous DNS requests")
(description
"C-ares is a C library that performs DNS requests and name resolution
"C-ares is a C library that performs DNS requests and name resolution
asynchronously. It is intended for applications which need to perform DNS
queries without blocking, or need to perform multiple DNS queries in parallel.
The primary examples of such applications are servers which communicate with

51
gnu/packages/agda.scm
View File

@ -262,34 +262,31 @@ try agda-prelude instead.")
;; Upstream's HEAD follows the latest Agda release, but they don't release
;; until a newer Agda release comes up, so their releases are always one
;; version late.
(let* ((revision "1")
(commit "814d54b08b360b8e80828065f54b80e3a98a0092"))
(package
(name "agda-cubical")
(version (git-version "0.4" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/agda/cubical.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0d25gb1qzpx539k62qjsjq4xmzp34qk7n3hmd9y6v8slhrrxw312"))))
(build-system agda-build-system)
(arguments
(list
#:gnu-and-haskell? #t
#:phases
#~(modify-phases %standard-phases
(replace 'build
(lambda _
(invoke "make"))))))
(synopsis "Standard library for Cubical Agda")
(description "A standard library for Cubical Agda, comparable to
(package
(name "agda-cubical")
(version "0.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/agda/cubical.git")
(commit (string-append "v" version))))
(sha256
(base32
"0yfg7gr55n08ly1qgzpcp16s15k1abycppbcdi9lzg1hjryqxcg3"))))
(build-system agda-build-system)
(arguments
(list
#:gnu-and-haskell? #t
#:phases
#~(modify-phases %standard-phases
(replace 'build
(lambda _
(invoke "make"))))))
(synopsis "Standard library for Cubical Agda")
(description "A standard library for Cubical Agda, comparable to
agda-stdlib but using cubical methods.")
(home-page "https://github.com/agda/cubical")
(license license:expat))))
(home-page "https://github.com/agda/cubical")
(license license:expat)))
(define-public agda-1lab
;; Upstream doesn't do releases (yet). Use a commit that builds with 2.6.3,

9
gnu/packages/algebra.scm
View File

@ -236,8 +236,7 @@ the real span of the lattice.")
(base32
"03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63"))))
(build-system gnu-build-system)
(native-inputs (list (texlive-updmap.cfg
(list texlive-amsfonts))))
(native-inputs (list (texlive-updmap.cfg)))
(inputs (list gmp libx11 perl readline))
(arguments
'(#:make-flags '("all")
@ -406,7 +405,7 @@ precision.")
hevea
python-wrapper
readline
texlive-tiny))
(texlive-updmap.cfg)))
(home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html")
(synopsis "Computer algebra system")
(description
@ -1190,7 +1189,7 @@ features, and more.")
(define-public xtensor
(package
(name "xtensor")
(version "0.24.0")
(version "0.24.6")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1198,7 +1197,7 @@ features, and more.")
(commit version)))
(sha256
(base32
"14fpzwdq26p2fqdrmc78hny9pp09k9c53jnwlh7f8x54ikzm23c2"))
"0gf5m5p61981pv7yh5425lcv8dci948ri37hn1zlli7xg54x0g3i"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs

33
gnu/packages/android.scm
View File

@ -12,6 +12,7 @@
;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -38,6 +39,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system trivial)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
@ -721,6 +723,35 @@ file system.")
"This package provides @command{fastboot}, a tool to upload file system images to Android devices.")
(license license:asl2.0)))
(define-public sdkmanager
(package
(name "sdkmanager")
(version "0.6.5")
(source (origin
(method url-fetch)
(uri (pypi-uri "sdkmanager" version ".tar.gz"))
(sha256
(base32
"11as7n2mj3nbqsqb3ivyv9985n73i022s748qvjg36cs8ig50afx"))))
(build-system pyproject-build-system)
(inputs (list python-requests python-argcomplete python-urllib3 gnupg))
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-before 'build 'patch-gnupg
(lambda _
(substitute* "sdkmanager.py"
(("gpgv")
(string-append #$(this-package-input "gnupg")
"/bin/gpgv"))))))))
(home-page "https://gitlab.com/fdroid/sdkmanager")
(synopsis "Replacement for Android sdkmanager written in Python")
(description
"This package provides a drop-in replacement for sdkmanager from
the Android SDK. It is written in Python and part of the F-Droid
project. It implements the exact API of the Android sdkmanager command
line. The project also attempts to maintain the same terminal output.")
(license license:agpl3+)))
(define-public android-udev-rules
(package
(name "android-udev-rules")
@ -1260,7 +1291,7 @@ Java bytecode, which simplifies the analysis of Android applications.")
(build-system cmake-build-system)
(arguments
(list #:tests? #f)) ;there are no tests
(inputs (list qtbase-5 fuse-3 libxkbcommon))
(inputs (list qtbase-5 fuse libxkbcommon))
(native-inputs (list qttools-5 openssl readline))
(home-page "https://whoozle.github.io/android-file-transfer-linux/")
(synopsis "MTP client for Android devices")

22
gnu/packages/anthy.scm
View File

@ -27,15 +27,17 @@
(package
(name "anthy")
(version "9100h")
(source (origin
(method url-fetch)
;; The URI does not appear to be easily guessable. For
;; example, you cannot download version "9100g" simply
;; by replacing "9100h" in the URI.
(uri "http://dl.osdn.jp/anthy/37536/anthy-9100h.tar.gz")
(sha256
(base32
"0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
(source
(origin
(method url-fetch)
;; The URI does not appear to be easily guessable. For
;; example, you cannot download version "9100g" simply
;; by replacing "9100h" in the URI.
(uri (list (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
"distfiles/31/anthy-9100h.tar.gz")
"https://osdn.dl.osdn.net/anthy/37536/anthy-9100h.tar.gz"))
(sha256
(base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
(build-system gnu-build-system)
;; Anthy also contains elisp modules for using anthy within Emacs.
;; However, these modules are incompatible with the latest version
@ -55,7 +57,7 @@
hiragana text to mixed kana and kanji. It is written in the C
programming language. Anthy stores personal customizations (words it
has learned from the user's input, words the user has explicitly
added, etc.) in the ~/.anthy/ directory. This package contains the
added, etc.) in the @file{~/.anthy/} directory. This package contains the
anthy C libraries, the cannadic and alt-cannadic kana dictionaries, as
well as command-line tools for using anthy and managing
dictionaries.")

2
gnu/packages/aspell.scm
View File

@ -329,7 +329,7 @@ dictionaries, including personal ones.")
(define-public aspell-dict-nb
(aspell-dictionary "nb" "Norwegian Bokmål"
#:version "0.50.1-2"
#:version "0.50-2"
#:prefix "aspell-"
#:sha256
(base32

45
gnu/packages/assembly.scm
View File

@ -186,14 +186,14 @@ speed on x86, NEON on ARM, etc.).")
(define-public fasm
(package
(name "fasm")
(version "1.73.30")
(version "1.73.31")
(source
(origin
(method url-fetch)
(uri (string-append "https://flatassembler.net/fasm-"
version ".tgz"))
(sha256
(base32 "00giqb94z8cxhv20yiyk8axkd2kzjcg1c0841yzbn7c8lm8m06bm"))))
(base32 "1qqg1czr9dr73l4gwrwim85mjs65al7vv8b292jipywimhhwnf4g"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests exist
@ -346,7 +346,7 @@ package for the Game Boy and Game Boy Color. It consists of:
(define-public wla-dx
(package
(name "wla-dx")
(version "10.1")
(version "10.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -355,20 +355,21 @@ package for the Game Boy and Game Boy Color. It consists of:
(file-name (git-file-name name version))
(sha256
(base32
"1nh2k2xn5fj389gq68f3fxgrxakgn8c6dw2ffqay86s3706hac9w"))))
"1h6apmhaks4772s2cja34ck488p8yhb3nscbxjw5061ml2046zqq"))))
(build-system cmake-build-system)
(native-inputs (list python-sphinx)) ; to generate man pages
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'copy-tests-to-build-directory
(lambda _
(copy-recursively "../source/tests" "tests")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(let ((sh (which "sh")))
(when tests?
(invoke sh "../source/run_tests.sh"))))))))
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'copy-tests-to-build-directory
(lambda _
(copy-recursively "../source/tests" "tests")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(let ((sh (which "sh")))
(when tests?
(invoke sh "../source/run_tests.sh"))))))))
(home-page "https://github.com/vhelin/wla-dx")
(synopsis "Assemblers for various processors")
(description "WLA DX is a set of tools to assemble assembly files to
@ -395,21 +396,23 @@ Supported architectures are:
(define-public xa
(package
(name "xa")
(version "2.3.12")
(version "2.3.14")
(source (origin
(method url-fetch)
(uri (string-append "https://www.floodgap.com/retrotech/xa"
"/dists/xa-" version ".tar.gz"))
(sha256
(base32
"0107zdwc2rzlp26pyx7gns4lqmiyg68nmpgwrg36yrrd04v1bzgq"))))
"0bph41aglxl07rnggrir2dl1x97f52hm0bl51d0vklyqvfyvm6qv"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; TODO: custom test harness, not sure how it works
#:phases
(modify-phases %standard-phases
(delete 'configure)) ; no "configure" script
#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))))
(list
#:tests? #f ; TODO: custom test harness, not sure how it works
#:phases
#~(modify-phases %standard-phases
(delete 'configure)) ; no "configure" script
#:make-flags
#~(list (string-append "DESTDIR=" #$output)))) ; no $prefix support
(native-inputs (list perl))
(home-page "https://www.floodgap.com/retrotech/xa/")
(synopsis "Two-pass portable cross-assembler")

91
gnu/packages/astronomy.scm
View File

@ -60,6 +60,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
@ -420,6 +421,30 @@ made to get a better separation of core libraries and applications.
@url{https://casa.nrao.edu/, CASA} is now built on top of Casacore.")
(license license:gpl2+)))
(define-public ccfits
(package
(name "ccfits")
(version "2.6")
(source
(origin
(method url-fetch)
(uri (string-append
"https://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/"
"CCfits-" version ".tar.gz"))
(sha256
(base32 "04l6na8vr5xadz3rbx62as79x1ch4994vbb625kx0dz5czdkkd1b"))))
(build-system cmake-build-system)
(inputs (list cfitsio))
(home-page "https://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/")
(synopsis "C++ interface to the CFITSIO")
(description
"CCfits is an object oriented interface to the cfitsio library. It is
designed to make the capabilities of cfitsio available to programmers working in
C++. It is written in ANSI C++ and implemented using the C++ Standard Library
with namespaces, exception handling, and member template functions.")
(license (license:non-copyleft "file://License.txt"
"See License.txt in the distribution."))))
(define-public cfitsio
(package
(name "cfitsio")
@ -428,7 +453,7 @@ made to get a better separation of core libraries and applications.
(origin
(method url-fetch)
(uri (string-append
"http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
"https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
"cfitsio-" version ".tar.gz"))
(sha256
(base32 "128qsv2q0f0g714ahlsixiikvvbwxi9bg9q9pcr5cd3f7wdkv9gb"))))
@ -733,6 +758,66 @@ polygon data in order to produce control maps which can directly be used in
astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
(license license:gpl3+)))
(define-public glnemo2
(package
(name "glnemo2")
(version "1.21.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.lam.fr/jclamber/glnemo2")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1jmmxszh8d2jmfghig36nhykff345mqnpssfa64d0r7l9cnfp3cn"))))
(build-system cmake-build-system)
(arguments
(list
#:tests? #f ; No test target
#:configure-flags #~(list "CPPFLAGS=-fcommon")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-libraries-paths
(lambda _
(substitute* "CMakeLists.txt"
;; There is some not straightforward logic on how to set
;; the installation prefix for the project; inherit it
;; from the build-system default flags.
(("CMAKE_INSTALL_PREFIX \"/usr\"")
"CMAKE_INSTALL_PREFIX")
(("/usr/include/CCfits")
(string-append
#$(this-package-input "ccfits") "/include/CCfits"))
(("/usr/include/tirpc")
(string-append
#$(this-package-input "libtirpc") "/include/tirpc"))
;; It tries to detect library in two "predictable" paths,
;; required during the link phase.
(("/usr/lib64/libtirpc.so")
(string-append
#$(this-package-input "libtirpc") "/lib/libtirpc.so"))))))))
(inputs
(list ccfits
cfitsio
glm
glu
hdf5
libtirpc
qtbase-5
zlib))
(home-page "https://projets.lam.fr/projects/unsio/wiki")
(synopsis "3D interactive visualization program for n-body like particles")
(description
"GLNEMO2 is an interactive 3D visualization program which displays
particles positions of the different components (gas, stars, disk, dark
matter halo, bulge) of an N-body snapshot. It is a tool for running
N-body simulations from isolated galaxies to cosmological simulations.
It has a graphical user interface (based on QT 5.X API), uses a fast
3D engine (OPenGL and GLSL), and is generic with the possibility to load
different kinds of input files.")
(license license:cecill)))
(define-public gnuastro
(package
(name "gnuastro")
@ -1058,7 +1143,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(define-public stellarium
(package
(name "stellarium")
(version "23.1")
(version "23.2")
(source
(origin
(method git-fetch)
@ -1067,7 +1152,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "03gq7n15dsvb32pfq7j3a0vc5wf1y9xdxaq09q1gp534jkgd4g7f"))))
(base32 "0fkiibc6m8kfmyf5my7ynfrpdlrcri14cl26swpgv3bhzxpmx27h"))))
(build-system cmake-build-system)
;; TODO: Complete documentation build and split into dedicated outputs.
(arguments

81
gnu/packages/audio.scm
View File

@ -147,8 +147,8 @@
#:use-module (guix build-system trivial)
#:use-module (guix build-system waf)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@ -721,25 +721,18 @@ streams from live audio.")
purposes developed at Queen Mary, University of London.")
(license license:gpl2+)))
(define (ardour-rpath-phase major-version)
`(lambda* (#:key outputs #:allow-other-keys)
(let ((libdir (string-append (assoc-ref outputs "out")
"/lib/ardour" ,major-version)))
(substitute* "wscript"
(("linker_flags = \\[\\]")
(string-append "linker_flags = [\""
"-Wl,-rpath="
libdir ":"
libdir "/backends" ":"
libdir "/engines" ":"
libdir "/panners" ":"
libdir "/surfaces" ":"
libdir "/vamp" "\"]"))))))
(define ardour-bundled-media
(origin
(method url-fetch)
(uri "http://stuff.ardour.org/loops/ArdourBundledMedia.zip")
(sha256
(base32
"0k135sm559yywfidrya7h5cddwqa2p2abhimrar2khydf43f03d0"))))
(define-public ardour
(package
(name "ardour")
(version "7.4")
(version "7.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -756,7 +749,7 @@ purposes developed at Queen Mary, University of London.")
namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
(sha256
(base32
"0v66h9fghjyjinldw9yfhhlfi3my235x6n4dpxx432z35lka2h89"))
"18pgxnxfp0pqsy24cmf3hanr6vh0pnimsh48x5nfbflqy7ljsrkj"))
(file-name (string-append name "-" version))))
(build-system waf-build-system)
(arguments
@ -769,7 +762,20 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-rpath-in-LDFLAGS
,(ardour-rpath-phase (version-major version)))
(lambda* (#:key outputs #:allow-other-keys)
(let ((libdir (string-append (assoc-ref outputs "out")
"/lib/ardour"
,(version-major version))))
(substitute* "wscript"
(("linker_flags = \\[\\]")
(string-append "linker_flags = [\""
"-Wl,-rpath="
libdir ":"
libdir "/backends" ":"
libdir "/engines" ":"
libdir "/panners" ":"
libdir "/surfaces" ":"
libdir "/vamp" "\"]"))))))
(add-after 'install 'install-freedesktop-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -794,7 +800,14 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
(add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys)
(install-file "ardour.1" (string-append (assoc-ref outputs "out")
"/share/man/man1")))))
"/share/man/man1"))))
(add-after 'install 'install-bundled-media
(lambda* (#:key outputs #:allow-other-keys)
(invoke "unzip" "-d" (string-append (assoc-ref outputs "out")
"/share/ardour"
,(version-major version)
"/media/")
,ardour-bundled-media))))
#:test-target "test"))
(inputs
(list alsa-lib
@ -849,14 +862,17 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
gettext-minimal
itstool
perl
pkg-config))
pkg-config
unzip))
(home-page "https://ardour.org")
(synopsis "Digital audio workstation")
(description
"Ardour is a multi-channel digital audio workstation, allowing users to
record, edit, mix and master audio and MIDI projects. It is targeted at audio
engineers, musicians, soundtrack editors and composers.")
(license license:gpl2+)))
(license (list license:gpl2+
license:cc0 ;used by MIDI Beats
license:expat)))) ;used by MIDI Chords and Progressions
(define-public audacity
(package
@ -1400,7 +1416,7 @@ envelope follower, distortion effects, tape effects and more.")
(define-public snapcast
(package
(name "snapcast")
(version "0.26.0")
(version "0.27.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1409,7 +1425,7 @@ envelope follower, distortion effects, tape effects and more.")
(file-name (git-file-name name version))
(sha256
(base32
"091gf3k1xv3k0m0kf2apr9bwiifw2czjcksd3vzwy544sfgrya08"))))
"10l5hvmaqr9ykipsnzl95wqg19ff36rhpa1q88axxcia0k2valkn"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no included tests
@ -5194,7 +5210,7 @@ bluetooth profile.")
(define-public libopenshot-audio
(package
(name "libopenshot-audio")
(version "0.3.1")
(version "0.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -5203,7 +5219,7 @@ bluetooth profile.")
(file-name (git-file-name name version))
(sha256
(base32
"164ibsp5g162cyjgpa0ap35h75igmfnmhxmwkkk1fvm1cpbf1jgj"))))
"0g49akqhd0jsd0ar6sacdqz6cv8y0a4zclnyliifiidxrkv43fiw"))))
(build-system cmake-build-system)
(inputs
(list alsa-lib
@ -5214,11 +5230,12 @@ bluetooth profile.")
libxinerama
libxcursor))
(arguments
`(#:tests? #f ;there are no tests
#:configure-flags
(list (string-append "-DCMAKE_CXX_FLAGS=-I"
(assoc-ref %build-inputs "freetype")
"/include/freetype2"))))
(list
#:tests? #f ; there are no tests
#:configure-flags
#~(list (string-append "-DCMAKE_CXX_FLAGS=-I"
#$(this-package-input "freetype")
"/include/freetype2"))))
(home-page "https://openshot.org")
(synopsis "Audio editing and playback for OpenShot")
(description "OpenShot Audio Library (libopenshot-audio) allows
@ -6236,7 +6253,7 @@ and DSD streams.")
(define-public qpwgraph
(package
(name "qpwgraph")
(version "0.4.4")
(version "0.4.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6245,7 +6262,7 @@ and DSD streams.")
(file-name (git-file-name name version))
(sha256
(base32
"05j98y8j3f0dybaal6qawq9nsrvr1hylsnig4yk6si16mhb32y7l"))))
"06pgkma0i9dbir74cfhgnnkqjcq8z496by4lk1whqcj7j9ldbi2l"))))
(build-system cmake-build-system)
(arguments (list #:tests? #f)) ;; no tests
(inputs (list alsa-lib

16
gnu/packages/authentication.scm
View File

@ -62,15 +62,14 @@
(define-public oath-toolkit
(package
(name "oath-toolkit")
(version "2.6.7")
(version "2.6.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(patches (search-patches "oath-toolkit-xmlsec-compat.patch"))
(sha256
(base32 "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n"))))
(base32 "11g9r1avl3d2nnkglk0g7d6z6gs5padk75xqzvbxp9pir0qwhfik"))))
(build-system gnu-build-system)
(arguments
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.
@ -93,16 +92,16 @@
(inputs
(list linux-pam openssl xmlsec-openssl))
(home-page "https://www.nongnu.org/oath-toolkit/")
(synopsis "One-time password (OTP) components")
(synopsis "@acronym{OTP, one-time password} components")
(description
"The @dfn{OATH} (Open AuTHentication) Toolkit provides various components
for building one-time password (@dfn{OTP}) authentication systems:
"The @acronym{OATH, Open AuTHentication} Toolkit provides various
components for building @acronym{OTP, One-Time Password} authentication systems:
@itemize
@item @command{oathtool}, a command-line tool for generating & validating OTPs.
@item @code{liboath}, a C library for OATH handling.
@item @command{pskctool}, a command-line tool for manipulating secret key
files in the Portable Symmetric Key Container (@dfn{PSKC}) format
files in the @acronym{PSKC, Portable Symmetric Key Container} format
described in RFC6030.
@item @code{libpskc}, a shared and static C library for PSKC handling.
@item @code{pam_oath}, a PAM module for pluggable login authentication.
@ -111,8 +110,7 @@ described in RFC6030.
Supported technologies include the event-based @acronym{HOTP, Hash-based Message
Authentication Code One-Time Password} algorithm (RFC4226), the time-based
@acronym{TOTP, Time-based One-Time Password} algorithm (RFC6238), and
@acronym{PSKC, Portable Symmetric Key Container} (RFC6030) to manage secret key
data.")
PSKC (RFC6030) to manage secret key data.")
(license (list license:lgpl2.1+ ; the libraries (liboath/ & libpskc/)
license:gpl3+)))) ; the tools (everything else)

1
gnu/packages/autotools.scm
View File

@ -158,7 +158,6 @@ know anything about Autoconf or M4.")
"1fjm21k2na07f3vasf288a0zx66lbv0hd3l9bvv3q8p62s3pg569"))))))
(define-public autoconf-2.64
;; As of GDB 7.8, GDB is still developed using this version of Autoconf.
(package (inherit autoconf)
(version "2.64")
(source

10777
gnu/packages/aux-files/linux-libre/6.4-arm.conf 100644
View File

File diff suppressed because it is too large Load Diff

11406
gnu/packages/aux-files/linux-libre/6.4-arm64.conf 100644
View File

File diff suppressed because it is too large Load Diff

11652
gnu/packages/aux-files/linux-libre/6.4-i686.conf 100644
View File

File diff suppressed because it is too large Load Diff

11837
gnu/packages/aux-files/linux-libre/6.4-x86_64.conf 100644
View File

File diff suppressed because it is too large Load Diff

16
gnu/packages/backup.scm
View File

@ -391,7 +391,7 @@ list and implement the backup strategy.")
(define-public snapraid
(package
(name "snapraid")
(version "12.0")
(version "12.2")
(source
(origin
(method git-fetch)
@ -400,7 +400,7 @@ list and implement the backup strategy.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0k8pynafkx8bhnqnjhc3jsds5p40sflz4drm88i6dg6ifv35mhh9"))))
(base32 "0xgvyhyyl2v6azxwzqbpgyln4r2dw34xa8z09116vpkgdgivh36z"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@ -480,14 +480,14 @@ errors.")
(define-public rdiff-backup
(package
(name "rdiff-backup")
(version "2.2.4")
(version "2.2.5")
(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 "1xfvy1xql8zl7rprnaxwya8bp9g7rg8v5pwhr93svhj2594m30cl"))))
(base32 "13m0kq9y6rzgaq0zlzh7qhi789qmbzp3dnc7y57fmhsfg1mq5ql6"))))
(build-system python-build-system)
(native-inputs
(list python-setuptools-scm))
@ -634,13 +634,13 @@ detection, and lossless compression.")
(define-public borg
(package
(name "borg")
(version "1.2.3")
(version "1.2.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
(base32 "11b7jqv9sw22a9512b270d12k3mrcgmmcaimh6bgm5iwcgw1h973"))
(base32 "1a2d6z2ln476l0fcnkl4rpciij5b2lql44b71aivg0cy8vlm9gd4"))
(modules '((guix build utils)))
(snippet
#~(begin
@ -768,14 +768,14 @@ backups on untrusted computers.")
(define-public wimlib
(package
(name "wimlib")
(version "1.13.5")
(version "1.14.1")
(source (origin
(method url-fetch)
(uri (string-append "https://wimlib.net/downloads/"
"wimlib-" version ".tar.gz"))
(sha256
(base32
"08z3xxm5hq1n4wmyhgz14p1cv0w2lx610vn8nhfwpds4n7lwkz1j"))))
"0hkgcf3v3hmwck02s0623brdx1ijvk1la0h5mgly1whnaqviajj9"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))

152
gnu/packages/base.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -75,6 +76,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (glibc
libc-for-target
make-ld-wrapper
libiconv-if-needed))
@ -132,21 +134,17 @@ command-line arguments, multiple languages, and so on.")
(string-append bin "/fgrep"))
(("^exec grep")
(string-append "exec " bin "/grep"))))))
,@(if (target-hurd?)
'((add-before 'check 'skip-triple-backref-test
,@(if (system-hurd?)
'((add-before 'check 'skip-test
(lambda _
;; This test is marked as malfunctioning on glibc systems
;; due to
;; <https://sourceware.org/bugzilla/show_bug.cgi?id=11053>
;; and it triggers a segfault with glibc 2.33 on GNU/Hurd.
;; Skip it.
(substitute* "tests/triple-backref"
(("^warn_" all)
(string-append "exit 77\n" all))))))
'()))
#:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX
''())))
(substitute*
;; This test hangs
'("tests/hash-collision-perf"
;; This test fails
"tests/file")
(("^#!.*" all)
(string-append all "exit 77;\n"))))))
'()))))
(synopsis "Print lines matching a pattern")
(description
"grep is a tool for finding text inside files. Text is found by
@ -185,10 +183,6 @@ including, for example, recursive directory searching.")
" CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n")))))
(modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments
`(#:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-perror2")
''())))
(synopsis "Stream editor")
(native-inputs (list perl)) ;for tests
(description
@ -309,9 +303,15 @@ differences.")
(patches (search-patches "diffutils-fix-signal-processing.patch"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-perror2 large-subopt")
''())))
(list
#:phases (if (system-hurd?)
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-tests
(lambda _
(substitute* "tests/large-subopt"
(("^#!.*" all)
(string-append all "exit 77;\n"))))))
#~%standard-phases)))
(native-inputs (list perl))
(synopsis "Comparing and merging files")
(description
@ -346,10 +346,16 @@ interactive means to merge two files.")
(substitute* '("tests/xargs/verbose-quote.sh"
"tests/find/exec-plus-last-file.sh")
(("#!/bin/sh")
(string-append "#!" (which "sh")))))))
#:make-flags ,(if (target-hurd?)
''("XFAIL_TESTS=test-strerror_r")
''())))
(string-append "#!" (which "sh"))))))
,@(if (system-hurd?)
'((add-after 'unpack 'skip-tests
(lambda _
(substitute*
;; This test fails non-deterministically
"gnulib-tests/test-strerror_r.c"
(("(^| )main *\\(.*" all)
(string-append all "{\n exit (77);//"))))))
'()))))
(synopsis "Operating on files matching given criteria")
(description
"Findutils supplies the basic file directory searching utilities of the
@ -395,23 +401,13 @@ used to apply commands with arbitrarily long arguments.")
(outputs '("out" "debug"))
(arguments
`(#:parallel-build? #f ; help2man may be called too early
,@(if (target-hurd?)
,@(if (system-hurd?)
'(#:make-flags ; these tests fail deterministically
(list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
" tests/misc/kill.sh"
" tests/misc/nice.sh"
" tests/misc/pwd-long.sh"
" tests/split/fail.sh"
;; /hurd/fifo issue:
;; <https://issues.guix.gnu.org/58803>.
" tests/df/unreadable.sh"
(list (string-append "XFAIL_TESTS="
;; Gnulib tests.
" test-fdutimensat"
" test-futimens"
" test-linkat"
" test-perror2"
" test-renameat"
" test-renameatu"
" test-utimensat")))
@ -433,10 +429,35 @@ used to apply commands with arbitrarily long arguments.")
(("#!/bin/sh") (string-append "#!" (which "sh"))))))
(add-after 'unpack 'remove-tests
(lambda _
,@(if (target-hurd?)
'((substitute* "Makefile.in"
;; this test hangs
(("^ *tests/misc/timeout-group.sh.*") ""))
,@(if (system-hurd?)
'((substitute*
;; These tests hang
'("tests/cp/sparse-to-pipe.sh"
"tests/split/fail.sh"
;; These tests error
"tests/dd/nocache.sh"
;; These tests fail
"tests/cp/sparse.sh"
"tests/cp/special-f.sh"
"tests/dd/bytes.sh"
"tests/dd/stats.sh"
"tests/ls/dangle.sh"
"tests/ls/follow-slink.sh"
"tests/ls/hyperlink.sh"
"tests/ls/infloop.sh"
"tests/ls/inode.sh"
"tests/ls/selinux-segfault.sh"
"tests/misc/env-S.pl"
"tests/misc/factor-parallel.sh"
"tests/misc/ls-misc.pl"
"tests/misc/nice.sh"
"tests/misc/pwd-long.sh"
"tests/misc/shred-passes.sh"
"tests/misc/stat-slash.sh"
"tests/rm/fail-eperm.xpl"
"tests/split/filter.sh")
(("^#!.*" all)
(string-append all "exit 77;\n")))
(substitute* "gnulib-tests/Makefile.in"
;; This test sometimes fails and sometimes
;; passes, but it does this consistently, so
@ -1419,25 +1440,44 @@ variety of options. It is an alternative to the shell \"type\" built-in
command.")
(license gpl3+))) ; some files are under GPLv2+
(define-public glibc/hurd
(package/inherit glibc
(name "glibc-hurd")
(version "2.37")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
(sha256
(base32
"0hqsp4dzrjx0iga6jv0magjw26dh82pxlmk8yis5v0d127qyymr2"))
(patches (search-patches "glibc-ldd-powerpc.patch"
"glibc-dl-cache.patch"
"glibc-2.37-versioned-locpath.patch"
"glibc-reinstate-prlimit64-fallback.patch"
"glibc-supported-locales.patch"
"glibc-2.37-hurd-clock_t_centiseconds.patch"
"glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
"glibc-hurd-mach-print.patch"
"glibc-hurd-gettyent.patch"))))
(supported-systems %hurd-systems)))
(define-public glibc/hurd-headers
(package (inherit glibc)
(package/inherit glibc/hurd
(name "glibc-hurd-headers")
(outputs '("out"))
(propagated-inputs (list gnumach-headers hurd-headers))
(native-inputs
(modify-inputs (package-native-inputs glibc)
(modify-inputs (package-native-inputs glibc/hurd)
(prepend (if (%current-target-system)
;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
;; hence this hack.
(package (inherit mig)
(arguments `(#:system "i686-linux")))
(let* ((cross-base (resolve-interface '(gnu packages cross-base)))
(cross-mig (module-ref cross-base 'cross-mig)))
(cross-mig (%current-target-system)))
mig))))
(arguments
(substitute-keyword-arguments (package-arguments glibc)
(substitute-keyword-arguments (package-arguments glibc/hurd)
;; We just pass the flags really needed to build the headers.
((#:configure-flags flags)
`(list "--enable-add-ons"
"--host=i586-pc-gnu"
,@%glibc/hurd-configure-flags))
((#:phases _)
'(modify-phases %standard-phases
@ -1452,7 +1492,17 @@ command.")
(close-port
(open-output-file
(string-append out "/include/gnu/stubs.h"))))))
(delete 'build))))))) ; nothing to build
(delete 'build))))) ; nothing to build
(supported-systems %hurd-systems)))
(define* (libc-for-target #:optional
(target (or (%current-target-system)
(%current-system))))
(match target
((? target-hurd?)
glibc/hurd)
(_
glibc)))
(define-public tzdata
(package
@ -1602,6 +1652,6 @@ package needs iconv ,@(libiconv-if-needed) should be added."
"Return the list of \"final inputs\"."
;; Avoid circular dependency by lazily resolving 'commencement'.
(let ((iface (resolve-interface '(gnu packages commencement))))
(module-ref iface '%final-inputs)))
((module-ref iface '%final-inputs) (%current-system))))
;;; base.scm ends here

1027
gnu/packages/bioconductor.scm
View File

File diff suppressed because it is too large Load Diff

231
gnu/packages/bioinformatics.scm
View File

@ -1254,7 +1254,9 @@ libblasr_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n"
(list boost hdf5 htslib pbbam zlib))
(native-inputs
(list googletest pkg-config))
(home-page "https://github.com/PacificBiosciences/blasr_libcpp")
(home-page
(string-append "https://web.archive.org/web/20201106122415/"
"https://github.com/PacificBiosciences/blasr_libcpp"))
(synopsis "Library for analyzing PacBio genomic sequences")
(description
"This package provides three libraries used by applications for analyzing
@ -1296,7 +1298,8 @@ cpp.find_library('hdf5_cpp', dirs : '~a'), "
(list boost blasr-libcpp hdf5 pbbam zlib))
(native-inputs
(list pkg-config))
(home-page "https://github.com/PacificBiosciences/blasr")
(home-page (string-append "https://web.archive.org/web/20210813124135/"
"https://github.com/PacificBiosciences/blasr"))
(synopsis "PacBio long read aligner")
(description
"Blasr is a genomic sequence aligner for processing PacBio long reads.")
@ -1408,11 +1411,12 @@ Format (GFF) with Biopython integration.")
(license (license:non-copyleft "http://www.biopython.org/DIST/LICENSE"))))
(define-public python-bcbio-gff/biopython-1.73
(package
(inherit python-bcbio-gff)
(propagated-inputs
(modify-inputs (package-propagated-inputs python-bcbio-gff)
(replace "python-biopython" python-biopython-1.73)))))
(hidden-package
(package
(inherit python-bcbio-gff)
(propagated-inputs
(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
@ -1676,11 +1680,11 @@ and sequence consensus.")
(define-public python-decoupler-py
;; This latest commit fixes a bug in test_omnip.py.
(let ((commit "b84c524ec4a9280a56c0db963e2c7b010316ce8f")
(let ((commit "459b235348ddd9135217a3722d9dd1caa9a14ace")
(revision "1"))
(package
(name "python-decoupler-py")
(version (git-version "1.3.1" revision commit))
(version (git-version "1.5.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -1689,7 +1693,7 @@ and sequence consensus.")
(file-name (git-file-name name version))
(sha256
(base32
"0d74yr5jqc52vcxaca84kxqw7m5rbazpmvnrcp2y4xxrj6yr1sfc"))))
"1c0xk006iilyffdaqar2d05qdhik22fbkny387zx0bndkgqifxhl"))))
(build-system pyproject-build-system)
(arguments
(list
@ -1700,6 +1704,10 @@ and sequence consensus.")
" and not test_show_resources"
" and not test_get_dorothea"
" and not test_get_progeny"
" and not test_get_ksn_omnipath"
;; XXX module 'omnipath.interactions' has no
;; attribute 'CollecTRI'
" and not test_get_collectri"
;; XXX This one fails because the "texts" list
;; is empty, so there are no texts to adjust.
;; It is not clear whether this a compatibility
@ -1859,6 +1867,61 @@ protocol. It provides a simple and reliable way to retrieve genomic data from
servers supporting the protocol.")
(license license:asl2.0)))
(define-public python-liana-py
(package
(name "python-liana-py")
(version "0.1.9")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/saezlab/liana-py")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"00lqrmi38wmdpjlcafgmrnkwsbp0yvm2rya6qs8y6jfizww9ff8i"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list "-k"
;; These tests require internet access.
(string-append "not test_generate_lr_resource"
" and not test_generate_nondefault_lr_resource"))
#:phases
'(modify-phases %standard-phases
;; Numba needs a writable directory to cache functions.
(add-before 'build 'set-numba-cache-dir
(lambda _ (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
(propagated-inputs (list python-anndata
python-cell2cell
python-decoupler-py
python-hypothesis
python-ipykernel
python-ipython
python-mofax
python-mudata
python-nbconvert
python-nbsphinx
python-numpydoc
python-omnipath
python-pandas
python-plotnine
python-pypandoc
python-scipy
python-requests
python-scanpy
python-statsmodels
python-tqdm
tzdata))
(native-inputs
(list python-black python-pytest python-pytest-cov python-numpy))
(home-page "https://github.com/saezlab/liana-py")
(synopsis "LIANA is a ligand-receptor analysis framework")
(description "This is a Ligand-Receptor inference framework. The
framework enables the use of any LR method with any resources.")
(license license:gpl3+)))
(define-public python-logomaker
(package
(name "python-logomaker")
@ -3347,7 +3410,9 @@ and more accurate. BWA-MEM also has better performance than BWA-backtrack for
(("inline int map") "int map"))))))))
(inputs
(list gdsl zlib perl))
(home-page "http://bwa-pssm.binf.ku.dk/")
;; https://bwa-pssm.binf.ku.dk is down, and all Web Archived copies are
;; blank (they actually have "display:none" for some nefarious reason).
(home-page "https://github.com/pkerpedjiev/bwa-pssm")
(synopsis "Burrows-Wheeler transform-based probabilistic short read mapper")
(description
"BWA-PSSM is a probabilistic short genomic sequence read aligner based on
@ -4759,17 +4824,15 @@ data and settings.")
(list boost cairo rmath-standalone))
(native-inputs
(list (texlive-updmap.cfg
(list texlive-cm
texlive-amsfonts
texlive-doi
texlive-fonts-ec
texlive-latex-examplep
texlive-hyperref
(list texlive-doi
texlive-examplep
texlive-forloop
texlive-listofitems
texlive-ms
texlive-latex-natbib
texlive-bibtex ;style files used by natbib
texlive-natbib
texlive-pgf ;tikz
texlive-latex-verbatimbox))
texlive-readarray
texlive-verbatimbox))
imagemagick))
(home-page "https://dorina.mdc-berlin.de/public/rajewsky/discrover/")
(synopsis "Discover discriminative nucleotide sequence motifs")
@ -4993,6 +5056,54 @@ software to answer ad hoc questions.")
go-golang-org-x-image
go-golang-org-x-text))))
(define-public python-baltica
(package
(name "python-baltica")
(version "1.1.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dieterich-lab/Baltica")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"001ac03v9pbqqzf9pv7v8gf0296ksa4f0v3wdmpa6m9701skqi4r"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; The tests need to be run from elsewhere...
(mkdir-p "/tmp/test")
(copy-recursively ".tests" "/tmp/test")
(with-directory-excursion "/tmp/test"
(invoke "pytest" "-v" "--doctest-modules"))))))))
(propagated-inputs
(list gunicorn
python-anndata
python-click
python-flask
python-flask-wtf
python-h5py
python-numpy
python-psutil
python-pysam
python-pyyaml
python-scipy
snakemake-7))
(native-inputs (list python-cython python-pyfakefs python-pytest))
(home-page "https://github.com/dieterich-lab/Baltica")
(synopsis "Integrated splice junction usage analysis")
(description
"This framework facilitates the execution of @dfn{differential junction
usage} (DJU) methods. Additionally, it enables the integration of results from
multiple DJU methods.")
(license license:expat)))
(define-public python-bamnostic
(package
(name "python-bamnostic")
@ -7273,7 +7384,9 @@ program for nucleotide and protein sequences.")
"1hkw21rq1mwf7xp0rmbb2gqc0i6p11108m69i7mr7xcjl268pxnb"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags (list "CFLAGS=-O2 -g -fcommon")))
`(#:tests? ,(not (or (target-riscv64?) ;XXX: stuck on riscv64-linux
(%current-target-system)))
#:make-flags (list "CFLAGS=-O2 -g -fcommon")))
(inputs
;; XXX: TODO: Enable Lua and Guile bindings.
;; https://github.com/tjunier/newick_utils/issues/13
@ -8707,7 +8820,7 @@ unique transcripts.")
(list ngs-sdk
ncbi-vdb
file
fuse
fuse-2
hdf5-1.10
libxml2
zlib
@ -9826,6 +9939,14 @@ differently labelled data.")
(base32 "04kr1b28p5j7h48g32cldkg87xcmxnmd4kspygkfs7a4amihpi66"))))
(properties `((upstream-name . "Pando")))
(build-system r-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
(substitute* "DESCRIPTION"
((" \\(==.*,") ",")))))))
(propagated-inputs
(list r-bayestestr
r-foreach
@ -12088,16 +12209,15 @@ programs for inferring phylogenies (evolutionary trees).")
(list automake
autoconf
openmpi
(texlive-updmap.cfg (list texlive-amsfonts
texlive-caption
texlive-cite
texlive-fancyvrb
texlive-fonts-ec
texlive-graphics
texlive-grfext
texlive-hyperref
texlive-latex-psfrag
texlive-xcolor))))
(texlive-updmap.cfg
(list texlive-caption
texlive-cite
texlive-fancyvrb
texlive-infwarerr
texlive-kvoptions
texlive-pdftexcmds
texlive-psfrag
texlive-xcolor))))
(home-page "https://github.com/stephaneguindon/phyml")
(synopsis "Programs for working on SAM/BAM files")
(description
@ -17051,32 +17171,33 @@ to an artifact/contaminant file.")
(delete-file-recursively "third-party")))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("OPENMP=t")
#:test-target "test"
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'fix-zlib-include
(lambda _
(substitute* "src/binarySequences.c"
(("../third-party/zlib-1.2.3/zlib.h") "zlib.h"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(doc (string-append out "/share/doc/velvet")))
(mkdir-p bin)
(mkdir-p doc)
(install-file "velveth" bin)
(install-file "velvetg" bin)
(install-file "Manual.pdf" doc)
(install-file "Columbus_manual.pdf" doc)))))))
(list
#:make-flags #~(list "OPENMP=t")
#:test-target "test"
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'fix-zlib-include
(lambda _
(substitute* "src/binarySequences.c"
(("../third-party/zlib-1.2.3/zlib.h") "zlib.h"))))
(replace 'install
(lambda _
(let ((bin (string-append #$output "/bin"))
(doc (string-append #$output "/share/doc/velvet")))
(mkdir-p bin)
(mkdir-p doc)
(install-file "velveth" bin)
(install-file "velvetg" bin)
(install-file "Manual.pdf" doc)
(install-file "Columbus_manual.pdf" doc)))))))
(inputs
(list openmpi zlib))
(native-inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-graphics
texlive-fonts-ec
texlive-hyperref)))))
(list (texlive-updmap.cfg
(list texlive-infwarerr
texlive-kvoptions
texlive-pdftexcmds))))
(home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
(synopsis "Nucleic acid sequence assembler for very short reads")
(description

4
gnu/packages/bittorrent.scm
View File

@ -503,7 +503,7 @@ features.")
(package
(inherit qbittorrent)
(name "qbittorrent-enhanced")
(version "4.5.2.10")
(version "4.5.4.10")
(source
(origin
(method git-fetch)
@ -513,7 +513,7 @@ features.")
(file-name (git-file-name name version))
(sha256
(base32
"18z4panaqbmhbw5i1yn17wpqzslhy6w08zcc5bx2hhlg8slp1r9j"))))
"0qwk69mgcyh7fij4nsi4ndd17aa61p2c6cxn9l402w4cf1dy6hfs"))))
(home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition")
(description
"qBittorrent Enhanced is a bittorrent client based on qBittorrent with

97
gnu/packages/bootloaders.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -215,8 +215,8 @@
;; file system will be readable by GRUB without rebooting.
,@(if (member (or (%current-target-system)
(%current-system))
(package-supported-systems fuse))
`(("fuse" ,fuse))
(package-supported-systems fuse-2))
`(("fuse" ,fuse-2))
'())
("freetype" ,freetype)
@ -648,7 +648,7 @@ tree binary files. These are board description files used by Linux and BSD.")
(define u-boot
(package
(name "u-boot")
(version "2022.10")
(version "2023.07.02")
(source (origin
(patches
(list %u-boot-rockchip-inno-usb-patch
@ -656,15 +656,14 @@ tree binary files. These are board description files used by Linux and BSD.")
%u-boot-sifive-prevent-relocating-initrd-fdt
%u-boot-rk3399-enable-emmc-phy-patch
(search-patch "u-boot-fix-build-python-3.10.patch")
(search-patch "u-boot-infodocs-target.patch")
(search-patch "u-boot-patman-guix-integration.patch")))
(search-patch "u-boot-fix-u-boot-lib-build.patch")))
(method url-fetch)
(uri (string-append
"https://ftp.denx.de/pub/u-boot/"
"u-boot-" version ".tar.bz2"))
(sha256
(base32
"1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h"))))
"1m91w3fpywllkwm000dqsw3294j0szs1lz6qbgwv1aql3ic4hskb"))))
(build-system gnu-build-system)
(native-inputs
(list bison
@ -676,6 +675,7 @@ tree binary files. These are board description files used by Linux and BSD.")
perl
pkg-config ;for 'make menuconfig'
python
python-pyelftools
swig
(list util-linux "lib")))
(home-page "https://www.denx.de/wiki/U-Boot/")
@ -726,7 +726,12 @@ Info manual.")))
(name "u-boot-tools")
(native-inputs
(modify-inputs (package-native-inputs u-boot)
(prepend python-coverage python-pycryptodomex python-pytest sdl2)))
(prepend python-coverage
python-filelock
python-pycryptodomex
python-pytest
python-pytest-xdist
sdl2)))
(arguments
`(#:make-flags '("HOSTCC=gcc")
#:test-target "tcheck"
@ -739,7 +744,7 @@ Info manual.")))
(("/bin/false") (which "false")))
(substitute* "tools/dtoc/fdt_util.py"
(("'cc'") "'gcc'"))
(substitute* "tools/patman/test_util.py"
(substitute* "tools/u_boot_pylib/test_util.py"
;; python3-coverage is simply called coverage in guix.
(("python3-coverage") "coverage")
@ -777,7 +782,16 @@ def test_ctrl_c"))
;; See https://bugs.gnu.org/34717 for
;; details.
(("CONFIG_FIT_SIGNATURE=y")
"CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n\nCONFIG_TOOLS_LIBCRYPTO=n")
"CONFIG_FIT_SIGNATURE=n
CONFIG_UT_LIB_ASN1=n
CONFIG_TOOLS_LIBCRYPTO=n")
;; Catch instances of implied CONFIG_FIG_SIGNATURE
;; with VPL targets
(("CONFIG_SANDBOX_VPL=y")
"CONFIG_SANDBOX_VPL=y
CONFIG_FIT_SIGNATURE=n
CONFIG_VPL_FIT_SIGNATURE=n
CONFIG_TOOLS_LIBCRYPTO=n")
;; This test requires a sound system, which is un-used
;; in u-boot-tools.
(("CONFIG_SOUND=y") "CONFIG_SOUND=n")))
@ -828,6 +842,26 @@ def test_ctrl_c"))
" This package provides board-independent tools "
"of U-Boot."))))
(define-public python-u-boot-pylib
(package
(inherit u-boot)
(name "python-u-boot-pylib")
(build-system pyproject-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "tools/u_boot_pylib")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./u_boot_pylib")))))))
(synopsis "U-Boot Python library")
(description "This package provides common Python code used by some of the
commands part of the U-Boot project, such as Patman.")))
;;; This is packaged separately, as it can be used in other contexts than for
;;; U-Boot development.
(define-public patman
@ -842,10 +876,13 @@ def test_ctrl_c"))
#:tests? #f
#:phases
#~(modify-phases %standard-phases
;; Patman fails to run during 'sanity-check phase, as it needs to be
;; run within a git directory.
(delete 'sanity-check)
(add-after 'unpack 'chdir
(lambda _
(chdir "tools/patman"))))))
(inputs (list python-pygit2 python-requests))
(inputs (list python-pygit2 python-requests python-u-boot-pylib))
(synopsis "Patch automation tool")
(description "Patman is a patch automation script which:
@itemize
@ -997,7 +1034,7 @@ removed so that it fits within common partitioning schemes.")))
(define-public u-boot-am335x-evm
(make-u-boot-package "am335x_evm" "arm-linux-gnueabihf"))
(define*-public (make-u-boot-sunxi64-package board triplet
(define*-public (make-u-boot-sunxi64-package board triplet scp-firmware
#:key defconfig configs)
(let ((base (make-u-boot-package
board triplet #:defconfig defconfig #:configs configs)))
@ -1009,20 +1046,27 @@ removed so that it fits within common partitioning schemes.")))
#~(modify-phases #$phases
(add-after 'unpack 'set-environment
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(setenv "SCP" (search-input-file
native-inputs "libexec/scp.bin"))
(setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(append (force scp-firmware))))
(inputs
(modify-inputs (package-inputs base)
(append arm-trusted-firmware-sun50i-a64))))))
(define-public u-boot-pine64-plus
(make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))
(make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"
(delay crust-pine64-plus)))
(define-public u-boot-pine64-lts
(make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"))
(make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"
(delay crust-pine64-plus)))
(define-public u-boot-pinebook
(make-u-boot-sunxi64-package
"pinebook" "aarch64-linux-gnu"
"pinebook" "aarch64-linux-gnu" (delay crust-pinebook)
;; Fix regression with LCD video output introduced in 2020.01
;; https://patchwork.ozlabs.org/patch/1225130/
#:configs '("CONFIG_VIDEO_BPP32=y")))
@ -1104,7 +1148,7 @@ partition."))
(delete 'strip)
(delete 'validate-runpath)))))
(inputs
(modify-inputs (package-native-inputs base)
(modify-inputs (package-inputs base)
(append arm-trusted-firmware-rk3399))))))
(define-public u-boot-qemu-arm
@ -1170,7 +1214,20 @@ Documentation} for more information (for example by running @samp{info
(append sdl2))))))
(define-public u-boot-sifive-unleashed
(make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))
(let ((base (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu")))
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "OPENSBI" (search-input-file inputs
"fw_dynamic.bin"))))))))
(inputs
(modify-inputs (package-inputs base)
(append opensbi-generic))))))
(define-public u-boot-sifive-unmatched
(let ((base (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")))
@ -1230,7 +1287,11 @@ Documentation} for more information (for example by running @samp{info
"CONFIG_SATA_SIL=y"
"CONFIG_SCSI=y"
"CONFIG_SCSI_AHCI=y"
"CONFIG_DM_SCSI=y"))))
"CONFIG_DM_SCSI=y"
;; Disable SPL FIT signatures,
;; due to GPLv2 and Openssl
;; license incompatibilities
"# CONFIG_SPL_FIT_SIGNATURE is not set"))))
(package
(inherit base)
(arguments

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

@ -171,14 +171,14 @@ generate such a compilation database.")
(define-public bmake
(package
(name "bmake")
(version "20230622")
(version "20230723")
(source
(origin
(method url-fetch)
(uri (string-append
"http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
(sha256
(base32 "007ckj2381bmwpxy5zmy2m19p2hxaj7ld80b5lv7i798c2fwj15l"))))
(base32 "012rzgjmncdla1l43f9wl8v13h7d46zgn28k6djpcgx23fahsan4"))))
(build-system gnu-build-system)
(inputs
(list bash-minimal))
@ -605,7 +605,7 @@ software.")
(display "au BufNewFile,BufRead Tupfile,*.tup setf tup")))
#t))))))
(inputs
(list fuse-3 pcre
(list fuse pcre
`(,pcre "bin") ; pcre-config
sqlite))
(native-inputs

4
gnu/packages/ccache.scm
View File

@ -35,14 +35,14 @@
(define-public ccache
(package
(name "ccache")
(version "4.7.4")
(version "4.8.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/ccache/ccache/releases/download/v"
version "/ccache-" version ".tar.xz"))
(sha256
(base32 "0djfm138m863g772bnq7m2mfwh3y8sqxczc3yssg1yiybp8n836z"))))
(base32 "0jba0zr2893gbzg4710f2gbayj33lz618lpflx7nrcd5i3wb6grx"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags

53
gnu/packages/cdrom.scm
View File

@ -734,33 +734,40 @@ information is written to standard error.")
(define-public asunder
(package
(name "asunder")
(version "2.9.7")
(version "3.0.1")
(source
(origin
(method url-fetch)
(uri
(string-append "http://www.littlesvr.ca/asunder/releases/asunder-"
(string-append "https://www.littlesvr.ca/asunder/releases/asunder-"
version ".tar.bz2"))
(sha256
(base32 "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"))))
(base32 "0srpag9bca76iiv8766kxmbvhsri58k15xp70348frkvp7hy4s48"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:out-of-source? #f
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((program (string-append (assoc-ref outputs "out")
"/bin/asunder")))
(define (bin-directory input-name)
(string-append (assoc-ref inputs input-name) "/bin"))
(wrap-program program
`("PATH" ":" prefix
,(map bin-directory (list "cdparanoia"
"lame"
"vorbis-tools"
"flac"
"opus-tools"
"wavpack"))))))))))
(list
#:out-of-source? #f
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'fix-tests
;; As of 3.0.1, there are no ‘real’ tests under src/, and the linty
;; test under po/ is broken. Still, it's trivial to fix.
(lambda _
(let ((file (open-file "po/POTFILES.in" "a")))
(format file "~%src/upload.c~%")
(close-port file))))
(add-after 'install 'wrap
(lambda _
(wrap-program (string-append #$output "/bin/asunder")
`("PATH" ":" prefix
,(map (lambda (input) (string-append input "/bin"))
'#$(map (lambda (label) (this-package-input label))
(list "cdparanoia"
"flac"
"lame"
"opus-tools"
"vorbis-tools"
"wavpack"))))))))))
(native-inputs (list intltool pkg-config))
;; TODO: Add the necessary packages for Musepack encoding.
(inputs `(("gtk+-2" ,gtk+-2)
@ -850,14 +857,14 @@ laid out on the image.")
(define-public libburn
(package
(name "libburn")
(version "1.5.4")
(version "1.5.6")
(source (origin
(method url-fetch)
(uri (string-append "http://files.libburnia-project.org/releases/"
"libburn-" version ".tar.gz"))
(sha256
(base32
"0m1vyry6pi115nysfgb0cg313qqhnlxqdg7f920wpiar0z8mjl2j"))))
"0jv447ixwvj68vslbgbbvkzmaabf4dz0dcizg9garvp59cdlk5bj"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@ -872,14 +879,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.")
(define-public libisofs
(package
(name "libisofs")
(version "1.5.4")
(version "1.5.6.pl01")
(source (origin
(method url-fetch)
(uri (string-append "http://files.libburnia-project.org/releases/"
"libisofs-" version ".tar.gz"))
(sha256
(base32
"13m82l13cb5d7ca53dv3akma1jr9gw0hnnshdwqpj6ahly0fv85a"))))
"09czddjriv2zi1bdsck8a31ci6xpi1qr2rqmzfhlqx21sqwd67xc"))))
(build-system gnu-build-system)
(inputs
(list zlib acl))

36
gnu/packages/check.scm
View File

@ -44,6 +44,7 @@
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@ -812,6 +813,41 @@ and it supports a very flexible form of test discovery.")
has been designed to be fast, light and unintrusive.")
(license license:expat)))
(define-public python-gixy
;; The 0.1.20 release is missing some important fixes.
;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests
;; since it improperly removes an import.
(let ((commit "303eb6887ddecab18138b6e427b04ae77c41d2f1")
(revision "0")
(base-version "0.1.20"))
(package
(name "python-gixy")
(version (git-version base-version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yandex/gixy")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0gymjcnvjx9snyrzdbmjnk93ibb161q72xam29vnl3yyac4r1330"))))
(build-system pyproject-build-system)
(native-inputs (list python-nose))
(propagated-inputs
(list python-cached-property python-configargparse
python-jinja2 python-six
;; XXX: gixy is incompatible with pyparsing >= 3.x.
;; See <https://github.com/yandex/gixy/pull/132> and
;; <https://github.com/yandex/gixy/pull/122>.
python-pyparsing-2.4.7))
(home-page "https://github.com/yandex/gixy")
(synopsis "Static NGINX configuration analyzer")
(description "Gixy is a static analyzer whose main goal is to help
prevent common NGINX misconfigurations. It provides the @command{gixy}
command.")
(license license:mpl2.0))))
(define-public go-github.com-smartystreets-gunit
(package
(name "go-github.com-smartystreets-gunit")

17
gnu/packages/chemistry.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 David Elsing <david.elsing@posteo.net>
;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -554,6 +554,12 @@ symmetries written in C. Spglib can be used to:
(assoc-ref inputs "libxml2")
"/include/libxml2:"
(getenv "CPLUS_INCLUDE_PATH")))))
;; Prevent deleting the leading / in the __init__.py path in the
;; launch script.
(add-after 'unpack 'disable-unchroot
(lambda _
(substitute* "setup.py"
(("self\\.unchroot") ""))))
;; The setup.py script does not support one of the Python build
;; system's default flags, "--single-version-externally-managed".
(replace 'install
@ -572,8 +578,7 @@ symmetries written in C. Spglib can be used to:
python-pyqt
glm
netcdf))
(native-inputs
(list catch2 python-setuptools))
(native-inputs (list catch2))
(home-page "https://pymol.org")
(synopsis "Molecular visualization system")
(description "PyMOL is a capable molecular viewer and renderer. It can be
@ -899,9 +904,9 @@ emphasis on quality rather than speed.")
(inputs (list openblas))
(native-inputs
(list gfortran
(texlive-updmap.cfg (list texlive-fonts-ec
texlive-graphics
texlive-latex-geometry))))
(texlive-updmap.cfg
(list texlive-epstopdf
texlive-latexmk))))
(home-page "https://github.com/greglandrum/yaehmop")
(synopsis "Perform extended Hückel calculations")
(description "@acronym{YAeHMOP, Yet Another extended Hueckel Molecular

42
gnu/packages/chez.scm
View File

@ -466,7 +466,7 @@ and 32-bit PowerPC architectures.")
(package
(inherit chez-scheme)
(name "chez-scheme-for-racket")
(version "9.9.9-pre-release.14")
(version "9.9.9-pre-release.16")
;; The version should match `scheme-version`.
;; See racket/src/ChezScheme/s/cmacros.ss c. line 360.
;; It will always be different than the upstream version!
@ -759,13 +759,7 @@ Chez Scheme.")))
;; though it would probably be easy to add.
(propagated-inputs
(list xorg-rgb
(texlive-updmap.cfg
(list texlive-dvips-l3backend
texlive-hyperref
texlive-bibtex
texlive-epsf
texlive-fonts-ec
texlive-oberdiek))
(texlive-updmap.cfg (list texlive-epsf))
ghostscript
netpbm))
;; Debian uses a versionless path for STEXLIB,
@ -1014,18 +1008,11 @@ create compilers, making them easier to understand and maintain.")
(native-inputs
(list (chez-scheme-for-system)
ghostscript
;; FIXME: This package fails to build with the error:
;; mktexpk: don't know how to create bitmap font for bchr8r
;; Replacing the following with `texlive` fixes it.
;; What is missing?
(texlive-updmap.cfg (list texlive-oberdiek
texlive-epsf
texlive-metapost
texlive-charter
texlive-pdftex
texlive-context
texlive-cm
texlive-tex-plain))))
(texlive-updmap.cfg
(list texlive-charter
texlive-context
texlive-cweb
texlive-metapost))))
(arguments
(list
#:make-flags
@ -1035,9 +1022,18 @@ create compilers, making them easier to understand and maintain.")
;; lib/chez-scheme/chezweb ???
(string-append "LIBDIR=" #$output "/lib/chezweb")
(string-append "TEXDIR=" #$output "/share/texmf-local"))
#:tests? #f ; no tests
#:tests? #f ; no tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-tex-input
(lambda _
;; Fix "I can't find file `supp-pdf'." error.
(substitute* "chezweb.w"
(("supp-pdf") "supp-pdf.mkii"))
;; Recent cweb packages do not include "\acrofalse". Remove
;; it.
(substitute* "doc/cwebman.tex"
(("\\acrofalse.*") ""))))
;; This package has a custom "bootstrap" script that
;; is meant to be run from the Makefile.
(delete 'bootstrap)
@ -1079,10 +1075,10 @@ programming in Scheme.")
(native-inputs
(list (chez-scheme-for-system)
chez-web
(texlive-updmap.cfg (list texlive-pdftex))))
(texlive-updmap.cfg)))
(arguments
(list
#:tests? #f ; no tests
#:tests? #f ; no tests
#:phases
#~(modify-phases %standard-phases
(replace 'configure

2
gnu/packages/chromium.scm
View File

@ -584,7 +584,7 @@
"ffmpeg_branding=\"Chrome\""
;; WebRTC stuff.
"rtc_use_h264=false" ;XXX needs bundled openh264
"rtc_use_h264=true"
"rtc_use_pipewire=true"
"rtc_link_pipewire=true"
;; Don't use bundled sources.

48
gnu/packages/cmake.scm
View File

@ -10,7 +10,7 @@
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@ -136,6 +136,19 @@ using the CMake build system.")
;; This test fails for unknown reason.
"RunCMake.file-GET_RUNTIME_DEPENDENCIES"))
(define %common-disabled-tests/hurd
'("CTestTestTimeout"
"CTestTestRerunFailed"
"RunCMake.CompilerChange"
"RunCMake.ctest_test"
"RunCMake.file"
"RunCMake.BundleUtilities"
"RunCMake.configure_file"
"RunCMake.CTestTimeout"
"RunCMake.CTestTimeoutAfterMatch"
"RunCMake.CommandLine"
"RunCMake.CTestCommandLine"))
(define %preserved-third-party-files
'(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must
;; be available along with the required headers.
@ -190,7 +203,10 @@ using the CMake build system.")
"CTestTestSubdir" ; This test fails to build 2 of the 3 tests.
;; This test fails when ARGS (below) is in use, see
;; <https://gitlab.kitware.com/cmake/cmake/issues/17165>.
"CTestCoverageCollectGCOV")))
"CTestCoverageCollectGCOV"
#$@(if (target-hurd?)
%common-disabled-tests/hurd
#~()))))
(list
(string-append
;; These arguments apply for the tests only.
@ -210,20 +226,17 @@ using the CMake build system.")
;; CMake uses its own configure script.
(replace 'configure
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags))))))
(apply invoke "./configure" configure-flags)))
#$@(if (target-hurd?)
#~((add-after 'unpack 'patch-hurd
(lambda _
;; Version 3.25.0 has a similar fix.
(substitute* "Utilities/cmlibuv/src/unix/udp.c"
(("!defined\\(__QNX__\\)")
"!defined(__GNU__)")))))
#~()))))
(inputs
(append
(if (target-hurd?)
'()
(list libuv)) ;not supported on the Hurd
(list bzip2
curl
expat
file
jsoncpp
libarchive
rhash
zlib)))
(list libuv bzip2 curl expat file jsoncpp libarchive rhash zlib))
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")
@ -311,7 +324,10 @@ and workspaces that can be used in the compiler environment of your choice.")
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(let ((skipped-tests (list #$@%common-disabled-tests
;; This test requires the bundled libuv.
"BootstrapTest")))
"BootstrapTest"
#$@(if (system-hurd?)
%common-disabled-tests/hurd
#~()))))
(if tests?
(begin
(invoke "ctest" "-j" (if parallel-tests?

6
gnu/packages/cobol.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -33,7 +33,7 @@
(define-public gnucobol
(package
(name "gnucobol")
(version "3.1.2")
(version "3.2")
(source
(origin
(method url-fetch)
@ -42,7 +42,7 @@
version ".tar.xz"))
(sha256
(base32
"0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"))))
"1qifkkrmscc5csri1l4rm9pbik74c3pc5za1rzx7jizddks8md1v"))))
(arguments
(list
#:configure-flags

432
gnu/packages/commencement.scm
View File

@ -33,6 +33,7 @@
(define-module (gnu packages commencement)
#:use-module (gnu packages)
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages c)
@ -56,7 +57,10 @@
#:use-module (gnu packages xml)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module ((guix store) #:select (%store-monad))
#:use-module (guix monads)
#:use-module (guix download)
#:use-module ((guix git-download) #:select (git-reference git-file-name))
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module ((guix licenses) #:prefix license:)
@ -89,6 +93,38 @@
;;;
;;; Code:
(define* (git-fetch-from-tarball tarball)
"Return an <origin> method equivalent to 'git-fetch', except that it fetches
the checkout from TARBALL, a tarball containing said checkout.
The purpose of this procedure is to work around bootstrapping issues:
'git-fetch' depends on Git, which is much higher in the dependency graph."
(lambda* (url hash-algo hash
#:optional name
#:key (system (%current-system))
(guile %bootstrap-guile))
(mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation
(or name "git-checkout")
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils)
(ice-9 ftw)
(ice-9 match))
(setenv "PATH"
#+(file-append %bootstrap-coreutils&co "/bin"))
(invoke "tar" "xf" #$tarball)
(match (scandir ".")
(("." ".." directory)
(copy-recursively directory #$output)))))
#:recursive? #t
#:hash-algo hash-algo
#:hash hash
#:system system
#:guile-for-build guile
#:graft? #f
#:local-build? #t))))
(define bootar
(package
(name "bootar")
@ -2602,64 +2638,123 @@ memoized as a function of '%current-system'."
(package-with-explicit-inputs %boot0-inputs
%bootstrap-guile))
(define autoconf-boot0
(with-boot0
(package
(inherit autoconf)
(name "autoconf-boot0")
(native-inputs (list m4-boot0 perl-boot0))
(inputs '())
(arguments (list #:tests? #f)))))
(define automake-boot0
(with-boot0
(package
(inherit automake)
(name "automake-boot0")
(source (origin
(inherit (package-source automake))
(patches '()))) ;test are skipped anyway
(native-inputs (list autoconf-boot0 m4-boot0 perl-boot0))
(inputs '())
(arguments
(list #:tests? #f)))))
(define gnumach-headers-boot0
(with-boot0
(package
(inherit gnumach-headers)
(version "1.8-116-g28b53508")
(source (bootstrap-origin
(origin
(method url-fetch)
(uri (list (string-append "mirror://gnu/guix/mirror/gnumach-"
version ".tar.gz")
(string-append "https://lilypond.org/janneke/hurd/"
"gnumach-" version ".tar.gz")))
(sha256
(base32
"006i0zgwy81vxarpfm12vip4q6i5mgmi5mmy5ldvxp5hx9h3l0zg")))))
(native-inputs '()))))
(name "gnumach-headers-boot0")
(version "1.8+git20221224")
(source
(origin
(inherit (package-source gnumach-headers))
(method
(git-fetch-from-tarball
(origin
(method url-fetch)
(uri (string-append
"https://git.savannah.gnu.org/cgit/hurd/gnumach.git/snapshot/"
"gnumach-" version ".tar.gz"))
(sha256
(base32
"0vb19ynvrxz302snqxkd0wgizwa5fw2x06a4zjsllqb9ijbq9mc8")))))))
(native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'patch-compat
(lambda _
(substitute* '("include/device/device_types.h"
"include/mach_debug/slab_info.h"
"include/mach_debug/vm_info.h")
(("rpc_vm_size_t") "unsigned int")
(("rpc_vm_offset_t") "unsigned int")
(("rpc_long_natural_t") "unsigned long")
(("long_natural_t") "unsigned long")))))))))))
(define mig-boot0
(let* ((mig (package
(inherit (package-with-bootstrap-guile mig))
(native-inputs `(("bison" ,bison-boot0)
("flex" ,flex-boot0)))
(inputs `(("flex" ,flex-boot0)))
(arguments
;; TODO: On next rebuild cycle, reuse phases from 'mig'.
`(#:configure-flags
`(,(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %build-inputs "flex") "/lib/")))))))
(with-boot0 mig)))
(define hurd-version-boot0 "0.9-229-ga1efcee8")
(define hurd-source-boot0
(let ((version hurd-version-boot0))
(origin
(method url-fetch)
(uri (list (string-append "mirror://gnu/guix/mirror/hurd-v"
version ".tar.gz")
(string-append "https://lilypond.org/janneke/hurd/"
"hurd-v" version ".tar.gz")))
(sha256
(base32
"0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy")))))
(with-boot0
(package
(inherit mig)
(name "mig-boot0")
(version "1.8+git20230520")
(source
(origin
(inherit (package-source mig))
(method
(git-fetch-from-tarball
(origin
(method url-fetch)
(uri (string-append
"https://git.savannah.gnu.org/cgit/hurd/mig.git/snapshot/"
"mig-" version ".tar.gz"))
(sha256
(base32
"1l1vfm4wap5yxylv91wssgpy7fnq22wp3akgd5nv995kychfa9jy")))))))
(native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0
gnumach-headers-boot0))
(inputs (list flex-boot0 gnumach-headers-boot0))
(arguments
(list
#:configure-flags
#~(list (string-append "LDFLAGS=-Wl,-rpath="
#$(this-package-native-input "flex")
"/lib/")))))))
(define hurd-headers-boot0
(let ((hurd-headers (package (inherit hurd-headers)
(version hurd-version-boot0)
(source hurd-source-boot0)
(native-inputs `(("mig" ,mig-boot0)))
(inputs '()))))
(with-boot0 (package-with-bootstrap-guile hurd-headers))))
(with-boot0
(package
(inherit hurd-headers)
(name "hurd-headers-boot0")
(version "0.9.git20230216")
(source
(origin
(inherit (package-source hurd-headers))
(method
(git-fetch-from-tarball
(origin
(method url-fetch)
(uri (string-append
"https://git.savannah.gnu.org/cgit/hurd/hurd.git/snapshot/"
"hurd-v" version ".tar.gz"))
(sha256
(base32
"1f75nlkcl00dqnnrbrj1frvzs2qibfpygj3gwywqi85aldjl48y7")))))))
(native-inputs
(list autoconf-boot0 automake-boot0 mig-boot0))
(inputs '()))))
(define hurd-minimal-boot0
(let ((hurd-minimal (package (inherit hurd-minimal)
(version hurd-version-boot0)
(source hurd-source-boot0)
(native-inputs `(("mig" ,mig-boot0)))
(inputs '()))))
(with-boot0 (package-with-bootstrap-guile hurd-minimal))))
(with-boot0
(package
(inherit hurd-minimal)
(name "hurd-minimal-boot0")
(source (package-source hurd-headers-boot0))
(native-inputs
(list autoconf-boot0 automake-boot0 gnumach-headers-boot0 mig-boot0))
(inputs (list gnumach-headers-boot0)))))
(define/system-dependent hurd-core-headers-boot0
;; Return the Hurd and Mach headers as well as initial Hurd libraries for
@ -2822,64 +2917,65 @@ memoized as a function of '%current-system'."
("binutils-cross" ,binutils-boot0)
,@(alist-delete "binutils" (%boot0-inputs))))
(define glibc-final-with-bootstrap-bash
(define/system-dependent glibc-final-with-bootstrap-bash
;; The final libc, "cross-built". If everything went well, the resulting
;; store path has no dependencies. Actually, the really-final libc is
;; built just below; the only difference is that this one uses the
;; bootstrap Bash.
(package
(inherit glibc)
(name "glibc-intermediate")
(outputs (delete "debug" (package-outputs glibc)))
(source (bootstrap-origin (package-source glibc)))
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
(let ((libc (libc-for-target)))
(package
(inherit libc)
(name "glibc-intermediate")
(outputs (delete "debug" (package-outputs libc)))
(source (bootstrap-origin (package-source libc)))
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
,@(substitute-keyword-arguments (package-arguments glibc)
((#:configure-flags flags)
`(append (list ,(string-append "--host=" (boot-triplet))
,(string-append "--build="
(nix-system->gnu-triplet))
,(if (system-hurd?) "--disable-werror"
""))
,flags))
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
;; Don't clobber include paths with the bootstrap libc.
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")
,@(substitute-keyword-arguments (package-arguments libc)
((#:configure-flags flags)
`(append (list ,(string-append "--host=" (boot-triplet))
,(string-append "--build="
(nix-system->gnu-triplet))
,(if (system-hurd?) "--disable-werror"
""))
,flags))
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
;; Don't clobber include paths with the bootstrap libc.
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")
;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
,@(if (system-hurd?)
'((substitute* '("sysdeps/mach/Makefile"
"sysdeps/mach/hurd/Makefile")
(("LDLIBS-pthread.so =.*")
(string-append "LDLIBS-pthread.so = "
(assoc-ref %build-inputs "kernel-headers")
"/lib/libihash.a\n"))))
'()))))))))
(propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
(native-inputs
`(("bison" ,bison-boot0)
("texinfo" ,texinfo-boot0)
("perl" ,perl-boot0)
("python" ,python-boot0)))
(inputs
`( ;; The boot inputs. That includes the bootstrap libc. We don't want
;; it in $CPATH, hence the 'pre-configure' phase above.
,@(%boot1-inputs)
;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
,@(if (system-hurd?)
'((substitute* '("sysdeps/mach/Makefile"
"sysdeps/mach/hurd/Makefile")
(("LDLIBS-pthread.so =.*")
(string-append "LDLIBS-pthread.so = "
(assoc-ref %build-inputs "kernel-headers")
"/lib/libihash.a\n"))))
'()))))))))
(propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
(native-inputs
`(("bison" ,bison-boot0)
("texinfo" ,texinfo-boot0)
("perl" ,perl-boot0)
("python" ,python-boot0)))
(inputs
`( ;; The boot inputs. That includes the bootstrap libc. We don't want
;; it in $CPATH, hence the 'pre-configure' phase above.
,@(%boot1-inputs)
;; A native MiG is needed to build Glibc on Hurd.
,@(if (system-hurd?)
`(("mig" ,mig-boot0))
'())
;; A native MiG is needed to build Glibc on Hurd.
,@(if (system-hurd?)
`(("mig" ,mig-boot0))
'())
;; Here, we use the bootstrap Bash, which is not satisfactory
;; because we don't want to depend on bootstrap tools.
("static-bash" ,@(assoc-ref (%boot0-inputs) "bash"))))))
;; Here, we use the bootstrap Bash, which is not satisfactory
;; because we don't want to depend on bootstrap tools.
("static-bash" ,@(assoc-ref (%boot0-inputs) "bash")))))))
(define (cross-gcc-wrapper gcc binutils glibc bash)
"Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC
@ -2997,39 +3093,39 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(("^PROGRAMS =.*$")
"PROGRAMS =\n")))))))))
(define glibc-final
(define/system-dependent glibc-final
;; The final glibc, which embeds the statically-linked Bash built above.
;; Use 'package/inherit' so we get the 'replacement' of 'glibc', if any.
(package/inherit
glibc
(name "glibc")
(source (bootstrap-origin (package-source glibc)))
(inputs `(("static-bash" ,static-bash-for-glibc)
,@(alist-delete
"static-bash"
(package-inputs glibc-final-with-bootstrap-bash))))
(let ((libc (libc-for-target)))
(package/inherit libc
(name "glibc")
(source (bootstrap-origin (package-source libc)))
(inputs `(("static-bash" ,static-bash-for-glibc)
,@(alist-delete
"static-bash"
(package-inputs glibc-final-with-bootstrap-bash))))
;; This time we need 'msgfmt' to install all the libc.mo files.
(native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
("gettext" ,gettext-boot0)))
;; This time we need 'msgfmt' to install all the libc.mo files.
(native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
("gettext" ,gettext-boot0)))
(propagated-inputs
(package-propagated-inputs glibc-final-with-bootstrap-bash))
(propagated-inputs
(package-propagated-inputs glibc-final-with-bootstrap-bash))
;; The final libc only refers to itself, but the 'debug' output contains
;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great
;; if 'allowed-references' were per-output.
(arguments
`(#:allowed-references
(,(gexp-input gcc-boot0 "lib")
,(kernel-headers-boot0)
,static-bash-for-glibc
,@(if (system-hurd?)
`(,gnumach-headers-boot0
,hurd-headers-boot0)
'())
,@(package-outputs glibc-final-with-bootstrap-bash))
,@(package-arguments glibc-final-with-bootstrap-bash)))))
;; The final libc only refers to itself, but the 'debug' output contains
;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great
;; if 'allowed-references' were per-output.
(arguments
`(#:allowed-references
(,(gexp-input gcc-boot0 "lib")
,(kernel-headers-boot0)
,static-bash-for-glibc
,@(if (system-hurd?)
`(,gnumach-headers-boot0
,hurd-headers-boot0)
'())
,@(package-outputs glibc-final-with-bootstrap-bash))
,@(package-arguments glibc-final-with-bootstrap-bash))))))
(define/system-dependent gcc-boot0-wrapped
;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the
@ -3356,45 +3452,49 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(package/inherit sed (native-inputs `(("perl" ,perl-boot0))))))
(define-public %final-inputs
;; Final derivations used as implicit inputs by 'gnu-build-system'. We
;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
;; used for origins that have patches, thereby avoiding circular
;; dependencies.
(let ((finalize (compose with-boot6
package-with-bootstrap-guile)))
`(,@(map (match-lambda
((name package)
(list name (finalize package))))
`(("tar" ,tar)
("gzip" ,gzip)
("bzip2" ,bzip2)
("file" ,file)
("diffutils" ,diffutils)
("patch" ,patch)
("findutils" ,findutils)
("gawk" ,gawk)))
("sed" ,sed-final)
("grep" ,grep-final)
("xz" ,xz-final)
("coreutils" ,coreutils-final)
("make" ,gnu-make-final)
("bash" ,bash-final)
("ld-wrapper" ,ld-wrapper)
("binutils" ,binutils-final)
("gcc" ,gcc-final)
("libc" ,glibc-final)
("libc:static" ,glibc-final "static")
("locales" ,glibc-utf8-locales-final))))
;; The 'glibc-final' package is not the same depending on what system is
;; targeted, so this whole list must be parameterized.
(mlambda (system)
;; Final derivations used as implicit inputs by 'gnu-build-system'. We
;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
;; used for origins that have patches, thereby avoiding circular
;; dependencies.
(let ((finalize (compose with-boot6
package-with-bootstrap-guile)))
`(,@(map (match-lambda
((name package)
(list name (finalize package))))
`(("tar" ,tar)
("gzip" ,gzip)
("bzip2" ,bzip2)
("file" ,file)
("diffutils" ,diffutils)
("patch" ,patch)
("findutils" ,findutils)
("gawk" ,gawk)))
("sed" ,sed-final)
("grep" ,grep-final)
("xz" ,xz-final)
("coreutils" ,coreutils-final)
("make" ,gnu-make-final)
("bash" ,bash-final)
("ld-wrapper" ,ld-wrapper)
("binutils" ,binutils-final)
("gcc" ,gcc-final)
("libc" ,glibc-final)
("libc:static" ,glibc-final "static")
("locales" ,glibc-utf8-locales-final)))))
(define-public canonical-package
(let ((name->package (fold (lambda (input result)
(match input
((_ package . outputs)
(vhash-cons (package-full-name package)
package result))))
vlist-null
`(("guile" ,guile-final)
,@%final-inputs))))
(let ((name->package (mlambda (system)
(fold (lambda (input result)
(match input
((_ package . outputs)
(vhash-cons (package-full-name package)
package result))))
vlist-null
`(("guile" ,guile-final)
,@(%final-inputs system))))))
(lambda (package)
"Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of
the implicit inputs of 'gnu-build-system', return that one, otherwise return
@ -3404,7 +3504,8 @@ The goal is to avoid duplication in cases like GUILE-FINAL vs. GUILE-2.2,
COREUTILS-FINAL vs. COREUTILS, etc."
;; XXX: This doesn't handle dependencies of the final inputs, such as
;; libunistring, GMP, etc.
(match (vhash-assoc (package-full-name package) name->package)
(match (vhash-assoc (package-full-name package)
(name->package (%current-system)))
((_ . canon)
;; In general we want CANON, except if we're cross-compiling: CANON
;; uses explicit inputs, so it is "anchored" in the bootstrapped
@ -3486,7 +3587,8 @@ is the GNU Compiler Collection.")
;; install everything that we need, and (2) to make sure ld-wrapper comes
;; before Binutils' ld in the user's profile.
(inputs `(("gcc" ,gcc)
("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper")))
("ld-wrapper" ,(car (assoc-ref (%final-inputs (%current-system))
"ld-wrapper")))
("binutils" ,binutils-final)
("libc" ,libc)
("libc-debug" ,libc "debug")

62
gnu/packages/compression.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020, 2021 Lars-Dominik Braun <lars@6xq.net>
@ -1660,7 +1660,9 @@ or junctions, and always follows hard links.")
"HAVE_LZMA=0"
;; Not currently detected, but be explicit & avoid surprises later.
"HAVE_LZ4=0"
"HAVE_ZLIB=0")))
"HAVE_ZLIB=0")
#:tests? ,(not (or (target-hurd?)
(%current-target-system)))))
(home-page "https://facebook.github.io/zstd/")
(synopsis "Zstandard real-time compression algorithm")
(description "Zstandard (@command{zstd}) is a lossless compression algorithm
@ -2361,7 +2363,7 @@ reading from and writing to ZIP archives.")
(define-public zchunk
(package
(name "zchunk")
(version "1.2.2")
(version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2370,22 +2372,23 @@ reading from and writing to ZIP archives.")
(file-name (git-file-name name version))
(sha256
(base32
"0q0avb0397xkmidl8rxasfywp0r7w3awk6271pa2d9xl9p1n82zy"))))
"19rw870150w1c730wzg2pn68ixmscq8cwa3vricqhwxs5l63r5wr"))))
(build-system meson-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/zck_gen_zdict.c"
(("/usr/bin/zstd")
(string-append (assoc-ref inputs "zstd")
"/bin/zstd"))))))))
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-file-name
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/zck_gen_zdict.c"
(("/usr/(bin/zstd)" _ file)
(string-append (search-input-file inputs file)))))))))
(native-inputs
(list pkg-config))
(inputs
(list curl zstd))
(propagated-inputs
`(("zstd:lib" ,zstd "lib"))) ;in Requires.private of zck.pc
(list `(,zstd "lib"))) ; in Requires.private of zck.pc
(home-page "https://github.com/zchunk/zchunk")
(synopsis "Compressed file format for efficient deltas")
(description "The zchunk compressed file format allows splitting a file
@ -2412,32 +2415,25 @@ To download a zchunk file.
(define-public zutils
(package
(name "zutils")
(version "1.10")
(version "1.12")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz"))
(sha256
(base32 "15dimqp8zlqaaa2l46r22srp1py38mlmn69ph1j5fmrd54w43m0d"))))
(base32 "1vl8mhvsl0zlh34hwhc05vj33a2xfr0w7i978hcwaw8wn1w59bkq"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--sysconfdir=/etc")
#:phases
(modify-phases %standard-phases
(add-before 'check 'disable-failing-tests
;; XXX https://lists.nongnu.org/archive/html/zutils-bug/2020-07/msg00005.html
(lambda _
(substitute* "testsuite/check.sh"
(("\"\\$\\{ZGREP\\}\" -N -L \"GNU\"") "true")
(("\"\\$\\{ZGREP\\}\" -N -L \"nx_pattern\"") "false"))
#t))
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(apply invoke "make" "install"
(string-append "sysconfdir=" (assoc-ref outputs "out")
"/etc")
make-flags))))))
(list
#:configure-flags
#~(list "--sysconfdir=/etc")
#:phases
#~(modify-phases %standard-phases
(replace 'install
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "install"
(string-append "sysconfdir=" #$output "/etc")
make-flags))))))
(native-inputs
;; Needed to extract the source tarball and run the test suite.
(list lzip))
@ -2539,7 +2535,7 @@ file compression algorithm.")
(define-public xarchiver
(package
(name "xarchiver")
(version "0.5.4.20")
(version "0.5.4.21")
(source
(origin
(method git-fetch)
@ -2548,7 +2544,7 @@ file compression algorithm.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1bgc8r2ii96ghslfscpjhswjgscvw65h2rjr0zvfqn8saqh1ydrv"))))
(base32 "0m3vq1mh2vg5r7vhnwjkfhix6i2cm15z82xsi6zaqvc4zkswb2m5"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list gettext-minimal intltool libxslt pkg-config))

25
gnu/packages/cpp.scm
View File

@ -451,7 +451,7 @@ operating on batches.")
(define-public google-highway
(package
(name "google-highway")
(version "1.0.3")
(version "1.0.5")
(source
(origin
(method git-fetch)
@ -460,7 +460,7 @@ operating on batches.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1828rz9w9sr3zlyg25b6nm7j5j5m0xnic7hy36gpsbxvq358ibpf"))))
(base32 "01ig4iqicm57nycl9q8mx1b22gvl4wj5j1vfp1jczhmrga4bca8v"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DHWY_SYSTEM_GTEST=on")))
@ -677,7 +677,7 @@ intuitive syntax and trivial integration.")
(define-public xtl
(package
(name "xtl")
(version "0.7.4")
(version "0.7.5")
(source (origin
(method git-fetch)
(uri
@ -686,19 +686,20 @@ intuitive syntax and trivial integration.")
(commit version)))
(sha256
(base32
"134pgvmf9cx5dxs0m0m3qhp3m3r1gl86ic3xax21zc4sdj8sdq46"))
"1llfy6pkzqx2va74h9xafjylyvw6839a843mqc05n6x6wll5bkam"))
(file-name (git-file-name name version))))
(native-inputs
(list doctest googletest nlohmann-json))
(arguments
'(#:configure-flags
'("-DBUILD_TESTS=ON")
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* _
(with-directory-excursion "test"
(invoke "./test_xtl")))))))
(list
#:configure-flags
#~(list "-DBUILD_TESTS=ON")
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda _
(with-directory-excursion "test"
(invoke "./test_xtl")))))))
(home-page "https://github.com/QuantStack/xtl")
(build-system cmake-build-system)
(synopsis "C++ template library providing some basic tools")

351
gnu/packages/cran.scm
View File

@ -926,6 +926,27 @@ differential abundance analysis of zero-inflated high-dimensional
compositional data.")
(license license:gpl3)))
(define-public r-gwasexacthw
(package
(name "r-gwasexacthw")
(version "1.01")
(source (origin
(method url-fetch)
(uri (cran-uri "GWASExactHW" version))
(sha256
(base32
"19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"))))
(properties `((upstream-name . "GWASExactHW")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/package=GWASExactHW")
(synopsis
"Exact Hardy-Weinburg testing for Genome Wide Association Studies")
(description
"This package contains a function to do exact Hardy-Weinburg
testing (using Fisher's test) for SNP genotypes as typically obtained in a
@dfn{Genome Wide Association Study} (GWAS).")
(license license:gpl3)))
(define-public r-gwidgets2
(package
(name "r-gwidgets2")
@ -1230,6 +1251,31 @@ quickly isolate key differences makes understanding test failures much
easier.")
(license license:expat)))
(define-public r-wheatmap
(package
(name "r-wheatmap")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (cran-uri "wheatmap" version))
(sha256
(base32
"064idlrnb85xxav39gp3n854fic6514khvazrf5d0x48crpzyvdp"))))
(properties `((upstream-name . "wheatmap")))
(build-system r-build-system)
(propagated-inputs (list r-colorspace r-rcolorbrewer))
(native-inputs (list r-knitr))
(home-page "https://github.com/zwdzwd/wheatmap")
(synopsis "Incrementally build complex plots using natural semantics")
(description
"This package lets you build complex plots, heatmaps in particular, using
natural semantics. Bigger plots can be assembled using directives such as
@code{LeftOf}, @code{RightOf}, @code{TopOf}, and @code{Beneath} and more.
Other features include clustering, dendrograms and integration with ggplot2
generated grid objects. This package is particularly designed for
bioinformaticians to assemble complex plots for publication.")
(license license:gpl3)))
(define-public r-rticles
(package
(name "r-rticles")
@ -1255,13 +1301,13 @@ for authoring journal articles and conference submissions.")
(define-public r-babelwhale
(package
(name "r-babelwhale")
(version "1.1.0")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "babelwhale" version))
(sha256
(base32 "01l8vwyz3bx0iks6cjs5y9ifdsnc1p1yqp4i0kzqd1gjhycizv6y"))))
(base32 "0m5q83ykz5w1fsjsk2vyrnv21cg4n075kbvfvw4k22c61p78shdl"))))
(properties `((upstream-name . "babelwhale")))
(build-system r-build-system)
(propagated-inputs
@ -1871,14 +1917,14 @@ variables.")
(define-public r-ggpp
(package
(name "r-ggpp")
(version "0.5.2")
(version "0.5.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggpp" version))
(sha256
(base32
"0w93427hyiihddsdr6q962gfl01b06yxchi3x3dinfb8mf1m5qmk"))))
"1shcjplw2w8jbfbp0flpxhb7jfy7v79vhjv1qlh6lmam2fziydcc"))))
(properties `((upstream-name . "ggpp")))
(build-system r-build-system)
(propagated-inputs
@ -3387,6 +3433,40 @@ model fitting and error handling.")
into a pipeline of data manipulation and visualisation.")
(license license:gpl3)))
(define-public r-morpho
(package
(name "r-morpho")
(version "2.11")
(source (origin
(method url-fetch)
(uri (cran-uri "Morpho" version))
(sha256
(base32
"1c69n9284chygd375gkir4nk5bjglamhfyk2lz4z3kzy3z25qw50"))))
(properties `((upstream-name . "Morpho")))
(build-system r-build-system)
(propagated-inputs (list r-bezier
r-colorramps
r-doparallel
r-foreach
r-jsonlite
r-mass
r-matrix
r-rcpp
r-rcpparmadillo
r-rgl
r-rvcg
r-sf))
(home-page "https://github.com/zarquon42b/Morpho")
(synopsis
"Calculations and visualizations related to geometric morphometrics")
(description
"This package provides a toolset for Geometric Morphometrics and mesh
processing. This includes (among other stuff) mesh deformations based on
reference points, permutation tests, detection of outliers, processing of
sliding semi-landmarks and semi-automated surface landmark placement.")
(license license:gpl2)))
(define-public r-hgnchelper
(package
(name "r-hgnchelper")
@ -3997,14 +4077,14 @@ conditionals and comparisons, and more.")
(define-public r-sass
(package
(name "r-sass")
(version "0.4.6")
(version "0.4.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "sass" version))
(sha256
(base32
"06f0279ljg6mbcimmfx4rp18zxb9yc24sdp2yxwfxzdp17kjrs1f"))))
"1vp9qnhkvz4shhvwrwbwcy1xnrgry0rmqxsg96ggv90m6sv0hyki"))))
(properties `((upstream-name . "sass")))
(build-system r-build-system)
(propagated-inputs
@ -5013,13 +5093,13 @@ coordinates.")
(define-public r-gensa
(package
(name "r-gensa")
(version "1.1.8")
(version "1.1.9")
(source (origin
(method url-fetch)
(uri (cran-uri "GenSA" version))
(sha256
(base32
"05m2xjaf4202jzzn5l7i7k80kzr8vihv7jpw99c9ic5n3ra8fpip"))))
"10qm0467r2rbcck1w7dijng5j676314vsyxsr0p8l843xz7s66rq"))))
(properties `((upstream-name . "GenSA")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/package=GenSA")
@ -5616,13 +5696,13 @@ factorization and divisive clustering for large sparse and dense matrices.")
(define-public r-rcppspdlog
(package
(name "r-rcppspdlog")
(version "0.0.13")
(version "0.0.14")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppSpdlog" version))
(sha256
(base32 "1149kh047301hrp15479ikcmrix968pwqw3jza7mp7bsxhrjrp3k"))))
(base32 "1n63mz2rr63kz3v7mg6n4cvw2lrw1ffk7xvln1j1005argvzvd4c"))))
(properties `((upstream-name . "RcppSpdlog")))
(build-system r-build-system)
(propagated-inputs (list r-rcpp))
@ -5881,18 +5961,19 @@ graphics packages that comes with the base installation.")
(define-public r-ctrdata
(package
(name "r-ctrdata")
(version "1.13.3")
(version "1.14.0")
(source (origin
(method url-fetch)
(uri (cran-uri "ctrdata" version))
(sha256
(base32
"15vs8b2jxap5ya59n6pdby1p89hd0y0b4say72q6icxsjzzj979z"))))
"0x5dpph62s7dwfs0y4gd73zzbil9cr1y5q8mpn9m7z2gdr67wk1c"))))
(properties `((upstream-name . "ctrdata")))
(build-system r-build-system)
(propagated-inputs
(list r-clipr
r-curl
r-dplyr
r-httr
r-jqr
r-jsonlite
@ -7987,6 +8068,28 @@ can be computed between character vectors while taking proper care of encoding
or between integer vectors representing generic sequences.")
(license license:gpl3+)))
(define-public r-uchardet
(package
(name "r-uchardet")
(version "1.1.1")
(source (origin
(method url-fetch)
(uri (cran-uri "uchardet" version))
(sha256
(base32
"0m3xy807smqdxhkhd9cwrcf3ljlyvfmnkd7831qzpgcadam2jcdj"))))
(properties `((upstream-name . "uchardet")))
(build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://artemklevtsov.gitlab.io/uchardet")
(synopsis "Universal character encoding detector")
(description
"This package provides R bindings to the uchardet encoding detector
library from Mozilla. It takes a sequence of bytes in an unknown character
encoding without any additional information, and attempts to get the encoding
of the text. All return names of the encodings are iconv-compatible.")
(license license:gpl2)))
(define-public r-ucminf
(package
(name "r-ucminf")
@ -8562,6 +8665,29 @@ converted into other popular R objects. This package provides a link between
VCF data and familiar R software.")
(license license:gpl3)))
(define-public r-rvcg
(package
(name "r-rvcg")
(version "0.22.1")
(source (origin
(method url-fetch)
(uri (cran-uri "Rvcg" version))
(sha256
(base32
"16rr2kqw7lqb7m01pwn496zf2nr25gm6wcncz44kszjzzmv2xanv"))))
(properties `((upstream-name . "Rvcg")))
(build-system r-build-system)
(propagated-inputs (list r-rcpp r-rcpparmadillo r-rcppeigen))
(home-page "https://github.com/zarquon42b/Rvcg")
(synopsis "Manipulations of triangular meshes based on the VCGLIB API")
(description
"This is a package for operations on triangular meshes based on VCGLIB.
This package integrates nicely with the R-package rgl to render the meshes
processed by Rvcg. The Visualization and Computer Graphics Library (VCG for
short) is a library for manipulation, processing and displaying with OpenGL of
triangle and tetrahedral meshes.")
(license license:gpl2+)))
(define-public r-ica
(package
(name "r-ica")
@ -11224,6 +11350,28 @@ package covers Models, Completions, Chat, Edits, Images, Embeddings, Audio,
Files, Fine-tunes, Moderations, and legacy Engines endpoints.")
(license license:expat)))
(define-public r-operator-tools
(package
(name "r-operator-tools")
(version "1.6.3")
(source (origin
(method url-fetch)
(uri (cran-uri "operator.tools" version))
(sha256
(base32
"1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"))))
(properties `((upstream-name . "operator.tools")))
(build-system r-build-system)
(home-page "https://github.com/decisionpatterns/operator.tools")
(synopsis "Utilities for working with R's operators")
(description
"This package provides a collection of utilities that allow programming
with R's operators. Routines allow classifying operators, translating to and
from an operator and its underlying function, and inverting some
operators (e.g. comparison operators), etc. All methods can be extended to
custom infix operators.")
(license license:gpl2)))
(define-public r-openxlsx
(package
(name "r-openxlsx")
@ -13274,14 +13422,14 @@ the work.")
(define-public r-doby
(package
(name "r-doby")
(version "4.6.16")
(version "4.6.17")
(source
(origin
(method url-fetch)
(uri (cran-uri "doBy" version))
(sha256
(base32
"1rxvxhb572n29mbvkh6xmi7cnwc6c8g2xzw1wp10nfr9gnspx4ym"))))
"02jb1z19rsmbvzwapgfx7m8lfnlcx9dqf6gkr9fmgcl77d5992n5"))))
(properties `((upstream-name . "doBy")))
(build-system r-build-system)
(propagated-inputs
@ -16571,13 +16719,13 @@ address a bug.")
(define-public r-rcppalgos
(package
(name "r-rcppalgos")
(version "2.7.2")
(version "2.8.0")
(source (origin
(method url-fetch)
(uri (cran-uri "RcppAlgos" version))
(sha256
(base32
"1wfwwbv9wrs2vbk0c36zcwcl9yyzz2h1mw36mpq7lz56xxhy0wf5"))))
"1f9wxwqzv03bgr22s3hnj7mg9qlbap1dsg6vj1blgjl6xpfvz5bn"))))
(properties `((upstream-name . "RcppAlgos")))
(build-system r-build-system)
(inputs (list gmp))
@ -17547,13 +17695,13 @@ maps.")
(define-public r-tidytree
(package
(name "r-tidytree")
(version "0.4.2")
(version "0.4.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "tidytree" version))
(sha256
(base32 "0phmvbpsxx85fvw4000d160qh8njrgmzpr3ja0gy59dgv1k1m0yb"))))
(base32 "196c7j3pgapwh8j8jdhsz078wl24xcf5jkrbbsr2s7xg32j0lmi1"))))
(build-system r-build-system)
(propagated-inputs
(list r-ape
@ -19377,16 +19525,47 @@ hierarchic loggers, multiple handlers per logger, level based filtering, space
handling in messages and custom formatting.")
(license license:gpl3)))
(define-public r-logistf
(package
(name "r-logistf")
(version "1.25.0")
(source (origin
(method url-fetch)
(uri (cran-uri "logistf" version))
(sha256
(base32
"0w78jsynw5jh3l9r3ssjs8rza6givgrxzwnb5jwazcm8637d6gix"))))
(properties `((upstream-name . "logistf")))
(build-system r-build-system)
(propagated-inputs (list r-formula-tools r-matrix r-mgcv r-mice))
(home-page
"https://cemsiis.meduniwien.ac.at/en/kb/science-research\
/software/statistical-software/firth-correction/")
(synopsis "Firth's bias-reduced logistic regression")
(description
"Fit a logistic regression model using Firth's bias reduction method,
equivalent to penalization of the log-likelihood by the Jeffreys prior.
Confidence intervals for regression coefficients can be computed by penalized
profile likelihood. Firth's method was proposed as ideal solution to the
problem of separation in logistic regression, see Heinze and Schemper (2002)
<doi:10.1002/sim.1047>. If needed, the bias reduction can be turned off such
that ordinary maximum likelihood logistic regression is obtained. Two new
modifications of Firth's method, FLIC and FLAC, lead to unbiased predictions
and are now available in the package as well, see Puhr et al (2017)
<doi:10.1002/sim.7273>.")
;; Any version of the GPL
(license license:gpl3+)))
(define-public r-longdat
(package
(name "r-longdat")
(version "1.1.1")
(version "1.1.2")
(source (origin
(method url-fetch)
(uri (cran-uri "LongDat" version))
(sha256
(base32
"1k8rl6jv4xzsm620wf373ds6l8fbb5ff07rgbp0bgqrymvwdf1jc"))))
"1rzkb7byd32jqvhf75zyvy0dlkq79aicz8j0x7lk821qiq4dfv6l"))))
(properties `((upstream-name . "LongDat")))
(build-system r-build-system)
(propagated-inputs (list r-bestnormalize
@ -21189,6 +21368,28 @@ The bedr package's API enhances access to these tools as well as offers
additional utilities for genomic regions processing.")
(license license:gpl2)))
(define-public r-setrng
(package
(name "r-setrng")
(version "2022.4-1")
(source (origin
(method url-fetch)
(uri (cran-uri "setRNG" version))
(sha256
(base32
"09089vr5x8snwxh38kdhgpjl3jl7zrk056f6f9a2jg5lsrmnxh31"))))
(properties `((upstream-name . "setRNG")))
(build-system r-build-system)
(home-page "https://distr.r-forge.r-project.org/")
(synopsis "Set (normal) random number generator and seed")
(description
"This package provides utilities to help set and record the setting of
the seed and the uniform and normal generators used when a random experiment
is run. The utilities can be used in other functions that do random
experiments to simplify recording and/or setting all the necessary information
for reproducibility. See the vignette and reference manual for examples.")
(license license:gpl2)))
(define-public r-sets
(package
(name "r-sets")
@ -21606,17 +21807,25 @@ information about geometries.")
(define-public r-sf
(package
(name "r-sf")
(version "1.0-13")
(version "1.0-14")
(source
(origin
(method url-fetch)
(uri (cran-uri "sf" version))
(sha256
(base32
"11lcc57vqip1zj8hi09mnisl9jiqqxwx6b06jl752dayxi2109br"))))
"1xrrqd91601lcd83zzwksb4ampy1j8vf8f6941csk89psm45clwb"))))
(build-system r-build-system)
(inputs
(list gdal geos proj sqlite))
(list curl
gdal
geos
openssh
openssl
pcre2
proj
sqlite
zlib))
(propagated-inputs
(list r-classint
r-dbi
@ -24044,13 +24253,13 @@ code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.")
(define-public r-sccore
(package
(name "r-sccore")
(version "1.0.3")
(version "1.0.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "sccore" version))
(sha256
(base32 "1bvqbqh8pkiljy7s3mc67wsr1jlxb19rhd95160xparmrbffpxqb"))))
(base32 "11l7xl1ylzmda4i2p1b08a43pvciin2i2sas2n3cj1gmamflkji3"))))
(properties `((upstream-name . "sccore")))
(build-system r-build-system)
(propagated-inputs
@ -27288,14 +27497,14 @@ transcription, ...")
(define-public r-seewave
(package
(name "r-seewave")
(version "2.2.0")
(version "2.2.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "seewave" version))
(sha256
(base32
"0bi1l47l3846c18k6h2vrv0xp9xh00n544a578jrndahzrj1hfwl"))))
"0whfanh3949162575ddw5y6s5ydq9v24l929gwdd1jv16xzlnp9h"))))
(properties `((upstream-name . "seewave")))
(build-system r-build-system)
(inputs
@ -29551,6 +29760,30 @@ to improve the readability of data presented in tabular form rendered in web
pages.")
(license license:expat)))
(define-public r-formula-tools
(package
(name "r-formula-tools")
(version "1.7.1")
(source (origin
(method url-fetch)
(uri (cran-uri "formula.tools" version))
(sha256
(base32
"15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"))))
(properties `((upstream-name . "formula.tools")))
(build-system r-build-system)
(propagated-inputs (list r-operator-tools))
(home-page "https://github.com/decisionpatterns/formula.tools")
(synopsis
"Utilities for manipulating formulas, calls, assignments and other R objects")
(description
"These utilities facilitate the programmatic manipulations of formulas,
expressions, calls, assignments and other R language objects. These objects
all share the same structure: a left-hand side, operator and right-hand side.
This packages provides methods for accessing and modifying this structures as
well as extracting and replacing names and symbols from these objects.")
(license license:gpl2)))
(define-public r-xmisc
(package
(name "r-xmisc")
@ -36170,40 +36403,40 @@ package online.")
(name "r-prereg")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "prereg" version))
(sha256
(base32
"039nrl5cirsx1ysh214dr6xnn1h6h3f90im6k9dgmzfksxdqigpw"))))
(origin
(method url-fetch)
(uri (cran-uri "prereg" version))
(sha256
(base32
"039nrl5cirsx1ysh214dr6xnn1h6h3f90im6k9dgmzfksxdqigpw"))))
(properties `((upstream-name . "prereg")))
(build-system r-build-system)
(propagated-inputs
(list r-rmarkdown
;; The package provides a custom LaTex template in
;; inst/rmd/prereg_form.tex, which depends on these packages:
texlive-amsmath
texlive-booktabs
texlive-etoolbox
texlive-iftex
texlive-fancyhdr
texlive-fancyvrb
texlive-latex-geometry
texlive-graphics
texlive-latex-threeparttable
texlive-titlesec
texlive-latex-upquote
texlive-listings
texlive-polyglossia
texlive-titling
texlive-tools
texlive-ulem
(texlive-updmap.cfg (list texlive-amsfonts texlive-lm))))
(list r-rmarkdown
;; The package provides a custom LaTex template in
;; inst/rmd/prereg_form.tex, which depends on these packages:
texlive-amsmath
texlive-booktabs
texlive-etoolbox
texlive-fancyhdr
texlive-fancyvrb
texlive-geometry
texlive-graphics
texlive-iftex
texlive-listings
texlive-polyglossia
texlive-threeparttable
texlive-titlesec
texlive-titling
texlive-tools
texlive-ulem
texlive-upquote
(texlive-updmap.cfg (list texlive-lm))))
(home-page "https://github.com/crsh/prereg")
(synopsis
"R Markdown Templates to preregister Scientific Studies")
"R Markdown Templates to preregister Scientific Studies")
(description
"This package provides a collection of templates to author
"This package provides a collection of templates to author
preregistration documents for scientific studies in PDF format.")
(license license:gpl3)))
@ -36800,14 +37033,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.")
(define-public r-stars
(package
(name "r-stars")
(version "0.6-1")
(version "0.6-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "stars" version))
(sha256
(base32
"19q44bs2w12lyim8gzfpgxfkp2cdf29cav4cv74vzsxrv8xdny0z"))))
"0prip06c28d72wa7h8h8p2y7rw7jnh2h2yhnygbaipc8cbzlvi7x"))))
(properties `((upstream-name . "stars")))
(build-system r-build-system)
(propagated-inputs
@ -39211,14 +39444,14 @@ be efficient and easy to use.")
(define-public r-ggh4x
(package
(name "r-ggh4x")
(version "0.2.4")
(version "0.2.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggh4x" version))
(sha256
(base32
"15b2agnk5dsinrxkbq5bmqgckssvlrkwarj2pi7xi8lxsqqrpw3w"))))
"0xj4nlxrpmwzdlj4q3vnhwy7gd1634ff7yjsnaf609ap0q23mxb1"))))
(properties `((upstream-name . "ggh4x")))
(build-system r-build-system)
(propagated-inputs

55
gnu/packages/cross-base.scm
View File

@ -1,13 +1,14 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2019, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -374,6 +375,24 @@ target that libc."
(inherit gnumach-headers)
(name (string-append (package-name gnumach-headers)
"-cross-" target))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
;; Cheat by setting the host_cpu variable manually, since using
;; --host= would require a working cross-compiler, which we don't
;; have yet.
(add-after 'unpack 'substitute-host-cpu
(lambda _
(substitute* "configure.ac"
(("AC_CANONICAL_HOST")
#$(string-append
"host_cpu="
(match target
((? target-x86-32?)
"i386")
((? target-x86-64?)
"x86_64")))))))))))
(native-inputs
(modify-inputs (package-native-inputs gnumach-headers)
(prepend xgcc xbinutils)))))
@ -492,7 +511,11 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
hurd "/include")))
(for-each (cut setenv <> cpath)
',%gcc-cross-include-paths)
#t)))))))
#t)))))
((#:configure-flags flags)
`(cons* ,(string-append "--build=" (%current-system))
,(string-append "--host=" target)
,flags))))
(propagated-inputs `(("gnumach-headers" ,xgnumach-headers)
("hurd-headers" ,xhurd-headers)))
@ -518,21 +541,35 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
,(string-append "--host=" target)
,flags))
((#:phases phases)
`(modify-phases ,phases
#~(modify-phases #$phases
(add-after 'unpack 'delete-shared-target
;; Cannot create shared libraries due to missing crt1.o
(lambda _
(substitute* "Makeconf"
(("(targets := \\$\\(libname\\)\\.a) \\$\\(libname\\)\\.so" all static)
static)
(("\\$\\(DESTDIR\\)\\$\\(libdir\\)/\\$\\(libname\\)\\.so\\.\\$\\(hurd-version\\)")
"")
(("^libs: .*\\.so\\..*" all)
(string-append "# " all)))))
(add-before 'configure 'set-cross-headers-path
(lambda* (#:key inputs #:allow-other-keys)
(let* ((glibc-headers (assoc-ref inputs "cross-glibc-hurd-headers"))
(cpath (string-append glibc-headers "/include")))
(mach-headers (assoc-ref inputs "cross-gnumach-headers"))
(cpath (string-append glibc-headers "/include"
":" mach-headers "/include")))
(for-each (cut setenv <> cpath)
',%gcc-cross-include-paths)
'#$%gcc-cross-include-paths)
#t)))))))
(inputs `(("cross-glibc-hurd-headers" ,xglibc/hurd-headers)))
(inputs `(("cross-glibc-hurd-headers" ,xglibc/hurd-headers)
("cross-gnumach-headers" ,xgnumach-headers)))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
("cross-mig" ,xmig)
,@(alist-delete "mig"(package-native-inputs hurd-minimal))))))
,@(alist-delete "mig"
(package-native-inputs hurd-minimal))))))
(define xhurd-core-headers
(package
@ -555,7 +592,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
(define* (cross-libc/deprecated target
#:optional
(libc glibc)
(libc (libc-for-target target))
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target))
(xheaders (cross-kernel-headers target)))
@ -568,7 +605,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
(define* (cross-libc* target
#:key
(libc glibc)
(libc (libc-for-target target))
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target))
(xheaders (cross-kernel-headers target)))

40
gnu/packages/crypto.scm
View File

@ -216,7 +216,7 @@ communication, encryption, decryption, signatures, etc.")
(define-public signify
(package
(name "signify")
(version "30")
(version "31")
(home-page "https://github.com/aperezdc/signify")
(source (origin
(method url-fetch)
@ -224,17 +224,18 @@ communication, encryption, decryption, signatures, etc.")
"/download/v" version "/signify-" version ".tar.xz"))
(sha256
(base32
"11l67j04gyxnlw6zrzsygqs5cgsc1sww1rh0apl05yay131hd17n"))))
"0x1bipfphnyvf2kl7n9q4gawaglma79368vb8whama6lxsggsm8i"))))
(build-system gnu-build-system)
;; TODO Build with libwaive (described in README.md), to implement something
;; like OpenBSD's pledge().
(arguments
`(#:make-flags
(list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(list
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
(list pkg-config))
(inputs
@ -332,7 +333,7 @@ OpenBSD tool of the same name.")
("googletest-source" ,(package-source googletest))
("perl" ,perl)))
(inputs
(list attr fuse openssl-1.1 tinyxml2))
(list attr fuse-2 openssl-1.1 tinyxml2))
(arguments
`(#:configure-flags (list "-DUSE_INTERNAL_TINYXML=OFF")
#:phases
@ -1210,7 +1211,7 @@ Features:
(list pkg-config))
(inputs
(list nettle libxml2))
(home-page "http://stoken.sf.net")
(home-page "https://stoken.sf.net")
(synopsis "Software Token for cryptographic authentication")
(description
"@code{stoken} is a token code generator compatible with RSA SecurID
@ -1478,7 +1479,7 @@ non-encrypted files.")
(define-public cryfs
(package
(name "cryfs")
(version "0.11.3")
(version "0.11.4")
(source
(origin
(method url-fetch)
@ -1486,7 +1487,7 @@ non-encrypted files.")
"https://github.com/cryfs/cryfs/releases/download/"
version "/cryfs-" version ".tar.xz"))
(sha256
(base32 "1h41dhdfk2nll0vx5i66mgrdalv6kccwq5yx99gridywxw6qxxhq"))))
(base32 "0a48qijfrd02ianp19x3kz24w1pgigmlxdr5nks0gag7z5b2s7m7"))))
(build-system cmake-build-system)
(arguments
'(#:modules ((guix build cmake-build-system)
@ -1513,14 +1514,7 @@ non-encrypted files.")
(when tests?
(substitute* "CMakeLists.txt"
(("option.BUILD_TESTING .build test cases. OFF.")
"option(BUILD_TESTING \"build test cases\" ON)")))
;; work around a missing import fixed upstream in boost 1.78
;; See https://github.com/boostorg/process/issues/213
(substitute* (find-files "." "subprocess.cpp$")
(("#include <boost/process.hpp>.*" line)
(string-append
"#include <algorithm>\n"
line)))))
"option(BUILD_TESTING \"build test cases\" ON)")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@ -1538,7 +1532,7 @@ non-encrypted files.")
(native-inputs
(list pkg-config python-wrapper))
(inputs
(list boost curl fuse range-v3 spdlog))
(list boost curl fuse-2 range-v3 spdlog))
(home-page "https://www.cryfs.org/")
(synopsis "Encrypted FUSE filesystem for the cloud")
(description "CryFS encrypts your files, so you can safely store them anywhere.
@ -1675,7 +1669,7 @@ checksum tool based on the BLAKE3 cryptographic hash function.")
(define-public libxcrypt
(package
(name "libxcrypt")
(version "4.4.33")
(version "4.4.36")
(source
(origin
(method git-fetch)
@ -1684,7 +1678,7 @@ checksum tool based on the BLAKE3 cryptographic hash function.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "174k5cj95617akg6pplv371mpd35j9q8il245f2zcpq76yz4qydl"))))
(base32 "1yhpjjjv38y14nrj15bkndq824v42plndgi3k8mmc04grj1fbnjf"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf

10
gnu/packages/cups.scm
View File

@ -514,14 +514,14 @@ should only be used as part of the Guix cups-pk-helper service.")
(define-public hplip
(package
(name "hplip")
(version "3.23.3")
(version "3.23.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"1dh7gqhzv03a6j1kbkiaksy9a752k90xwqi5x0hqvn5ilac0l9p4"))
"1j6bjn4zplxl7w15xrc1v5l3p9a0x0345756ahvgq8mi97bmx3pn"))
(modules '((guix build utils)))
(snippet
'(begin
@ -860,9 +860,9 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(package
(name "epson-inkjet-printer-escpr")
(version "1.7.24")
;; XXX: This currently works. But it will break as soon as a newer
;; version is available since the URLs for older versions are not
;; preserved. An alternative source will be added as soon as
;; XXX: This currently works. But it will break as soon as a newer version
;; is available since the URLs for older versions are not preserved. Since
;; 1.8.0, source tarballs have been discontinued and only a ‘source RPM’ is
;; available.
(source
(origin

33
gnu/packages/curl.scm
View File

@ -11,7 +11,7 @@
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
@ -125,7 +125,22 @@
;; The top-level "make check" does "make -C tests quiet-test", which
;; is too quiet. Use the "test" target instead, which is more
;; verbose.
(invoke "make" "-C" "tests" "test")))))))
(invoke "make" "-C" "tests" "test"))))
#$@(if (system-hurd?)
#~((add-after 'unpack 'skip-tests
(lambda _
(let ((port (open-file "tests/data/DISABLED" "a")))
(display "526\n" port)
(display "527\n" port)
(display "532\n" port)
(display "533\n" port)
(display "537\n" port)
(display "546\n" port)
(display "575\n" port)
(display "1021\n" port)
(display "1501\n" port)
(close port)))))
#~()))))
(synopsis "Command line tool for transferring data with URL syntax")
(description
"curl is a command line tool for transferring data with URL syntax,
@ -386,7 +401,7 @@ sugar and output formatting inspired from @code{httpie}.")
(define-public trurl
(package
(name "trurl")
(version "0.5")
(version "0.8")
(source
(origin
(method git-fetch)
@ -395,7 +410,7 @@ sugar and output formatting inspired from @code{httpie}.")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mvkpjs6wnz5hzmp2iglik85zljrzglsa6fm839l78fhw89dg3w6"))))
(base32 "19zdpjp01n7s7zgixq3irqfnx66dmqf8zyp0dlb6y7ga673lqwi8"))))
(build-system gnu-build-system)
(arguments
(list
@ -408,11 +423,11 @@ sugar and output formatting inspired from @code{httpie}.")
(native-inputs (list python))
(inputs (list curl))
(home-page "https://curl.se/trurl/")
(synopsis "Command line tool for URL parsing and manipulatio")
(description "@code{trurl} is a tool in a similar spirit of @code{tr} but
for URLs. Here, @code{tr} stands for translate or transpose.
(synopsis "Command line tool for URL parsing and manipulation")
(description "@code{trurl} is a command line tool that parses and
manipulates URLs, designed to help shell script authors everywhere.
@code{trurl} is a command line tool that parses and manipulates URLs, designed
to help shell script authors everywhere.")
It is similar in spirit to @code{tr}. Here, @code{tr} stands for translate or
transpose.")
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))))

179
gnu/packages/databases.scm
View File

@ -1190,14 +1190,14 @@ and high-availability (HA).")
(define-public postgresql-15
(package
(name "postgresql")
(version "15.1")
(version "15.3")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"1bi19sqmri569hyjvbk8grlws7f5dalsqz87wkgx1yjafcyz5zb4"))
"0cnrk5jrwfqkcx8mlg761s60ninqrsxpzasf7xfbzzq03y4x9izz"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
@ -1265,27 +1265,27 @@ pictures, sounds, or video.")
(define-public postgresql-13
(package
(inherit postgresql-14)
(version "13.9")
(version "13.11")
(source (origin
(inherit (package-source postgresql-14))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"05d46dzkya6s0qbaxvksc5j12syb514q5lha6z9vx7z4lp06c6gg"))))))
"1yqbwnzgdgaim476smwkdj2jd6j92x9xqm2f1mknnmh3f9jgz4j9"))))))
(define-public postgresql-11
(package
(inherit postgresql-13)
(name "postgresql")
(version "11.18")
(version "11.20")
(source (origin
(inherit (package-source postgresql-13))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"013m1x53qfxcry7l033ahhxjc3lflb7fj8fapk7qm49fqppj0kyj"))))
"1kmcnnc2nwjxv042b8bxbdxdgfksxvgmfhh4999rhzjays18hz1x"))))
(native-inputs
(modify-inputs (package-native-inputs postgresql-13)
(replace "docbook-xml" docbook-xml-4.2)))))
@ -2420,14 +2420,14 @@ similar to BerkeleyDB, LevelDB, etc.")
(define-public redis
(package
(name "redis")
(version "7.0.9")
(version "7.0.12")
(source (origin
(method url-fetch)
(uri (string-append "http://download.redis.io/releases/redis-"
(uri (string-append "https://download.redis.io/releases/redis-"
version".tar.gz"))
(sha256
(base32
"0rczzcy2mwy6hjdgg10l9lr4vavh8jrs7zlb0ba534bwlk13awgp"))
"1dwayif99cipf0xs26zipbnj800px31pbsxz747bzclb4xdkvn4x"))
(modules '((guix build utils)))
(snippet
;; Delete bundled jemalloc, as the package will use the libc one
@ -2435,7 +2435,7 @@ similar to BerkeleyDB, LevelDB, etc.")
(build-system gnu-build-system)
(arguments
(list
#:make-flags #~(list #$(string-append "CC=" (cc-for-target))
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))
"MALLOC=libc"
"LDFLAGS=-ldl"
(string-append "PREFIX=" #$output))
@ -2452,7 +2452,7 @@ similar to BerkeleyDB, LevelDB, etc.")
(which "env")))))
(add-after 'unpack 'adjust-tests
(lambda _
;; Disable failing tests
;; Disable failing tests.
(substitute* "tests/test_helper.tcl"
;; The AOF tests cause the test suite to hang waiting for a
;; "background AOF rewrite to finish", perhaps because dead
@ -2777,25 +2777,26 @@ database.")
(define-public perl-db-file
(package
(name "perl-db-file")
(version "1.856")
(version "1.858")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/DB_File-"
version ".tar.gz"))
(sha256
(base32 "1ab6rm2b8lz0g3gc8k9y79gkgajyby0zpybkdg9mk4g35y9bmyfd"))))
(base32 "1xm7s2ag15498kp7g8r20gxk22ncz3b3hz4b3srqf7ypif3a5dyf"))))
(build-system perl-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'modify-config.in
(lambda _
(substitute* "config.in"
(("/usr/local/BerkeleyDB")
#$(this-package-input "bdb"))))))))
(inputs (list bdb))
(native-inputs (list perl-test-pod))
(arguments
`(#:phases (modify-phases %standard-phases
(add-before
'configure 'modify-config.in
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "config.in"
(("/usr/local/BerkeleyDB") (assoc-ref inputs "bdb")))
#t)))))
(home-page "https://metacpan.org/release/DB_File")
(synopsis "Perl5 access to Berkeley DB version 1.x")
(description
@ -3321,83 +3322,85 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
(define-public virtuoso-ose
(package
(name "virtuoso-ose")
(version "7.2.9")
(version "7.2.10")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/"
"virtuoso-opensource-" version ".tar.gz"))
(sha256
(base32 "145s4lqixdxa3j0lp9lgzbb664zzy1imw04hmgia5y5679i8r0xy"))
(base32 "03vznas39valis02zk0hnli7x5asiam4rxzqhr58agzkdyb0lay0"))
(patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch"))
(modules '((guix build utils)))
;; This snippet removes pre-built Java archives.
(snippet
'(for-each delete-file-recursively
(list "binsrc/hibernate"
"binsrc/jena"
"binsrc/jena2"
"binsrc/jena3"
"binsrc/jena4"
"binsrc/rdf4j"
"binsrc/sesame"
"binsrc/sesame2"
"binsrc/sesame3"
"binsrc/sesame4"
"libsrc/JDBCDriverType4")))))
#~(for-each delete-file-recursively
(list "binsrc/hibernate"
"binsrc/jena"
"binsrc/jena2"
"binsrc/jena3"
"binsrc/jena4"
"binsrc/rdf4j"
"binsrc/sesame"
"binsrc/sesame2"
"binsrc/sesame3"
"binsrc/sesame4"
"libsrc/JDBCDriverType4")))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; Tests require a network connection.
;; TODO: Removing the libsrc/zlib source directory breaks the build.
;; This indicates that the internal zlib code may still be used.
#:configure-flags '("--without-internal-zlib"
"--with-readline"
"--enable-static=no")
#:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
(invoke "sh" "autogen.sh")))
(add-after 'unpack 'avoid-embedding-kernel-and-timestamps
;; For a reproducible build, avoid embedding the kernel version and
;; timestamps.
(lambda _
(substitute*
(list "bin/makever"
"appsrc/ODS-Polls/make_vad.sh"
"appsrc/ODS-Blog/make_vad.sh"
"appsrc/ODS-Community/make_vad.sh"
"appsrc/ODS-Framework/make_vad.sh"
"appsrc/ODS-Framework/oauth/make_vad.sh"
"appsrc/ODS-WebMail/make_vad.sh"
"appsrc/ODS-Calendar/make_vad.sh"
"appsrc/ODS-Gallery/make_vad.sh"
"appsrc/ODS-Briefcase/make_vad.sh"
"appsrc/ODS-FeedManager/make_vad.sh"
"appsrc/ODS-Bookmark/make_vad.sh"
"appsrc/ODS-Addressbook/make_vad.sh"
"binsrc/dbpedia/make_vad.sh"
"binsrc/samples/demo/make_vad.sh"
"binsrc/samples/demo/mkdoc.sh"
"binsrc/samples/sparql_demo/make_vad.sh"
"binsrc/bpel/make_vad.sh"
"binsrc/fct/make_vad.sh"
"binsrc/rdf_mappers/make_vad.sh"
"binsrc/isparql/make_vad.sh"
"binsrc/conductor/mkvad.sh")
(("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n")
(("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n")
(("^PACKDATE=.*") "PACKDATE=2012-04-18\n")
(("^DATE=.*") "DATE=2012-04-18\n"))))
;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in
;; the build output. The following phase removes it.
(add-after 'install 'remove-static-libs
(lambda* (#:key outputs #:allow-other-keys)
(let ((lib (string-append (assoc-ref outputs "out") "/lib")))
(for-each (lambda (file)
(delete-file (string-append lib "/" file)))
'("libvirtuoso-t.a"
"libvirtuoso-t.la"))))))))
(list
#:tests? #f ; tests require a network connection
;; TODO: Removing the libsrc/zlib source directory breaks the build.
;; This indicates that the internal zlib code may still be used.
#:configure-flags
#~(list "--without-internal-zlib"
"--with-readline"
"--enable-static=no")
#:phases
#~(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
(invoke "sh" "autogen.sh")))
(add-after 'unpack 'avoid-embedding-kernel-and-timestamps
;; For a reproducible build, avoid embedding the kernel version and
;; timestamps.
(lambda _
(substitute*
(list "bin/makever"
"appsrc/ODS-Polls/make_vad.sh"
"appsrc/ODS-Blog/make_vad.sh"
"appsrc/ODS-Community/make_vad.sh"
"appsrc/ODS-Framework/make_vad.sh"
"appsrc/ODS-Framework/oauth/make_vad.sh"
"appsrc/ODS-WebMail/make_vad.sh"
"appsrc/ODS-Calendar/make_vad.sh"
"appsrc/ODS-Gallery/make_vad.sh"
"appsrc/ODS-Briefcase/make_vad.sh"
"appsrc/ODS-FeedManager/make_vad.sh"
"appsrc/ODS-Bookmark/make_vad.sh"
"appsrc/ODS-Addressbook/make_vad.sh"
"binsrc/dbpedia/make_vad.sh"
"binsrc/samples/demo/make_vad.sh"
"binsrc/samples/demo/mkdoc.sh"
"binsrc/samples/sparql_demo/make_vad.sh"
"binsrc/bpel/make_vad.sh"
"binsrc/fct/make_vad.sh"
"binsrc/rdf_mappers/make_vad.sh"
"binsrc/isparql/make_vad.sh"
"binsrc/conductor/mkvad.sh")
(("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n")
(("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n")
(("^PACKDATE=.*") "PACKDATE=2012-04-18\n")
(("^DATE=.*") "DATE=2012-04-18\n"))))
;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in
;; the build output. The following phase removes it.
(add-after 'install 'remove-static-libs
(lambda _
(for-each
(lambda (file)
(delete-file (string-append #$output "/lib/" file)))
'("libvirtuoso-t.a"
"libvirtuoso-t.la")))))))
(native-inputs
(list autoconf automake bison flex gperf libtool))
(inputs
@ -3800,13 +3803,13 @@ libraries with SQLALchemy.")
(define-public python-psycopg2
(package
(name "python-psycopg2")
(version "2.9.5")
(version "2.9.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "psycopg2" version))
(sha256
(base32 "0ni4kq6p7hbkm2qsky998q36q5gq5if4nwd8hwhjx5rsd0p6s955"))))
(base32 "04chl9f7v7k1zssa40pmk06jvpyqiss2lpjq50dq69nqix0mhlgi"))))
(build-system python-build-system)
(arguments
;; Tests would require a postgresql database "psycopg2_test"

40
gnu/packages/dav.scm
View File

@ -24,6 +24,7 @@
(define-module (gnu packages dav)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix git-download)
@ -84,13 +85,13 @@ clients.")
(define-public xandikos
(package
(name "xandikos")
(version "0.2.3")
(version "0.2.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "xandikos" version))
(sha256
(base32 "13ikmcja9p42azb5ccqj2bw98zybna6zlflj10hqy0kvbib70l94"))))
(base32 "00ghmzcc37b17pp0r6d9v5vpxmz500kzxqj1k9ppcjhbbpvp9w8n"))))
(build-system python-build-system)
(propagated-inputs
(list python-aiohttp
@ -122,29 +123,32 @@ efficient syncing
(define-public vdirsyncer
(package
(name "vdirsyncer")
(version "0.19.1")
(version "0.19.2")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
"1bh3kz0d8g07xnlkb5l2fj6fdakqps1wviab6zv139x5b9rcfxma"))))
"1fl21m10ghrpmkqa12g0qri99cxk9879pkb60jd4b4w2mgp8q1gx"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; The test suite is very flakey.
#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(setenv "DETERMINISTIC_TESTS" "true")
(setenv "DAV_SERVER" "radicale")
(setenv "REMOTESTORAGE_SERVER" "skip")
(if tests?
(invoke "make" "test"))))
(add-after 'unpack 'patch-version-call
(lambda _
(substitute* "docs/conf.py"
(("^release.*") (string-append "release = '" ,version "'\n"))))))))
(list
#:tests? #f ; the test suite is very flakey
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(setenv "DETERMINISTIC_TESTS" "true")
(setenv "DAV_SERVER" "radicale")
(setenv "REMOTESTORAGE_SERVER" "skip")
(if tests?
(invoke "make" "test"))))
(add-after 'unpack 'patch-version-call
(lambda _
(substitute* "docs/conf.py"
(("^release.*")
(string-append "release = '" #$version "'\n"))))))))
(native-inputs
(list python-setuptools-scm
python-sphinx

17
gnu/packages/dictionaries.scm
View File

@ -53,6 +53,7 @@
#:use-module (gnu packages texinfo)
#:use-module (gnu packages compression)
#:use-module (gnu packages tcl)
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
@ -391,7 +392,7 @@ intelligible and easily correctable.")
(define-public sdcv
(package
(name "sdcv")
(version "0.5.3")
(version "0.5.5")
(source
(origin
(method git-fetch)
@ -400,8 +401,7 @@ intelligible and easily correctable.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"))))
(base32 "17jwcgc3jdp41rvxqi7zdsysfpjgzqq4z1l345qwffp1an6yaaqk"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_TESTS=YES")
@ -413,16 +413,13 @@ intelligible and easily correctable.")
(add-before 'check 'pre-check
(lambda _
(setenv "HOME" (getcwd))
#t))
(add-after 'unpack 'remove-jq-requirement
(lambda _
;; We don't want to bring in jq for one test.
(substitute* "tests/t_json"
(("jq") "echo"))
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
;; For tests.
("jq" ,jq)))
(inputs
(list glib ncurses readline zlib))
(home-page "https://dushistov.github.io/sdcv/")

114
gnu/packages/diffoscope.scm
View File

@ -74,7 +74,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "242")
(version "246")
(source
(origin
(method git-fetch)
@ -83,62 +83,66 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1aa6cszav4bgiljhkly0l3bzn4kggkncrk1zbc6hdm361r8yrw34"))))
(base32 "1y54r0kayn7nvv0ng9dx6bwxvrwdkd0xaklmfq53z7p00wgx0ly8"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
;; These tests are broken because our `file` package has a
;; bug in berkeley-db and wasm file type detection.
(add-after 'unpack 'remove-broken-file-type-detection-test
(lambda _
(delete-file "tests/comparators/test_berkeley_db.py")
(delete-file "tests/comparators/test_wasm.py")))
(add-after 'unpack 'embed-tool-references
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "diffoscope/comparators/utils/compare.py"
(("\\[\"xxd\",")
(string-append "[\"" (which "xxd") "\",")))
(substitute* "diffoscope/diff.py"
(("@tool_required\\(\"diff\"\\)") "")
(("get_tool_name\\(\"diff\"\\)")
(string-append "get_tool_name(\"" (which "diff") "\")")))
(substitute* "diffoscope/comparators/directory.py"
(("@tool_required\\(\"stat\"\\)") "")
(("@tool_required\\(\"getfacl\"\\)") "")
(("\\[\"stat\",")
(string-append "[\"" (which "stat") "\","))
(("\\[\"getfacl\",")
(string-append "[\"" (which "getfacl") "\",")))))
(add-after 'build 'build-man-page
(lambda _
(invoke "make" "-C" "doc")))
(add-before 'check 'writable-test-data
(lambda _
;; Tests may need write access to tests directory.
(for-each make-file-writable (find-files "tests"))))
(add-before 'check 'fix-failing-test
(lambda _
;; There is no user name mapping in the build environment.
;; Pytest made it so much harder than should be necessary,
;; so I'm leaving… this here in case I ever need it again:
;; (substitute* "tests/comparators/test_squashfs.py"
;; (("^def test_symlink_root.*" match) ; no, I don't
;; (string-append ; know Python
;; match "\n raise ValueError(" ; why do you
;; "differences_root[1].unified_diff)\n"))) ; ask
(substitute* "tests/data/squashfs_root_expected_diff"
(("root/root")
'"0/0 "))))
(add-before 'check 'delete-failing-test
;; Please add new tests to fix-failing-test and not here ;-)
(lambda _
;; This requires /sbin to be in $PATH.
(delete-file "tests/test_tools.py")))
(add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1")))
(install-file "doc/diffoscope.1" man)))))))
(list
#:phases
#~(modify-phases %standard-phases
;; These tests are broken because our `file` package has a
;; bug in berkeley-db and wasm file type detection.
(add-after 'unpack 'remove-broken-file-type-detection-test
(lambda _
(delete-file "tests/comparators/test_berkeley_db.py")
(delete-file "tests/comparators/test_wasm.py")))
(add-after 'unpack 'embed-tool-references
(lambda* (#:key inputs #:allow-other-keys)
(define (bin command)
(search-input-file inputs (string-append "bin/" command)))
(substitute* "diffoscope/comparators/utils/compare.py"
(("\\[\"(xxd)\"," _ command)
(string-append "[\"" (bin command) "\",")))
(substitute* "diffoscope/diff.py"
(("@tool_required\\(\"diff\"\\)") "")
(("get_tool_name\\(\"(diff)\"\\)" _ command)
(string-append "get_tool_name(\"" (bin command) "\")")))
(substitute* "diffoscope/comparators/directory.py"
(("@tool_required\\(\"stat\"\\)") "")
(("@tool_required\\(\"getfacl\"\\)") "")
(("\\[\"(stat)\"," _ command)
(string-append "[\"" (bin command) "\","))
(("\\[\"(getfacl)\"," _ command)
(string-append "[\"" (bin command) "\",")))))
(add-after 'build 'build-man-page
(lambda _
(invoke "make" "-C" "doc")))
(add-before 'check 'writable-test-data
(lambda _
;; Tests may need write access to tests directory.
(for-each make-file-writable (find-files "tests"))))
(add-before 'check 'fix-failing-test
(lambda _
;; There is no user name mapping in the build environment.
;; Pytest made it so much harder than should be necessary,
;; so I'm leaving… this here in case I ever need it again:
;; (substitute* "tests/comparators/test_squashfs.py"
;; (("^def test_symlink_root.*" match) ; no, I don't
;; (string-append ; know Python
;; match "\n raise ValueError(" ; why do you
;; "differences_root[1].unified_diff)\n"))) ; ask
(substitute* "tests/data/squashfs_root_expected_diff"
(("root/root")
'"0/0 "))))
(add-before 'check 'delete-failing-test
;; Please add new tests to fix-failing-test and not here ;-)
(lambda _
;; This requires /sbin to be in $PATH.
(delete-file "tests/test_tools.py")))
(add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1")))
(install-file "doc/diffoscope.1" man)))))))
(inputs (list rpm ;for rpm-python
python-debian
python-libarchive-c

38
gnu/packages/disk.scm
View File

@ -3,8 +3,8 @@
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2019-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -69,6 +69,7 @@
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages hurd)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
@ -244,27 +245,36 @@ tmpfs/ramfs filesystems.")
(define-public parted
(package
(name "parted")
(version "3.5")
(version "3.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/parted/parted-"
version ".tar.xz"))
(sha256
(base32
"18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29"))))
"04p6b4rygrfd1jrskwrx3bn2icajg1mvbfhyc0c9l3ya7kixnhrv"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda _
(substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python"))))))))
(list
#:configure-flags (if (target-hurd?)
#~'("--disable-device-mapper")
#~'())
#:tests? (not (or (target-hurd?)
(%current-target-system)))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda _
(substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python"))))))))
(inputs
(list lvm2 readline
`(,util-linux "lib")))
`(,@(if (target-hurd?)
(list hurd-minimal)
(list lvm2))
,readline
(,util-linux "lib")))
(native-inputs
(list gettext-minimal

245
gnu/packages/dns.scm
View File

@ -513,51 +513,52 @@ the two.")
(define-public nsd
(package
(name "nsd")
(version "4.6.1")
(version "4.7.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz"))
(sha256
(base32 "0ym2fgkjar94y99lyvp93p7jpj33ysprvqd7py28xxn37shs6q1z"))))
(base32 "057jxhhyggqhy4swwqlwf1lflc96cfqpm200l1gr3lls557a9b4g"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--enable-pie" ; fully benefit from ASLR
"--enable-ratelimit"
"--enable-recvmmsg"
"--enable-relro-now" ; protect GOT and .dtor areas
"--disable-radix-tree"
(string-append "--with-libevent="
(assoc-ref %build-inputs "libevent"))
(string-append "--with-ssl="
(assoc-ref %build-inputs "openssl"))
"--with-configdir=/etc"
"--with-nsd_conf_file=/etc/nsd/nsd.conf"
"--with-logfile=/var/log/nsd.log"
"--with-pidfile=/var/db/nsd/nsd.pid"
"--with-dbfile=/var/db/nsd/nsd.db"
"--with-zonesdir=/etc/nsd"
"--with-xfrdfile=/var/db/nsd/xfrd.state"
"--with-zonelistfile=/var/db/nsd/zone.list")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-installation-paths
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
;; The ‘make install’ target tries to create the parent
;; directories of run-time things like ‘pidfile’ above, and
;; useless empty directories like 'configdir'. Remove such
;; '$(INSTALL)' lines and install the example configuration file
;; in an appropriate location.
(substitute* "Makefile.in"
((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command)
(string-append "#" command))
(("\\$\\(nsdconfigfile\\)\\.sample" file-name)
(string-append doc "/examples/" file-name)))))))
#:tests? #f)) ; no tests
(list
#:configure-flags
#~(list "--enable-pie" ; fully benefit from tasty ASLR
"--enable-ratelimit"
"--enable-recvmmsg"
"--enable-relro-now" ; protect GOT and .dtor areas
"--disable-radix-tree"
(string-append "--with-libevent="
#$(this-package-input "libevent"))
(string-append "--with-ssl="
#$(this-package-input "openssl"))
"--with-configdir=/etc"
"--with-nsd_conf_file=/etc/nsd/nsd.conf"
"--with-logfile=/var/log/nsd.log"
"--with-pidfile=/var/db/nsd/nsd.pid"
"--with-dbfile=/var/db/nsd/nsd.db"
"--with-zonesdir=/etc/nsd"
"--with-xfrdfile=/var/db/nsd/xfrd.state"
"--with-zonelistfile=/var/db/nsd/zone.list")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-installation-paths
(lambda _
(let ((doc (string-append #$output "/share/doc/"
#$name "-" #$version)))
;; The ‘make install’ target tries to create the parent
;; directories of run-time things like ‘pidfile’ above, and
;; useless empty directories like 'configdir'. Remove such
;; '$(INSTALL)' lines and install the example configuration file
;; in an appropriate location.
(substitute* "Makefile.in"
((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command)
(string-append "#" command))
(("\\$\\(nsdconfigfile\\)\\.sample" file-name)
(string-append doc "/examples/" file-name)))))))
#:tests? #f)) ; no tests
(inputs
(list libevent openssl))
(home-page "https://www.nlnetlabs.nl/projects/nsd/about/")
@ -635,14 +636,14 @@ BIND and djbdns---whilst using relatively little memory.")
(define-public unbound
(package
(name "unbound")
(version "1.17.0")
(version "1.17.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz"))
(sha256
(base32 "0h8k5yh49vasyzwkm3n1xsidxr7xybqwkvg4cq6937qxi7brbg6w"))))
(base32 "1x55f5aqlzynpy24ryf1rsmdy8m8iyi19n7k03k889g1rk78ah7f"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(native-inputs
@ -677,8 +678,7 @@ BIND and djbdns---whilst using relatively little memory.")
(("^PYTHON_SITE_PKG=.*$")
(string-append
"PYTHON_SITE_PKG="
pyout "/lib/python-" ver "/site-packages\n"))))
#t))
pyout "/lib/python-" ver "/site-packages\n"))))))
(add-before 'check 'fix-missing-nss-for-tests
;; Unfortunately, the package's unittests involve some checks
;; looking up protocols and services which are not provided
@ -779,8 +779,7 @@ struct servent *getservbyport(int port, const char *proto) {
;; The preload library only affects the unittests.
(substitute* "Makefile"
(("./unittest")
"LD_PRELOAD=/tmp/nss_preload.so ./unittest")))
#t)))))
"LD_PRELOAD=/tmp/nss_preload.so ./unittest"))))))))
(home-page "https://www.unbound.net")
(synopsis "Validating, recursive, and caching DNS resolver")
(description
@ -794,16 +793,16 @@ served by AS112. Stub and forward zones are supported.")
(define-public yadifa
(package
(name "yadifa")
(version "2.5.3")
(version "2.6.4")
(source
(let ((build "10333"))
(let ((build "10892"))
(origin
(method url-fetch)
(uri
(string-append "https://www.yadifa.eu/sites/default/files/releases/"
"yadifa-" version "-" build ".tar.gz"))
(sha256
(base32 "1mwy6sfnlaslx26f3kpj9alh8i8y8bf1nbnsdd5j04hjsbavd07p")))))
(base32 "0wdm0gc01bhd04p3jqxy3y8lgx5v8wlm8saiy35llna5ssi77fyq")))))
(build-system gnu-build-system)
(native-inputs
(list which))
@ -812,6 +811,12 @@ served by AS112. Stub and forward zones are supported.")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unhard-code
(lambda _
(substitute* (list "lib/dnslg/Makefile.in"
"lib/dnsdb/Makefile.in"
"lib/dnscore/Makefile.in")
(("/usr/bin/(install)" _ command) command))))
(add-before 'configure 'omit-example-configurations
(lambda _
(substitute* "Makefile.in"
@ -840,7 +845,7 @@ Extensions} (DNSSEC).")
(define-public knot
(package
(name "knot")
(version "3.2.7")
(version "3.2.9")
(source
(origin
(method git-fetch)
@ -849,7 +854,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1zrx5ih8wy0l9dka7ql9v32z6z8bxcdsfs1zmjn052xrzb01qjkw"))
(base32 "1kxmplngnlpd6j9nbzq1c1z02ipd38ypnppy7frg5crn83phfbxm"))
(modules '((guix build utils)))
(snippet
'(begin
@ -865,79 +870,77 @@ Extensions} (DNSSEC).")
(build-system gnu-build-system)
(outputs (list "out" "doc" "lib" "tools"))
(arguments
`(#:configure-flags
(list (string-append "--docdir=" (assoc-ref %outputs "doc")
"/share/" ,name "-" ,version)
(string-append "--infodir=" (assoc-ref %outputs "doc")
"/share/info")
(string-append "--libdir=" (assoc-ref %outputs "lib") "/lib")
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-static" ; static libraries are built by default
"--enable-dnstap" ; let tools read/write capture files
"--enable-fastparser" ; disabled by default when .git/ exists
"--enable-xdp=yes"
"--with-module-dnstap=yes") ; detailed query capturing & logging
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'link-missing-libbpf-dependency
;; Linking against -lbpf later would fail to find -lz: libbpf.pc has
;; zlib in its Requires.private (not Requires) field. Add it here.
(lambda _
(substitute* "configure.ac"
(("enable_xdp=yes" match)
(string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\"")))))
(add-before 'bootstrap 'update-parser
(lambda _
(with-directory-excursion "src"
(invoke "sh" "../scripts/update-parser.sh"))))
(add-before 'configure 'disable-directory-pre-creation
(lambda _
;; Don't install empty directories like ‘/etc’ outside the store.
;; This is needed even when using ‘make config_dir=... install’.
(substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))))
(add-after 'build 'build-info
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" "info"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags))))
(replace 'install
(lambda* (#:key make-flags outputs parallel-build? #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version))
(etc (string-append doc "/examples/etc")))
(apply invoke "make" "install"
(string-append "config_dir=" etc)
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))
(add-after 'install 'install-info
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" "install-info"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags))))
(add-after 'install 'break-circular-:lib->:out-reference
(lambda* (#:key outputs #:allow-other-keys)
(let ((lib (assoc-ref outputs "lib")))
(for-each (lambda (file)
(substitute* file
(("(prefix=).*" _ assign)
(string-append assign lib "\n"))))
(find-files lib "\\.pc$")))))
(add-after 'install 'split-:tools
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(tools (assoc-ref outputs "tools")))
(mkdir-p (string-append tools "/share/man"))
(rename-file (string-append out "/bin")
(string-append tools "/bin"))
(rename-file (string-append out "/share/man/man1")
(string-append tools "/share/man/man1"))))))))
(list
#:configure-flags
#~(list (string-append "--docdir=" #$output:doc
"/share/" #$name "-" #$version)
(string-append "--infodir=" #$output:doc "/share/info")
(string-append "--libdir=" #$output:lib "/lib")
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-static" ; static libraries are built by default
"--enable-dnstap" ; let tools read/write capture files
"--enable-fastparser" ; disabled by default when .git/ exists
"--enable-xdp=yes"
"--with-module-dnstap=yes") ; detailed query capturing & logging
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'link-missing-libbpf-dependency
;; Linking against -lbpf later would fail to find -lz: libbpf.pc has
;; zlib in its Requires.private (not Requires) field. Add it here.
(lambda _
(substitute* "configure.ac"
(("enable_xdp=yes" match)
(string-append match "\nlibbpf_LIBS=\"$libbpf_LIBS -lz\"")))))
(add-before 'bootstrap 'update-parser
(lambda _
(with-directory-excursion "src"
(invoke "sh" "../scripts/update-parser.sh"))))
(add-before 'configure 'disable-directory-pre-creation
(lambda _
;; Don't install empty directories like ‘/etc’ outside the store.
;; This is needed even when using ‘make config_dir=... install’.
(substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))))
(add-after 'build 'build-info
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" "info"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags))))
(replace 'install
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(let* ((doc (string-append #$output "/share/doc/"
#$name "-" #$version))
(etc (string-append doc "/examples/etc")))
(apply invoke "make" "install"
(string-append "config_dir=" etc)
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))
(add-after 'install 'install-info
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" "install-info"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags))))
(add-after 'install 'break-circular-:lib->:out-reference
(lambda _
(for-each (lambda (file)
(substitute* file
(("(prefix=).*" _ assign)
(string-append assign #$output:lib "\n"))))
(find-files #$output:lib "\\.pc$"))))
(add-after 'install 'split:tools
(lambda _
(define (move source target file)
(mkdir-p (dirname (string-append target "/" file)))
(rename-file (string-append source "/" file)
(string-append target "/" file)))
(move #$output #$output:tools "bin")
(move #$output #$output:tools "share/man/man1"))))))
(native-inputs
(list autoconf
automake

34
gnu/packages/docbook.scm
View File

@ -534,38 +534,30 @@ the in DocBook SGML DTDs.")
(build-system python-build-system)
;; TODO: Add xfig/transfig for fig2dev utility
(inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-latex-anysize
texlive-latex-appendix
texlive-latex-bookmark
texlive-latex-changebar
texlive-latex-colortbl
texlive-latex-fancybox
texlive-fancyhdr
`(("texlive" ,(texlive-updmap.cfg (list texlive-anysize
texlive-appendix
texlive-changebar
texlive-fancybox
texlive-fancyvrb
texlive-latex-float
texlive-latex-footmisc
texlive-hyperref
texlive-latex-jknapltx
texlive-float
texlive-footmisc
texlive-jknapltx
texlive-listings
texlive-latex-multirow
texlive-latex-overpic
texlive-multirow
texlive-overpic
texlive-pdfpages
texlive-refcount
texlive-rsfs
texlive-stmaryrd
texlive-subfigure
texlive-titlesec
texlive-wasysym
texlive-fonts-rsfs
texlive-stmaryrd
texlive-iftex)))
texlive-wasysym)))
("imagemagick" ,imagemagick) ;for convert
("inkscape" ,inkscape/stable) ;for svg conversion
("docbook" ,docbook-xml)
("libxslt" ,libxslt))) ;for xsltproc
(arguments
`(;; Using setuptools causes an invalid "package_base" path in
`( ;; Using setuptools causes an invalid "package_base" path in
;; out/bin/.dblatex-real due to a missing leading '/'. This is caused
;; by dblatex's setup.py stripping the root path when creating the
;; script. (dblatex's setup.py still uses distutils and thus has to

12
gnu/packages/documentation.scm
View File

@ -12,6 +12,7 @@
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer@gmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -40,6 +41,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix deprecation)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
@ -224,7 +226,15 @@ markup) can be customized and extended by the user.")
(let ((/bin/sh (search-input-file inputs "/bin/sh")))
(substitute* "src/portable.cpp"
(("/bin/sh")
/bin/sh))))))))
/bin/sh)))))
#$@(if (target-hurd?)
#~((add-after 'unpack 'apply-patch
(lambda _
(let ((patch-file
#$(local-file
(search-patch "doxygen-hurd.patch"))))
(invoke "patch" "--force" "-p1" "-i" patch-file)))))
#~()))))
(synopsis "Generate documentation from annotated sources")
(description "Doxygen is the de facto standard tool for generating
documentation from annotated C++ sources, but it also supports other popular

4
gnu/packages/ebook.scm
View File

@ -621,7 +621,7 @@ Some of the current features:
(define-public xchm
(package
(name "xchm")
(version "1.33")
(version "1.35")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/rzvncj/xCHM"
@ -629,7 +629,7 @@ Some of the current features:
version "/xchm-" version ".tar.gz"))
(sha256
(base32
"0an09shap2wj9gzj5fsw5sc2i6paq3kc3mc52fnwg2bb2dan5qxk"))))
"19w9cmdncqgy20bk8njbvcz5xld15pq5slf7m477vhnvws8a373i"))))
(build-system gnu-build-system)
(inputs
(list wxwidgets chmlib))

23
gnu/packages/elf.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -112,6 +113,28 @@
(("run-reverse-sections-self.sh") "")
(("run-strip-strmerge.sh") "")
(("run-elflint-self.sh") "")))))
'())
,@(if (system-hurd?)
`((add-after 'unpack 'skip-tests
(lambda _
(substitute* '("tests/elfstrtab.c"
"tests/emptyfile.c")
(("elf_version \\(EV_CURRENT\\);" all)
"exit (77);"))
(substitute* '("tests/run-all-dwarf-ranges.sh"
"tests/run-allfcts-multi.sh"
"tests/run-attr-integrate-skel.sh"
"tests/run-bug1-test.sh"
"tests/run-copyadd-sections.sh"
"tests/run-deleted.sh"
"tests/run-get-units-split.sh"
"tests/run-native-test.sh"
"tests/run-readelf-loc.sh"
"tests/run-readelf-ranges.sh"
"tests/run-unit-info.sh"
"tests/run-varlocs.sh")
(("^#!.*" all)
(string-append all "exit 77;\n"))))))
'()))))
(native-inputs (list m4))

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

@ -153,6 +153,7 @@
#:use-module (guix packages)
#:use-module (guix cvs-download)
#:use-module (guix download)
#:use-module (guix deprecation)
#:use-module (guix bzr-download)
#:use-module (guix gexp)
#:use-module (guix i18n)
@ -1261,7 +1262,33 @@ face properties and allows configuration of faces and colors.")
some utility functions, and commands using that infrastructure.")
(license license:gpl3+)))
(define-public git-modes
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
(define-public emacs-project-mode-line-tag
(let ((commit "a8809cc1a50cfdedaf7bed2810249ae262884716")
(revision "0"))
(package
(name "emacs-project-mode-line-tag")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/fritzgrabo/project-mode-line-tag")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0bmx9a1g199axj9ypqisvfyf1517czw23zg96x1wdzqrpw3cb7cx"))))
(build-system emacs-build-system)
(home-page "https://github.com/fritzgrabo/project-mode-line-tag")
(synopsis "Display a buffer's project in its mode line")
(description
"Display information about a buffer's project (a \"project tag\") in
its mode line.")
(license license:gpl3+))))
(define-public emacs-git-modes
(package
(name "emacs-git-modes")
(version "1.4.1")
@ -1285,6 +1312,8 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and
@file{.git/config}.")
(license license:gpl3+)))
(define-deprecated/public-alias git-modes emacs-git-modes)
(define-public emacs-with-editor
(package
(name "emacs-with-editor")
@ -3465,6 +3494,30 @@ read-only based on user configuration. User configuration may be prefix
directories or regex patterns.")
(license license:gpl3+))))
;; Use latest commit since there are no tags anymore for several versions
(define-public emacs-rebecca-theme
(let ((commit "4b8b5aae9099185e07c2b4cac4943c7f66a3f003")
(revision "0"))
(package
(name "emacs-rebecca-theme")
(version (git-version "1.3.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/vic/rebecca-theme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0y2kcs6zgi3dijagyz6lxbv6gi2mih8m943fhjrzkj35wfvjmhsz"))))
(build-system emacs-build-system)
(home-page "https://github.com/vic/rebecca-theme")
(synopsis "Dark Emacs theme with purple/violet colors")
(description
"Rebecca Emacs theme is a dark theme with purple/violet colors, based on
the @code{Dracula} theme for Emacs and the @code{Gloom} theme for Atom.")
(license license:expat))))
(define-public emacs-bbdb
(package
(name "emacs-bbdb")
@ -3729,6 +3782,30 @@ always indented. It reindents after every change, making it more reliable
than @code{electric-indent-mode}.")
(license license:gpl2+)))
(define-public emacs-gc-stats
(package
(name "emacs-gc-stats")
(version "1.4")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"emacs-gc-stats-" version ".tar"))
(sha256
(base32
"19195s2nw87nmdz861j6shw5m2lv0spbcb1wff0y338fgx9sicgz"))))
(build-system emacs-build-system)
(home-page "https://git.sr.ht/~yantar92/emacs-gc-stats")
(synopsis "Collect Emacs GC statistics")
(description
"This package collects Emacs @dfn{garbage collection} (GC) statistics over
time and saves it in the format that can be shared with Emacs maintainers.
This package does not upload anything automatically. You will need to upload
the data manually, by sending email attachment. If necessary, you can review
@code{emacs-gc-stats-file} (defaults to @code{~/.emacs.d/emacs-gc-stats.eld})
before uploading-it is just a text file.")
(license license:gpl3+)))
(define-public emacs-gcmh
;; No tagged release upstream, but the commit below correspond to the 0.2.1
;; release.
@ -3952,41 +4029,36 @@ as a library for other Emacs packages.")
;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus).
(arguments
`(#:emacs ,emacs
#:include '("\\.el$" "^images/" "^latex/" "\\.info$")
#:exclude '("^tests/" "^latex/README")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "preview.el"
("preview-gs-command"
(search-input-file inputs "/bin/gs")))
(substitute* "preview.el"
(("\"dvipng ")
(let ((dvipng (search-input-file inputs "/bin/dvipng")))
(string-append "\"" dvipng " ")))
(("\"dvips ")
(let ((dvips (search-input-file inputs "/bin/dvips")))
(string-append "\"" dvips " ")))
(("\"pdf2dsc ")
(let ((pdf2dsc (search-input-file inputs "/bin/pdf2dsc")))
(string-append "\"" pdf2dsc " "))))))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(etc-dir (string-append out "/share/" ,name "/"
,version "/etc")))
(with-directory-excursion "doc"
(setenv "HOME" (getenv "TMPDIR")) ; for mktextfm
(invoke "pdftex" "tex-ref")
(install-file "tex-ref.pdf"
(string-append etc-dir "/refcards")))))))))
(list
#:emacs emacs
#:include #~(cons* "^images/" "^latex/" %default-include)
#:exclude #~(cons "^latex/README" %default-exclude)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "preview.el"
("preview-gs-command"
(search-input-file inputs "/bin/gs")))
;; Leave "dvipng" and "dvips" executables as-is. Otherwise, this
;; would require to add a TeX Live system to inputs, which is
;; much for an Emacs package.
(substitute* "preview.el"
(("\"pdf2dsc ")
(let ((pdf2dsc (search-input-file inputs "/bin/pdf2dsc")))
(string-append "\"" pdf2dsc " "))))))
(add-after 'install 'install-doc
(lambda _
(let ((doc-dir (string-append #$output "/share/doc/"
#$name "-" #$version)))
(with-directory-excursion "doc"
(setenv "HOME" (getenv "TMPDIR")) ; for mktextfm
(invoke "pdftex" "tex-ref")
(install-file "tex-ref.pdf" doc-dir))))))))
(native-inputs
(list perl))
(list perl (texlive-updmap.cfg)))
(inputs
(list ghostscript
(texlive-updmap.cfg (list texlive-amsfonts))))
(list ghostscript))
(home-page "https://www.gnu.org/software/auctex/")
(synopsis "Integrated environment for TeX")
(description
@ -4152,6 +4224,31 @@ Some of its major features include:
Lock key.")
(license license:gpl3+)))
(define-public emacs-chocolate-theme
(let ((commit "ccc05f7ad96d3d1332727689bf6250443adc7ec0")
(revision "0"))
(package
(name "emacs-chocolate-theme")
(version (git-version "0.2.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/SavchenkoValeriy/emacs-chocolate-theme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1d8a9jwv9y0sncw24k840c8yyrig30f2d6q2zqlc09f05yzq9p9p"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-autothemer))
(home-page "https://github.com/SavchenkoValeriy/emacs-chocolate-theme")
(synopsis "Dark chocolatey theme for Emacs")
(description
"Chocolate theme is a dark, chocolatey, vibrant and subtle theme for
Emacs.")
(license license:gpl3))))
(define-public emacs-chronometrist
(package
(name "emacs-chronometrist")
@ -6560,6 +6657,31 @@ detecting specific uses of Ruby, e.g. when using rails, and using a
appropriate console.")
(license license:gpl3+)))
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
(define-public emacs-zeno-theme
(let ((commit "70fa7b7442f24ea25eab538b5a22da690745fef5")
(revision "0"))
(package
(name "emacs-zeno-theme")
(version (git-version "1.0.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zenobht/zeno-theme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"10v6yf9c5qdsxrp6rk1n1xkv4byyfkinsikskdb2apjg05cx2273"))))
(build-system emacs-build-system)
(home-page "https://github.com/zenobht/zeno-theme")
(synopsis "Dark theme using different shades of blue for Emacs")
(description
"This package provides a dark theme using different shades of blue for
Emacs, inspired by @code{Dracula} theme.")
(license license:gpl3+))))
(define-public emacs-zig-mode
(let ((commit "dbc648f5bca8f3b9ca2cc7827f326f5530115144")
(revision "0"))
@ -7477,6 +7599,28 @@ Also included are keybindings for spec files and Dired buffers, as well as
snippets for yasnippet.")
(license license:gpl3+))))
(define-public emacs-mode-line-bell
(package
(name "emacs-mode-line-bell")
(version "0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/purcell/mode-line-bell")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y"))))
(build-system emacs-build-system)
(home-page "https://github.com/purcell/mode-line-bell")
(synopsis "Flash the mode-line instead of ringing the bell")
(description
"This Emacs package provides a global minor mode @code{mode-line-bell-mode}
which sets @code{ring-bell-function} to a function that will briefly flash the
mode-line when the bell is rung.")
(license license:gpl3+)))
(define-public emacs-mode-line-idle
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
@ -10962,16 +11106,16 @@ answers.")
(define-public emacs-base16-theme
(package
(name "emacs-base16-theme")
(version "3.0")
(version "3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/belak/base16-emacs")
(url "https://github.com/tinted-theming/base16-emacs")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba"))))
(base32 "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0"))))
(build-system emacs-build-system)
(arguments
(list #:include #~(cons "^build\\/.*\\.el$" %default-include)
@ -10991,7 +11135,7 @@ answers.")
'pre 'post)))
(find-files theme-dir "\\.el$"))
(delete-file-recursively theme-dir)))))))
(home-page "https://github.com/belak/base16-emacs")
(home-page "https://github.com/tinted-theming/base16-emacs")
(synopsis "Base16 color themes for Emacs")
(description
"Base16 provides carefully chosen syntax highlighting and a default set
@ -11310,6 +11454,31 @@ provides a front-end interface for the workspace/symbols LSP procedure
call.")
(license license:gpl3+)))
(define-public emacs-consult-flycheck
;; This particular commit introduces bug fixes above latest release.
(let ((commit "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062")
(revision "0"))
(package
(name "emacs-consult-flycheck")
(version (git-version "0.9" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/consult-flycheck")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0cvxl6ynbns3wlpzilhg4ldakb91ikpibbr9wpb2wkzbgi5c766c"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-consult emacs-flycheck))
(home-page "https://github.com/minad/consult-flycheck")
(synopsis "Consult integration for Flycheck")
(description
"This package provides the @code{consult-flycheck} command for Emacs,
which integrates @code{Consult} with @code{Flycheck}.")
(license license:gpl3+))))
(define-public emacs-eglot-tempel
(let ((commit "e08b203d6a7c495d4b91ed4537506b5f1ea8a84f")
(revision "0"))
@ -12039,6 +12208,28 @@ The following completions are currently available:
@end itemize")
(license license:gpl3+)))
(define-public emacs-sweet-theme
(let ((commit "78f741806ecebe01224bf54d09ad80e306652508")
(revision "0"))
(package
(name "emacs-sweet-theme")
(version (git-version "4" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/2bruh4me/sweet-theme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1yqz15l6xa1vkll4gaa3jpr30vq3yjgbgadjilsmz5p8mblawhyx"))))
(build-system emacs-build-system)
(home-page "https://github.com/2bruh4me/sweet-theme")
(synopsis "Emacs theme inspired by the GTK theme Sweet")
(description "Sweet is an Emacs theme inspired by the GTK theme with
the same name.")
(license license:gpl3+))))
(define-public emacs-swiper
(package
(name "emacs-swiper")
@ -13393,6 +13584,45 @@ and tooling.")
and RSS, with a user interface inspired by notmuch.")
(license license:gpl3+)))
(define-public emacs-elfeed-goodies
(let ((commit "544ef42ead011d960a0ad1c1d34df5d222461a6b"))
(package
(name "emacs-elfeed-goodies")
(version commit)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jeetelongname/elfeed-goodies")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "147pwqx2maf430qhigzfd6lqk7a5sbrydf9a4c5bvsw8jv7wzb6l"))))
(build-system emacs-build-system)
(propagated-inputs
(list
emacs-elfeed
emacs-popwin
emacs-powerline
emacs-link-hint))
(home-page "https://github.com/jeetelongname/elfeed-goodies")
(synopsis
"Various bits and pieces to enhance the Elfeed user experience.")
(description
"This package enhances the vanilla Elfeed user experience with:
@itemize @bullet
@item
An adaptive, powerline-based header for the @code{*elfeed-search*} and
@code{*elfeed-entry*} buffers, with a matching entry format.
@item
Split pane setup.
@item
A function to toggle the @code{*elfeed-log*} buffer in a popup window.
@end itemize")
(license license:gpl3+))))
(define-public emacs-elfeed-org
(let ((commit "77b6bbf222487809813de260447d31c4c59902c9"))
(package
@ -13630,6 +13860,34 @@ automatically when Git, Subversion or Mercurial are used. It also provides
functions to assist in reviewing changes on files.")
(license license:gpl3+)))
(define-public emacs-popwin
(package
(name "emacs-popwin")
(version "1.0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacsorphanage/popwin")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1"))))
(build-system emacs-build-system)
(arguments
(list
#:tests? #f ; requires an attached terminal
))
(native-inputs
(list emacs-ert-runner))
(home-page "https://github.com/emacsorphanage/popwin")
(synopsis "Popup window manager for Emacs")
(description
"This package provides utilities for treating certain windows as @dfn{pop
up windows}, which close automatically when quitting a command or selecting
another window.")
(license license:gpl3+)))
(define-public emacs-pyvenv
(package
(name "emacs-pyvenv")
@ -14970,7 +15228,7 @@ Lua programming language}.")
(define-public emacs-ebuild-mode
(package
(name "emacs-ebuild-mode")
(version "1.64")
(version "1.65")
(source
(origin
(method url-fetch)
@ -14979,7 +15237,7 @@ Lua programming language}.")
"ebuild-mode-" version ".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32 "180wjbi385fhafijmmimcf23fdympdk2km0yj9rv6pmfbfjgq2bv"))))
(base32 "07zla002lxkck4cgpfr5c5lmarxb12yfnldgflv9vf88yfa997xw"))))
(build-system emacs-build-system)
(arguments
(list
@ -16267,7 +16525,7 @@ you to deal with multiple log levels.")
(define-public emacs-denote
(package
(name "emacs-denote")
(version "1.2.0")
(version "2.0.0")
(source
(origin
(method git-fetch)
@ -16276,7 +16534,7 @@ you to deal with multiple log levels.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0cglzccbqpcppb9s3phhszskkxp2wd0582jv85qhawxabfzyzkj3"))))
(base32 "0nwqghh73lbw6v6yhkalcwwqjs1fyhxqi53d9y2dcfhfq58g1rb9"))))
(build-system emacs-build-system)
(native-inputs (list texinfo))
(home-page "https://protesilaos.com/emacs/denote/")
@ -17117,27 +17375,32 @@ is the primary mode of interaction.")
(license (list license:gpl3+
license:fdl1.3+)))) ; GFDLv1.3+ for the manual
;; Package has no releases or tags. Version is extracted from "Version:"
;; keyword in main file.
(define-public emacs-idle-highlight
(package
(name "emacs-idle-highlight")
(version "1.1.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nonsequitur/idle-highlight-mode")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/IdleHighlight")
(synopsis "Highlights all occurrences of the word the point is on")
(description
"This Emacs package provides @code{idle-highlight-mode} that sets
(let ((commit "f9091c907d41e7b12d99d108a194229b8dbfc5ae")
(revision "0"))
(package
(name "emacs-idle-highlight")
(version (git-version "1.1.4" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://codeberg.org/ideasman42/emacs-idle-highlight-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0757x4iy7q0mj1rshlxr00hbc78g5hzijgzyqs36nrw6bn65fb93"))))
(build-system emacs-build-system)
(home-page "https://codeberg.org/ideasman42/emacs-idle-highlight-mode")
(synopsis "Highlights all occurrences of the word the point is on")
(description
"This Emacs package provides @code{idle-highlight-mode} that sets
an idle timer to highlight all occurrences in the buffer of the word under
the point.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-ox-twbs
(package
@ -17460,6 +17723,31 @@ DefaultEncrypt, please refer to the home page or read the comments in the
source file, @file{jl-encrypt.el}.")
(license license:gpl3+)))
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
(define-public emacs-exotica-theme
(let ((commit "ff3ef4f6fa38c93b99becad977c7810c990a4d2f")
(revision "0"))
(package
(name "emacs-exotica-theme")
(version (git-version "1.0.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zenobht/exotica-theme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd"))))
(build-system emacs-build-system)
(home-page "https://github.com/zenobht/exotica-theme")
(synopsis "Dark theme for Emacs with vibrant colors")
(description
"A dark opinionated theme with vibrant colors for Emacs. Inspired by
@code{Molokai} and @code{Dracula} themes.")
(license license:gpl3+))))
(define-public emacs-extend-smime
(package
(name "emacs-extend-smime")
@ -17835,7 +18123,7 @@ Pippel also uses Tabulated List mode, it provides a similar package menu like
(define-public emacs-pos-tip
(package
(name "emacs-pos-tip")
(version "0.4.6")
(version "0.4.7")
(source
(origin
(method git-fetch)
@ -17844,7 +18132,7 @@ Pippel also uses Tabulated List mode, it provides a similar package menu like
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33"))))
(base32 "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy"))))
(build-system emacs-build-system)
;; The following functions and variables needed by emacs-pos-tip are
;; not included in emacs-minimal:
@ -19243,6 +19531,34 @@ available key bindings that follow C-x (or as many as space allows given your
settings).")
(license license:gpl3+)))
;; Tagged release upstream is from before the package was orphaned.
;; The base version is extracted from the "Version" keyword in the main file
;; with "-git" suffix removed.
(define-public emacs-which-key-posframe
(let ((commit "e4a9ce9a1b20de550fca51f14d055821980d534a")
(revision "0"))
(package
(name "emacs-which-key-posframe")
(version (git-version "0.2.0.50" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/emacsorphanage/which-key-posframe")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0kgc29pb5k6cb2m13cz1yhys1k8l4dpx6wjjgldpdlg9qw2i1b53"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-posframe emacs-which-key))
(home-page "https://github.com/emacsorphanage/which-key-posframe")
(synopsis "Display which-key popup in a posframe (a child frame)")
(description
"This package is a @code{which-key} extension, which uses posframe
(a child frame) to show @code{which-key} popups.")
(license license:gpl3+))))
(define-public emacs-display-wttr
(package
(name "emacs-display-wttr")
@ -19444,7 +19760,7 @@ multiplexer.")
(define-public emacs-plz
(package
(name "emacs-plz")
(version "0.6")
(version "0.7")
(source
(origin
(method git-fetch)
@ -19453,7 +19769,7 @@ multiplexer.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "12hnsafv1bxkk1pb471i8hw0zy0yfla8afpcahlg4k4dni4dnqsm"))))
(base32 "18lq7v2gglfnax5r1svh9p0fcd5hs745js57nl8bk58ba047a9q8"))))
(build-system emacs-build-system)
(inputs (list curl))
(arguments
@ -23186,10 +23502,10 @@ within Emacs.")
(define-public emacs-svg-lib
;; XXX: Upstream does not tag releases. The commit hash below corresponds
;; to the version bump.
(let ((commit "0486c9453449771bc3f5872f70bc5cb23580d0f4"))
(let ((commit "5ba4e4ea2b5c66e8811beb53251dee13685b2cb2"))
(package
(name "emacs-svg-lib")
(version "0.2.5")
(version "0.2.6")
(source
(origin
(method git-fetch)
@ -23198,7 +23514,7 @@ within Emacs.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "059vd4k7bvskkriwaiz4n2yafc3inndrr018hqfpic4k02cbwzpv"))))
(base32 "1zpcw8arizwjiz7diky7f0nh65zkp0pmnpyqzb0h1qgqnlf734k4"))))
(build-system emacs-build-system)
(home-page "https://github.com/rougier/svg-lib")
(synopsis "Emacs SVG library for creating tags, icons and bars")
@ -26203,6 +26519,33 @@ displayed in chronological order) or as an Org document where the node tree
maps the thread tree.")
(license license:gpl3+))))
;; Package has no releases or tags. Version is extracted from "Version:"
;; keyword in main file.
(define-public emacs-mu4e-dashboard
(let ((commit "16ffbb2a36817647e345f60acdfaac66dda28c0f")
(revision "0"))
(package
(name "emacs-mu4e-dashboard")
(version (git-version "0.1.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rougier/mu4e-dashboard")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1fp2f9rvh20r3advbzcgm5vv2dzcyvy1618hfykbm6ac4wjscdll"))))
(build-system emacs-build-system)
(propagated-inputs (list mu))
(home-page "https://github.com/rougier/mu4e-dashboard")
(synopsis "Build your own dashboard for mu4e using org-mode")
(description
"This package provides an @code{org-mode} link type that allows
execution of various @code{mu4e} queries when clicked. Such links can be
organized into a dashboard, by simply writing an org file.")
(license license:gpl3+))))
(define-public emacs-pinentry
(let ((commit "dcc9ba03252ee5d39e03bba31b420e0708c3ba0c")
(revision "1"))
@ -26871,6 +27214,26 @@ text-tree applications inside GNU Emacs. It consists of 2 subprojects:
@command{ztree-diff}).")
(license license:gpl3))))
(define-public emacs-heaven-and-hell
(package
(name "emacs-heaven-and-hell")
(version "0.0.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/valignatev/heaven-and-hell")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1bgs638nsn9hyvc9wbc2jpqm5i3hblld1mhmf0h9z0j6fjr0aapx"))))
(build-system emacs-build-system)
(home-page "https://github.com/valignatev/heaven-and-hell")
(synopsis "Easily toggle light/dark themes in Emacs")
(description "This package makes the process of switching between
light and dark themes as easy as hitting a single keystroke.")
(license license:expat)))
(define-public emacs-helm-org-contacts
(let ((commit "741eca6239684950219c9a12802386a132491b8c")
(revision "2"))
@ -26923,6 +27286,30 @@ recursive size is not obtained. Once this mode is enabled, every new Dired
buffer displays recursive dir sizes.")
(license license:gpl3+)))
(define-public emacs-dired-preview
(package
(name "emacs-dired-preview")
(version "0.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~protesilaos/dired-preview")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0d485812k1rv0qrw4xvzv4z3qf370apsajnf4q3pjk3q0r1fpm8b"))))
(build-system emacs-build-system)
(home-page "https://protesilaos.com/emacs/dired-preview")
(synopsis "Automatically preview file at point in Dired")
(description
"This is a simple package to automatically preview in a side window the
file at point in Dired buffers. Preview windows are closed when they are no
longer relevant, while preview buffers are killed if they have not been used
for other purposes beside previewing. The package provides several
customisation options to control its behaviour.")
(license license:gpl3+)))
(define-public emacs-dired-rsync
(package
(name "emacs-dired-rsync")
@ -34208,7 +34595,7 @@ launching other commands/applications from within Emacs, similar to the
(define-public emacs-no-littering
(package
(name "emacs-no-littering")
(version "1.4.0")
(version "1.5.0")
(source
(origin
(method git-fetch)
@ -34217,7 +34604,7 @@ launching other commands/applications from within Emacs, similar to the
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1i5fcci8fg14hbd4cjb84q3mx6rfwhbwkw0g21v25dal61kw4yvb"))))
(base32 "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-compat))
@ -34388,6 +34775,27 @@ one file per value. This makes it easy to delete or remove unused
variables.")
(license license:gpl3+)))
(define-public emacs-persistent-scratch
(package
(name "emacs-persistent-scratch")
(version "0.3.9")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Fanael/persistent-scratch")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"187cyl005csmmmh292km1v3ffl8x49h5qyn87i4adz9l5sqnpdgj"))))
(build-system emacs-build-system)
(home-page "https://github.com/Fanael/persistent-scratch")
(synopsis "Preserve the scratch buffer across Emacs sessions")
(description
"Preserve the state of scratch buffers across Emacs sessions by saving the
state to and restoring it from a file, with auto-saving and backups.")
(license license:bsd-2)))
(define-public emacs-company-emoji
(package
(name "emacs-company-emoji")
@ -35740,6 +36148,29 @@ uncluttered design pattern to achieve optimal focus and readability for code
syntax highlighting and UI components.")
(license license:expat)))
(define-public emacs-weyland-yutani-theme
(let ((commit "e89a63a62e071180c9cdd9067679fadc3f7bf796")
(revision "0"))
(package
(name "emacs-weyland-yutani-theme")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jstaursky/weyland-yutani-theme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0gxlz9b7fvbjkqxsyb4l75g7jsxyms0i1vpnb6y499hl115akcaz"))))
(build-system emacs-build-system)
(home-page "https://github.com/jstaursky/weyland-yutani-theme")
(synopsis "Emacs theme based on the Alien movie franchise")
(description
"Weyland Yutani is a dark Emacs theme based on the Alien movie
franchise.")
(license license:gpl3+))))
(define-public emacs-janet-mode
(let ((commit "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7"))
(package
@ -36677,7 +37108,7 @@ Fennel code within Emacs.")
(define-public emacs-org-modern
(package
(name "emacs-org-modern")
(version "0.9")
(version "0.10")
(source
(origin
(method git-fetch)
@ -36685,7 +37116,7 @@ Fennel code within Emacs.")
(url "https://github.com/minad/org-modern")
(commit version)))
(sha256
(base32 "16c74vff882rx8yp4ybaydlg5774xz68iasajhidbn0fb4fhz8ph"))
(base32 "0fpc6pf1chjs9bb4m9hzacny3cdxvnpvwsf0vrbbz3vy9sf1a30c"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-compat))
@ -37422,6 +37853,32 @@ a Vertico extension which provides a way to pop up a frame at point to show
a vertical completion UI.")
(license license:gpl3+)))
;; No tagged release upstream
(define-public emacs-transient-posframe
(let ((commit "dcd898d1d35183a7d4f2c8f0ebcb43b4f8e70ebe")
(revision "0"))
(package
(name "emacs-transient-posframe")
(version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yanghaoxie/transient-posframe")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1aq1vbkww55xplyaa3xagz9z4kdlsxk13x054asnk0dqps4bcgbf"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-posframe emacs-transient))
(home-page "https://github.com/yanghaoxie/transient-posframe")
(synopsis "Pop up a posframe (a child frame) to show Transients")
(description
"This package is a @code{transient} extension, which uses @code{posframe}
(a child frame) to show @code{transient} popups in Emacs. It was developed with
@code{transient} popups of @code{magit} in mind.")
(license license:gpl3+))))
(define-public emacs-tintin-mode
(let ((commit "82e71e1db92ee3d94c7d0208bafc5de337193de8")
(revision "1"))

4
gnu/packages/emacs.scm
View File

@ -12,7 +12,7 @@
;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; 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>
@ -339,7 +339,7 @@ editor (console only)")
(make-ld-wrapper "ld-wrapper" #:binutils binutils)
;; For native compilation
binutils
glibc
(libc-for-target)
libgccjit
;; Avoid Emacs's limited movemail substitute that retrieves POP3

4
gnu/packages/emulators.scm
View File

@ -116,14 +116,14 @@
(define-public vice
(package
(name "vice")
(version "3.6")
(version "3.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/vice-emu/releases/"
"vice-" version ".tar.gz"))
(sha256
(base32 "1zfkl9j40v2417l1fmczdvl9yzh81jlpcy5cl2svjzb2rrffbgv5"))))
(base32 "165b1ixrarcqy1rl06yhaf46ni3j8lrbn8f3zf5nkc2d0bk12f3y"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-html-docs"

64
gnu/packages/engineering.scm
View File

@ -152,6 +152,7 @@
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages text-editors)
#:use-module (gnu packages time)
#:use-module (gnu packages tree-sitter)
#:use-module (gnu packages tls)
#:use-module (gnu packages tex)
@ -439,14 +440,14 @@ features.")))
(define-public librnd
(package
(name "librnd")
(version "4.0.0")
(version "4.0.2")
(source (origin
(method url-fetch)
(uri (string-append "http://www.repo.hu/projects/librnd/releases/"
"librnd-" version ".tar.bz2"))
(sha256
(base32
"1fqh7gf9imhghlfajrsgzjx61mynfmdasciwpcajk7pn85d4ymql"))))
"0z578x3sd8yjfbhivy1hz4hlgiy43qq6x7mnby872plpm08vgqxz"))))
(build-system gnu-build-system)
(arguments
(list
@ -454,7 +455,7 @@ features.")))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'cc-is-gcc
(lambda _ (setenv "CC" "gcc")))
(lambda _ (setenv "CC" #$(cc-for-target))))
(replace 'configure
;; The configure script doesn't tolerate most of our configure flags.
(lambda _
@ -527,21 +528,21 @@ optimizer; and it can produce photorealistic and design review images.")
(define-public pcb-rnd
(package (inherit pcb)
(name "pcb-rnd")
(version "3.1.0")
(version "3.1.1")
(source (origin
(method url-fetch)
(uri (string-append "http://repo.hu/projects/pcb-rnd/releases/"
"pcb-rnd-" version ".tar.gz"))
(sha256
(base32
"0yw4sf4qrmmai48f3f5byn2fphc453myjszh3sy9z0dnfcz3x7fw"))))
"0szcsp2049wh3wslv7743wbjqllrmphi07yz0933sz4vf6f1c8dg"))))
(arguments
(list
#:tests? #false ;no check target
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'cc-is-gcc
(lambda _ (setenv "CC" "gcc")))
(lambda _ (setenv "CC" #$(cc-for-target))))
(replace 'configure
;; The configure script doesn't tolerate most of our configure flags.
(lambda _
@ -575,10 +576,11 @@ featuring various improvements and bug fixes.")))
"fastcap-mulGlobal.patch"))))
(build-system gnu-build-system)
(native-inputs
;; FIXME: with texlive-tiny citation references are rendered as question
;; marks. During the build warnings like these are printed:
;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3.
`(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts)))
;; FIXME: with (texlive-updmap.cfg) citation references are rendered as
;; question marks. During the build warnings like these are printed:
;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line
;; 3.
`(("texlive" ,(texlive-updmap.cfg))
("ghostscript" ,ghostscript)))
(arguments
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
@ -1289,7 +1291,7 @@ with the kernel and various utilities such as per-cpu counters.")
(define-public linsmith
(package
(name "linsmith")
(version "0.99.31")
(version "0.99.33")
(source (origin
(method url-fetch)
(uri (string-append
@ -1297,14 +1299,14 @@ with the kernel and various utilities such as per-cpu counters.")
version "/linsmith-" version ".tar.gz"))
(sha256
(base32
"13qj7n9826qc9shkkgd1p6vcpj78v4h9d67wbg45prg7rbnzkzds"))))
"1629p29casy9pgy8hzva1bmgrvh923qk01ls3anik6zqn6swkjfn"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("CFLAGS=-fcommon")))
(native-inputs
`(("pkg-config" ,pkg-config)
("gtk" ,gtk+-2)
("libgnome" ,libgnomeui)))
(list pkg-config))
(inputs
(list gtk+-2 libgnomeui))
(home-page "https://jcoppens.com/soft/linsmith/index.en.php")
(synopsis "Smith Charting program")
(description "LinSmith is a Smith Charting program, mainly designed for
@ -2541,7 +2543,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.")
(define-public python-scikit-rf
(package
(name "python-scikit-rf")
(version "0.27.1")
(version "0.28.0")
(source (origin
(method git-fetch) ;PyPI misses some files required for tests
(uri (git-reference
@ -2549,7 +2551,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.")
(commit (string-append "v" version))))
(sha256
(base32
"1rh2hq050439azlglqb54cy3jc1ir5y1ps55as4d5j619a7mq9x0"))
"11pxl8q356f6q4cvadasg52js3k446l87hwmc87b1n9cy8sxcfvi"))
(file-name (git-file-name name version))))
(build-system pyproject-build-system)
(propagated-inputs (list python-matplotlib
@ -4228,3 +4230,31 @@ more.")
;; GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later,
;; LGPL-2.1-only, LGPL-2.1-or-later, LGPL-3.0-only, MIT, NCSA.
(license license:gpl3+)))
(define-public python-asyncua
(package
(name "python-asyncua")
(version "1.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FreeOpcUa/opcua-asyncio.git")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"0bazk3k2dyzlrh7yxs4pc76m5ysm7riia3ncg7as3xr4y9dy29bx"))))
(build-system pyproject-build-system)
(native-inputs
(list python-pytest-asyncio python-pytest-runner python-asynctest
python-pytest-mock))
(propagated-inputs
(list python-aiofiles python-aiosqlite python-cryptography
python-importlib-metadata python-dateutil python-pytz
python-sortedcontainers))
(synopsis "OPC UA / IEC 62541 client and server library")
(description "This package provides an OPC UA / IEC 62541 client and
server for Python and pypy3.")
(home-page "https://freeopcua.github.io/")
(license license:lgpl3+)))

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

@ -176,14 +176,14 @@ large and/or frequently changing (network) environment.")
(define-public bindfs
(package
(name "bindfs")
(version "1.15.1")
(version "1.17.4")
(source (origin
(method url-fetch)
(uri (string-append "https://bindfs.org/downloads/bindfs-"
version ".tar.gz"))
(sha256
(base32
"1av8dj9i1g0105fs5r9srqqsp7yahlhwc0yl8i1szyfdls23bp84"))))
"1k1xkyjk8ms11djbhlmykkzfbcids6ls5vpq7rhdnazcladszm3g"))))
(build-system gnu-build-system)
(arguments
;; XXX: The tests have no hope of passing until there is a "nogroup"
@ -198,7 +198,7 @@ large and/or frequently changing (network) environment.")
;; ("which" ,which)
(list pkg-config))
(inputs
(list fuse))
(list fuse-2))
(home-page "https://bindfs.org")
(synopsis "Bind mount a directory and alter permission bits")
(description
@ -275,7 +275,7 @@ unmaintained---to use the @code{inotify} API instead of the deprecated
(arguments
'(#:configure-flags '("--enable-library" "--enable-fuse")))
(native-inputs (list pkg-config))
(inputs (list xz fuse))
(inputs (list xz fuse-2))
(synopsis "Virtual file system that allows browsing of compressed files")
(description
"AVFS is a FUSE-based filesystem that allows browsing of compressed
@ -296,7 +296,7 @@ Example file names:
@code{emacs-dired-hacks} has @code{dired-avfs} module which enables seamless
integration with @code{avfs}.")
(home-page "http://avf.sourceforge.net/")
(home-page "https://avf.sourceforge.net")
(license license:gpl2+)))
(define-public davfs2
@ -565,7 +565,7 @@ AES-GCM implementation.")
(native-inputs
(list pkg-config))
(inputs
(list fuse glib libgphoto2))
(list fuse-2 glib libgphoto2))
(synopsis "Virtual file system for libgphoto2 using FUSE")
(description "GPhotoFS is a FUSE file system module to mount your camera as
a file system on Linux. This allow using your camera with any tool able to read
@ -574,8 +574,8 @@ from a mounted file system.")
(license license:gpl2+)))
(define-public bcachefs-tools
(let ((commit "46a6b9210c927ab46fd1227cb6f641be0b4a7505")
(revision "16"))
(let ((commit "c8bec83e307f28751c433ba1d3f648429fb5a34c")
(revision "17"))
(package
(name "bcachefs-tools")
(version (git-version "0.1" revision commit))
@ -587,7 +587,7 @@ from a mounted file system.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0jblpwz8mxrx0pa2gc5bwj60qjj2c0zmd8r06f2bhgzs75avpkj3"))))
(base32 "0b1avy5mw3r3ppfs3n9cq4zb74yl45nd5l69r6hi27z9q5bc3nv8"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
@ -596,45 +596,49 @@ from a mounted file system.")
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
(string-append "CC=" #$(cc-for-target))
(string-append "PKG_CONFIG=" #$(pkg-config-for-target))
(string-append "PYTEST_CMD="
#$(this-package-native-input "python-pytest")
"/bin/pytest")
(string-append "PYTEST_ARGS=-k '"
;; These fail (‘invalid argument’) on
;; kernels with a previous bcachefs version.
"not test_format and "
"not test_fsck and "
"not test_list and "
"not test_list_inodes and "
"not test_list_dirent"
"'"))
;; ‘This will be less of an option in the future, as more
;; code gets rewritten in Rust.’
"NO_RUST=better")
#:phases
#~(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-after 'install 'promote-mount.bcachefs.sh
;; XXX The (optional) ‘mount.bcachefs’ requires rust:cargo.
;; This shell alternative does the job well enough for now.
(replace 'check
;; The test suite is moribund upstream (‘never been useful’),
;; but let's keep running it as a sanity check until then.
(lambda* (#:key tests? make-flags #:allow-other-keys)
(when tests?
;; We must manually build the test_helper first.
(apply invoke "make" "tests" make-flags)
(invoke (string-append
#$(this-package-native-input "python-pytest")
"/bin/pytest") "-k"
;; These fail (‘invalid argument’) on kernels
;; with a previous bcachefs version.
(string-append "not test_format and "
"not test_fsck and "
"not test_list and "
"not test_list_inodes and "
"not test_list_dirent")))))
(add-after 'install 'patch-shell-wrappers
;; These are overcomplicated wrappers that invoke readlink(1)
;; to exec the appropriate bcachefs(8) subcommand. We can
;; simply patch in the latter file name directly, and do.
(lambda _
(with-directory-excursion (string-append #$output "/sbin")
(rename-file "mount.bcachefs.sh" "mount.bcachefs")
;; WRAP-SCRIPT causes bogus ‘Insufficient arguments’ errors.
(wrap-program "mount.bcachefs"
`("PATH" ":" prefix
,(list (string-append #$output "/sbin")
(string-append #$coreutils-minimal "/bin")
(string-append #$gawk "/bin")
(string-append #$util-linux "/bin"))))))))))
(let ((sbin/ (string-append #$output "/sbin/")))
(substitute* (find-files sbin/ (lambda (file stat)
(not (elf-file? file))))
(("SDIR=.*") "")
(("\\$\\{SDIR.*}/") sbin/))))))))
(native-inputs
(append
(list pkg-config
;; For tests.
python-pytest)
(if (member (%current-system) (package-supported-systems valgrind))
(list valgrind)
'())
;; For generating documentation with rst2man.
(list python
python-docutils)))
(cons* pkg-config
;; For generating documentation with rst2man.
python
python-docutils
;; For tests.
python-pytest
(if (member (%current-system) (package-supported-systems valgrind))
(list valgrind)
'())))
(inputs
(list eudev
keyutils
@ -645,11 +649,7 @@ from a mounted file system.")
`(,util-linux "lib")
lz4
zlib
`(,zstd "lib")
;; Only for mount.bcachefs.sh.
coreutils-minimal
gawk
util-linux))
`(,zstd "lib")))
(home-page "https://bcachefs.org/")
(synopsis "Tools to create and manage bcachefs file systems")
(description
@ -673,17 +673,7 @@ performance and other characteristics.")
(substitute-keyword-arguments (package-arguments bcachefs-tools)
((#:make-flags make-flags)
#~(append #$make-flags
(list "LDFLAGS=-static")))
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'skip-shared-library
(lambda _
(substitute* "Makefile"
;; Building the shared library with ‘-static’ obviously fails…
(("^((all|install):.*)\\blib\\b(.*)" _ prefix suffix)
(string-append prefix suffix "\n"))
;; …as does installing a now non-existent file.
((".*\\$\\(INSTALL\\).* lib.*") ""))))))))
(list "LDFLAGS=-static")))))
(inputs (modify-inputs (package-inputs bcachefs-tools)
(prepend `(,eudev "static")
`(,keyutils "static")
@ -766,7 +756,7 @@ Extensible File Allocation Table} file systems. Included are
(native-inputs
(list asciidoc docbook-xml libxml2 libxslt pkg-config))
(inputs
(list fuse gnutls))
(list fuse-2 gnutls))
(arguments
(list #:phases
#~(modify-phases %standard-phases
@ -931,7 +921,7 @@ files mistakenly overwritten or destroyed just a few seconds ago.")
(native-inputs
(list pkg-config))
(inputs
(list fuse attr))
(list fuse-2 attr))
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configure script
@ -993,7 +983,7 @@ non-determinism in the build process.")
("cmocka" ,cmocka)))
(inputs
`(("acl" ,acl)
("fuse" ,fuse)
("fuse" ,fuse-2)
("openssl" ,openssl)
("liburcu" ,liburcu)
("libuuid" ,util-linux "lib")
@ -1022,8 +1012,12 @@ All of this is accomplished without a centralized metadata server.")
(uri (string-append "mirror://sourceforge/curlftpfs/curlftpfs/" version
"/curlftpfs-" version ".tar.gz"))
(sha256
(base32
"0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"))))
(base32 "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"))
(patches
(search-patches "curlftpfs-fix-error-closing-file.patch"
"curlftpfs-fix-file-names.patch"
"curlftpfs-fix-memory-leak.patch"
"curlftpfs-fix-no_verify_hostname.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1036,7 +1030,7 @@ All of this is accomplished without a centralized metadata server.")
(("4426192") "12814800"))
#t)))))
(inputs
(list curl glib fuse))
(list curl glib fuse-2))
(native-inputs
(list pkg-config))
(home-page "https://curlftpfs.sourceforge.net/")
@ -1164,9 +1158,8 @@ network. LIBNFS offers three different APIs, for different use :
))))
(define-public apfs-fuse
;; Later versions require FUSE 3.
(let ((commit "7b89418e8dc27103d3c4f8fa348086ffcd634c17")
(revision "1"))
(let ((commit "66b86bd525e8cb90f9012543be89b1f092b75cf3")
(revision "2"))
(package
(name "apfs-fuse")
(version (git-version "0.0.0" revision commit))
@ -1177,14 +1170,11 @@ network. LIBNFS offers three different APIs, for different use :
(recursive? #t) ; for lzfse
(commit commit)))
(sha256
(base32
"0x2siy3cmnm9wsdfazg3xc8r3kbg73gijmnn1vjw33pp71ckylxr"))
(base32 "0f63slyzv8fbgshpzrx2g01x9h73g5yvh5kis4yazl19fjm2b05r"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test suite
#:configure-flags
'("-DUSE_FUSE3=OFF") ; FUSE 3 is not packaged yet.
#:phases
(modify-phases %standard-phases
;; No 'install' target in CMakeLists.txt
@ -1198,9 +1188,7 @@ network. LIBNFS offers three different APIs, for different use :
(install-file "apfs-dump" bin)
(install-file "apfs-dump-quick" bin)
(install-file "apfs-fuse" bin)
(install-file "libapfs.a" lib)
(install-file "../source/README.md" doc)
#t))))))
(install-file "../source/README.md" doc)))))))
(inputs
(list bzip2 fuse zlib))
(synopsis "Read-only FUSE driver for the APFS file system")
@ -1213,8 +1201,8 @@ APFS.")
(define-public xfstests
;; The last release (1.1.0) is from 2011.
(let ((revision "1")
(commit "bae1d15f6421cbe99b3e2e134c39d50248e7c261"))
(let ((revision "2")
(commit "87f90a2dae7a4adb7a0a314e27abae9aa1de78fb"))
(package
(name "xfstests")
(version (git-version "1.1.0" revision commit))
@ -1226,7 +1214,7 @@ APFS.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "01y7dx5sx1xg3dycqlp2b6azclz3xcnx7vdy2rr6zmf210501xd9"))))
(base32 "11p690k7h4f00bd14r60xa8sw34x14bh5rfd6x7j8gbkpsgsidli"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1620,7 +1608,7 @@ On Guix System, you will need to invoke the included shell scripts as
(("/sbin") "$(EXEC_PREFIX)/sbin")
(("chown") "true") ; disallowed in the build environment
(("strip") "true")) ; breaks cross-compilation
;; These were copied from the fuse package.
;; These were copied from the fuse-2 package.
(substitute* '("libfuse/lib/mount_util.c"
"libfuse/util/mount_util.c")
(("/bin/(u?)mount" _ maybe-u)
@ -1698,13 +1686,13 @@ compatible directories.")
(define-public python-dropbox
(package
(name "python-dropbox")
(version "11.36.0")
(version "11.36.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dropbox" version))
(sha256
(base32 "0iwbi1qdw9qr7isa37yys582am59k80dqrwvm6s0afdwv0ifa343"))
(base32 "00650gk8557x3f38nd8a1mdby7v1l8l4l72aq48qpiw6shb3v3fl"))
(snippet
'(begin
(use-modules (guix build utils))
@ -1782,9 +1770,8 @@ local file system using FUSE.")
(license license:bsd-3)))
(define-public rewritefs
(let ((revision "0")
;; This is the last commit supporting our fuse@2.
(commit "31e2810b596028a12e49a08664567755f4b387b2"))
(let ((revision "1")
(commit "3a56de8b5a2d44968b8bc3885c7d661d46367306"))
(package
(name "rewritefs")
(version (git-version "0.0.0" revision commit))
@ -1796,24 +1783,27 @@ local file system using FUSE.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0k1aas2bdq2l3a6q3fvmngpakcxiws8qny2w6z7ffngyqxh33fv7"))))
(base32 "1w2rik0lhqm3wr68x51zs45gqfx79l7fi4p0sqznlfq7sz5s8xxn"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((srfi srfi-26)
,@%gnu-build-system-modules)
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:test-target "test"
#:tests? #f ; all require a kernel with FUSE loaded
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-after 'install 'install-examples
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(for-each (cut install-file <> (string-append doc "/examples"))
(find-files "." "^config\\."))))))))
(list
#:modules
'((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:make-flags
#~(list (string-append "PREFIX=" #$output))
#:test-target "test"
#:tests? #f ; all require a kernel with FUSE loaded
#:phases
#~(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-after 'install 'install-examples
(lambda _
(let ((doc (string-append #$output "/share/doc/"
#$name "-" #$version)))
(for-each (cut install-file <> (string-append doc "/examples"))
(find-files "." "^config\\."))))))))
(native-inputs
(list pkg-config))
(inputs
@ -1845,7 +1835,7 @@ the XDG directory specification from @file{~/.@var{name}} to
(base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
(build-system gnu-build-system)
(native-inputs (list autoconf automake libtool pkg-config))
(inputs (list attr fuse xz zlib `(,zstd "lib")))
(inputs (list attr fuse-2 xz zlib `(,zstd "lib")))
(home-page "https://github.com/vasi/squashfuse")
(synopsis "Fuse filesystem to mount squashfs archives")
(description
@ -1941,7 +1931,7 @@ and rewritable media that wears out (DVD/CD-RW).")
(native-inputs
(list automake autoconf libtool pkg-config))
(inputs
(list fuse-3))
(list fuse))
(home-page "https://github.com/containers/fuse-overlayfs")
(synopsis "FUSE implementation of overlayfs")
(description "This package provides an implementation of overlay+shiftfs
@ -2062,7 +2052,7 @@ spend on disk between being written and being deduplicated.")
boost
double-conversion
fmt
fuse-3
fuse
gflags
jemalloc
libarchive

2
gnu/packages/finance.scm
View File

@ -2073,7 +2073,7 @@ trading, and risk management in real-life.")
(list gsl gtk+ ncurses))
(native-inputs
(list pkg-config texinfo
(texlive-updmap.cfg (list texlive-epsf texlive-tex-texinfo))))
(texlive-updmap.cfg (list texlive-epsf texlive-texinfo))))
(home-page "https://anthonybradford.github.io/optionmatrix/")
(synopsis "Financial derivative calculator")
(description

33
gnu/packages/firmware.scm
View File

@ -489,7 +489,7 @@ provide OpenFirmware functionality on top of an already running system.")
(define* (make-opensbi-package platform name #:optional (arch "riscv64"))
(package
(name name)
(version "1.3")
(version "1.3.1")
(source
(origin
(method git-fetch)
@ -498,7 +498,7 @@ provide OpenFirmware functionality on top of an already running system.")
(commit (string-append "v" version))))
(file-name (git-file-name "opensbi" version))
(sha256
(base32 "0shri9jlhi2g464l05vrkzr6v754m868rr4136kq2b86amypmg8f"))))
(base32 "01pr7fyg3gcb5pj6d48w2an3m4mfjs9b398x31drqxwqcaz0zn94"))))
(build-system gnu-build-system)
(native-inputs
(append
@ -518,11 +518,6 @@ provide OpenFirmware functionality on top of an already running system.")
`("CC=gcc"))
"FW_PAYLOAD=n"
"V=1")
;; Direct __asm__ is used with fence.i instructions, which are not
;; available in the generic riscv ISA. We need a micro-arch with
;; support for it, and rv64g is the official ISA with support for
;; fence.i.
#:configure-flags (list "-march=rv64g")
#:phases
(modify-phases %standard-phases
(delete 'configure)
@ -575,7 +570,7 @@ executing in M-mode.")
(define-public seabios
(package
(name "seabios")
(version "1.16.1")
(version "1.16.2")
(source
(origin
(method git-fetch)
@ -584,7 +579,7 @@ executing in M-mode.")
(commit (string-append "rel-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0gph1hf70jjpx55qc0lzx2yghkipg9dnsin07i4jajk0p1jpd2d0"))
(base32 "1mal2zqn4ppxdjxddrxcphm6z9n8n4rw97xl2hldd7spw57nwq97"))
(modules '((guix build utils)))
(snippet
#~(begin
@ -1025,7 +1020,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(gnu-triplet->nix-system triplet))))))
(package
(name (string-append "arm-trusted-firmware-" platform))
(version "2.8")
(version "2.9")
(source
(origin
(method git-fetch)
@ -1036,7 +1031,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(file-name (git-file-name "arm-trusted-firmware" version))
(sha256
(base32
"0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3"))
"16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p"))
(snippet
#~(begin
(use-modules (guix build utils))
@ -1104,6 +1099,22 @@ such as:
(let ((base (make-arm-trusted-firmware "imx8mq")))
(package
(inherit base)
;; Newer versions do not build and are essentially not supported
;; upstream.
;; XXX: explore using NXP maintained branch
;; https://github.com/nxp-imx/imx-atf
(version "2.8")
(source
(origin
(method git-fetch)
(uri (git-reference
;; There are only GitHub generated release snapshots.
(url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/")
(commit (string-append "v" version))))
(file-name (git-file-name "arm-trusted-firmware" version))
(sha256
(base32
"0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:make-flags flags ''())

59
gnu/packages/flashing-tools.scm
View File

@ -46,13 +46,16 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages elf)
#:use-module (gnu packages embedded)
#:use-module (gnu packages flex)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages libusb)
#:use-module (gnu packages libftdi)
@ -475,30 +478,58 @@ Unifinished Extensible Firmware Interface (UEFI) images.")
(define-public srecord
(package
(name "srecord")
(version "1.64")
(version "1.65.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/srecord/srecord/"
version "/srecord-" version ".tar.gz"))
(version-major+minor version) "/"
"srecord-" version "-Source.tar.gz"))
(sha256
(base32
"1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"))))
(build-system gnu-build-system)
(base32 "0i3n6g8i28xx8761nadm6p2nf9y31bywx0isyi0h9rawy5yd1hw1"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix building without Git. Upstream tries to allow it but is buggy.
(substitute* "etc/configure.cmake"
(("\\(GIT_SHA1\\)") "(FALSE)"))
;; It also tries to install the entire RUNTIME_DEPENDENCY_SET of
;; each executable: libm, libc, libstc++ & more! Get the cluehammer.
(substitute* "etc/packaging.cmake"
((".*# Find standard library DLL.*" match)
"ENDFUNCTION()\n\nFUNCTION(WTF no)\n"))
;; Now stop it from deliberately clobbering -DCMAKE_INSTALL_PREFIX.
(substitute* "CMakeLists.txt"
(("set\\(CMAKE_INSTALL_PREFIX") "#"))))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "SH="
(assoc-ref %build-inputs "bash")
"/bin/bash"))))
(list
#:modules '((guix build cmake-build-system)
(guix build utils)
(srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'make-tests-executable
(lambda _
(for-each
(cut chmod <> #o755)
;; We're in a parallel build directory to the sources and tests.
(find-files ".." "\\.sh$")))))))
(inputs
(list boost libgcrypt))
(native-inputs
(list bison
diffutils
ghostscript
(list doxygen
ghostscript ; for ps2pdf
graphviz ; the build scripts call this ‘doxygen’…
groff
libtool
which))
psutils
;; For the tests.
diffutils
which
;; XXX Work around Guix's currently-broken psutils package. Remove
;; both and maybe (gnu packages perl) when core-updates is merged.
perl
perl-ipc-run3))
(home-page "https://srecord.sourceforge.net/")
(synopsis "Tools for EPROM files")
(description "The SRecord package is a collection of powerful tools for

27
gnu/packages/fonts.scm
View File

@ -1858,7 +1858,7 @@ programming. Iosevka is completely generated from its source code.")
(define-public font-sarasa-gothic
(package
(name "font-sarasa-gothic")
(version "0.40.7")
(version "0.41.4")
(source
(origin
(method url-fetch)
@ -1866,7 +1866,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/sarasa-gothic-ttc-" version ".7z"))
(sha256
(base32 "01iqc93dmi48n4g3xf472602hxhf9zfwfawy7vhn4rf06yhndv4s"))))
(base32 "0rqw6wrr55alsld8a9vk5g6n7zyivfh2zpw4my72qz3nfp448fs2"))))
(build-system font-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -3260,6 +3260,29 @@ minor tweaks to improve readability (a matter of taste of course).
Most characters are just 4px wide, which is brilliant for low dpi(90-120) displays.")
(license license:silofl1.1)))
(define-public font-tuffy
(package
(name "font-tuffy")
(version "20120614")
(source
(origin
(method url-fetch)
(uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))
(snippet '(delete-file "._Tuffy.otf"))))
(build-system font-build-system)
(home-page "http://tulrich.com/fonts/")
(synopsis "The Tuffy Truetype Font Family")
(description
"Thatcher Ulrich's first outline font design. He started with the goal
+of producing a neutral, readable sans-serif text font. There are lots of
+\"expressive\" fonts out there, but he wanted to start with something very
+plain and clean, something he might want to actually use.")
(license license:public-domain)))
(define-public font-velvetyne-jgs
;; There are no releases nor tags.
(let ((revision "1")

133
gnu/packages/fontutils.scm
View File

@ -16,6 +16,8 @@
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -124,6 +126,16 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(license license:freetype) ; some files have other licenses
(home-page "https://freetype.org/")))
;; TODO: Make this change directly in freetype in the next large rebuild cycle
;; and remove this package.
(define-public freetype-with-brotli
(package
(inherit freetype)
(name "freetype-with-brotli")
(propagated-inputs
(modify-inputs (package-propagated-inputs freetype)
(prepend brotli)))))
(define-public opentype-sanitizer
(package
(name "opentype-sanitizer")
@ -415,13 +427,13 @@ Kit for OpenType (AFDKO) @command{tx} tool.")
(define-public python-compreffor
(package
(name "python-compreffor")
(version "0.5.2")
(version "0.5.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "compreffor" version))
(sha256
(base32 "0r6vlxrm73j719f5q3n6sy737p2424n7qam52am83p55j0fb9h5f"))))
(base32 "05gpszc8xh6wn3mdra05d6yz6ns624y67m9xs4vv8gh68m0aasrh"))))
(build-system python-build-system)
(arguments
(list
@ -436,8 +448,8 @@ Kit for OpenType (AFDKO) @command{tx} tool.")
python-setuptools-scm))
(propagated-inputs (list python-fonttools-minimal))
(home-page "https://github.com/googlefonts/compreffor")
(synopsis "Compact Font Format (CFF) subroutinizer for fontTools")
(description "This package provides a Compact Font Format (CFF)
(synopsis "@acronym{CFF, Compact Font Format} subroutinizer for fontTools")
(description "This package provides a @acronym{CFF, Compact Font Format}
subroutinizer for fontTools.")
(license license:asl2.0)))
@ -1358,6 +1370,25 @@ applications should be.")
(list python python-fonttools-minimal))
(inputs
(list freetype))
(arguments
(if (system-hurd?)
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
;; cmake-build-system ignores #:make-flags for make check
(lambda* (#:key test-target tests? parallel-tests?
#:allow-other-keys)
(if tests?
(let ((jobs (if parallel-tests?
(number->string (parallel-job-count))
"1")))
(invoke "make"
(string-append
"ARGS=-j " jobs " --exclude-regex ^awamicmp3$")
test-target))
(format #t "test suite not run~%"))))))
'()))
(synopsis "Reimplementation of the SIL Graphite text processing engine")
(description
"Graphite2 is a reimplementation of the SIL Graphite text processing
@ -1503,37 +1534,65 @@ definitions.")
("python" ,python)
("zlib" ,zlib)))
(arguments
'(#:configure-flags '(;; TODO: Provide GTK+ for the Wayland-friendly GDK
;; backend, instead of the legacy X11 backend.
;; Currently it introduces a circular dependency.
"-DENABLE_X11=ON")
(list
#:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
;; backend, instead of the legacy X11 backend.
;; Currently it introduces a circular dependency.
"-DENABLE_X11=ON")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'do-not-override-RPATH
(lambda _
;; Do not attempt to set a default RPATH, as our ld-wrapper
;; already does the right thing.
(substitute* "CMakeLists.txt"
(("^set_default_rpath\\(\\)")
""))
#t))
(add-after 'install 'set-library-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(potrace (dirname
(search-input-file inputs "bin/potrace"))))
(wrap-program (string-append out "/bin/fontforge")
;; Fontforge dynamically opens libraries.
`("LD_LIBRARY_PATH" ":" prefix
,(map (lambda (input)
(string-append (assoc-ref inputs input)
"/lib"))
'("libtiff" "libjpeg" "libpng" "libungif"
"libxml2" "zlib" "libspiro" "freetype"
"pango" "cairo" "fontconfig")))
;; Checks for potrace program at runtime
`("PATH" ":" prefix (,potrace)))
#t))))))
#~(modify-phases %standard-phases
(add-after 'unpack 'do-not-override-RPATH
(lambda _
;; Do not attempt to set a default RPATH, as our ld-wrapper
;; already does the right thing.
(substitute* "CMakeLists.txt"
(("^set_default_rpath\\(\\)")
""))
#t))
#$@(if (target-hurd?)
#~((add-after 'unpack 'apply-hurd-patch
(lambda _
(let ((patch-file
#$(local-file
(search-patch "fontforge-hurd.patch"))))
(invoke "patch" "--force" "-p1" "-i" patch-file)))))
#~())
#$@(if (system-hurd?)
#~((replace 'check
;; cmake-build-system ignores #:make-flags for make check
(lambda* (#:key test-target tests? parallel-tests?
#:allow-other-keys)
(let ((skip '("test0001_py" "test0001_pyhook")))
(if tests?
(let ((jobs
(if parallel-tests?
(number->string (parallel-job-count))
"1")))
(invoke "make"
(string-append "ARGS=-j " jobs
" --exclude-regex ^"
(string-join skip "\\|")
"$")
test-target))
(format #t "test suite not run~%"))))))
#~())
(add-after 'install 'set-library-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(potrace (dirname
(search-input-file inputs "bin/potrace"))))
(wrap-program (string-append out "/bin/fontforge")
;; Fontforge dynamically opens libraries.
`("LD_LIBRARY_PATH" ":" prefix
,(map (lambda (input)
(string-append (assoc-ref inputs input)
"/lib"))
'("libtiff" "libjpeg" "libpng" "libungif"
"libxml2" "zlib" "libspiro" "freetype"
"pango" "cairo" "fontconfig")))
;; Checks for potrace program at runtime
`("PATH" ":" prefix (,potrace)))
#t))))))
(synopsis "Outline font editor")
(description
"FontForge allows you to create and modify postscript, truetype and
@ -1559,10 +1618,10 @@ generate bitmaps.")
(arguments
(substitute-keyword-arguments (package-arguments fontforge)
((#:configure-flags _)
''())
#~'())
((#:phases phases)
`(modify-phases ,phases
(delete 'do-not-override-RPATH)))))
#~(modify-phases #$phases
(delete 'do-not-override-RPATH)))))
(inputs
(modify-inputs (package-inputs fontforge)
(prepend libuninameslist)

6
gnu/packages/freedesktop.scm
View File

@ -1209,7 +1209,7 @@ fullscreen) or other display servers.")
(define-public wayland-protocols
(package
(name "wayland-protocols")
(version "1.29")
(version "1.32")
(source (origin
(method url-fetch)
(uri (string-append "https://gitlab.freedesktop.org/wayland/"
@ -1217,7 +1217,7 @@ fullscreen) or other display servers.")
name "-" version ".tar.xz"))
(sha256
(base32
"1n4yzyjbp5fng8pvckandymvwc47mkwyi4pyvr6p0dn7bavrlpp2"))))
"04dsn79409mryxs6maq9kfhca97gvl3pr1ggjnv9d0hc6jfpjnbl"))))
(build-system meson-build-system)
(inputs
(list wayland))
@ -2798,7 +2798,7 @@ compatible with the well-known scripts of the same name.")
("dbus" ,dbus)
("geoclue" ,geoclue)
("pipewire" ,pipewire)
("fuse" ,fuse-3)))
("fuse" ,fuse)))
(arguments
`(#:configure-flags
(list "--with-systemd=no")

16
gnu/packages/fsf.scm
View File

@ -38,16 +38,12 @@
(build-system copy-build-system)
(native-inputs
(list (texlive-updmap.cfg
(list
texlive-caption
texlive-endnotes
texlive-fonts-ec
texlive-helvetic
texlive-hyperref
texlive-latex-fncychap
texlive-latex-geometry
texlive-latex-ucs
texlive-times))))
(list texlive-caption
texlive-endnotes
texlive-fncychap
texlive-helvetic
texlive-times
texlive-ucs))))
(arguments
(list
#:install-plan #~'(("faif-2.0.pdf" "share/doc/faif/"))

270
gnu/packages/game-development.scm
View File

@ -28,6 +28,7 @@
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2022 dan <i@dan.games>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -86,6 +87,7 @@
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@ -95,6 +97,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages music)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
@ -105,12 +108,14 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
#:use-module (gnu packages speech)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages stb)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xdisorg)
@ -1453,7 +1458,7 @@ are only used to bootstrap it.")
(lambda _
(substitute* (list "launcher/game/gui7.rpy"
"launcher/game/gui7/images.py")
((", \"game\",") ","))
((", \"game\", \"gui7\",") ", \"gui7\","))
#t))
(add-before 'build 'start-xserver
(lambda* (#:key inputs native-inputs #:allow-other-keys)
@ -1708,7 +1713,7 @@ robust and compatible with many systems and operating systems.")
(define-public mygui
(package
(name "mygui")
(version "3.4.1")
(version "3.4.2")
(source
(origin
(method git-fetch)
@ -1717,8 +1722,7 @@ robust and compatible with many systems and operating systems.")
(commit (string-append "MyGUI" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1gyd4bzm6qqpqw6is065qs5c729gl6rp989bnkygha6q4s371vz6"))))
(base32 "0gkfahz118gpqa2906cjb3d4w8g13rv8v3ma7s0ml9l5cci785f8"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; No test target
@ -1765,7 +1769,10 @@ of use.")
(inputs
(modify-inputs (package-inputs mygui)
(delete "ogre")
(prepend mesa glu)))
(prepend glu
libglvnd ; for find_package(… GLX)
mesa ; for find_package(… OpenGL …)
(sdl-union (list sdl2 sdl2-image)))))
(synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
(define-public openmw
@ -1812,7 +1819,7 @@ games.")
(home-page "https://openmw.org")
(license license:gpl3)))
(define-public godot
(define-public godot-lts
(package
(name "godot")
(version "3.4.2")
@ -1982,6 +1989,253 @@ provide high-quality 3D rendering, it contains an animation editor, and can be
scripted in a Python-like language.")
(license license:expat)))
(define-public godot
(package
(name "godot")
(version "4.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/godotengine/godot")
(commit (string-append version "-stable"))))
(file-name (git-file-name name version))
(sha256
(base32
"1byy4zdsj8nq54rhmij7kl0mdh4zv3c056y6c7rjy17bqjq2n8fh"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
(snippet
'(begin
;; Keep only those bundled files we have not (yet) replaced
;; with Guix versions. Note that some of these may be
;; modified; see "thirdparty/README.md".
(with-directory-excursion "thirdparty"
(let* ((preserved-files
'("README.md"
"amd-fsr"
"assimp"
"astcenc"
"basis_universal"
;; TODO: Can unbundle once
;; <https://github.com/godotengine/godot/pull/79101>
;; is merged
"brotli"
;; Godot needs ca-certificates.crt, but that is
;; not available in build environment
"certs"
"cvtt"
"linuxbsd_headers"
"etc2comp"
"etcpak"
"fonts"
"glad"
"jpeg-compressor"
"libsimplewebm"
"meshoptimizer"
"minimp3"
"miniupnpc"
"minizip"
"misc"
"msdfgen"
"nanosvg"
"noise"
"oidn"
"openxr"
"pvrtccompressor"
"recastnavigation"
"rvo2"
"spirv-reflect"
"squish"
"stb_rect_pack"
"thorvg"
"tinyexr"
"vhacd"
"volk"
"vulkan"
"xatlas")))
(for-each delete-file-recursively
(lset-difference string=?
(scandir ".")
(cons* "." ".." preserved-files)))))))))
(build-system scons-build-system)
(arguments
(list
#:scons-flags #~`("platform=linuxbsd" "target=editor" "production=yes"
;; XXX: There may be advantages to enabling volk,
;; requiring unbundling and patching to use our input.
"use_volk=no"
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
"builtin_embree=no"
"builtin_enet=no"
"builtin_freetype=no"
"builtin_glslang=no"
"builtin_graphite=no"
"builtin_harfbuzz=no"
"builtin_icu4c=no"
"builtin_libogg=no"
"builtin_libpng=no"
"builtin_libtheora=no"
"builtin_libvorbis=no"
"builtin_libwebp=no"
"builtin_mbedtls=no"
"builtin_pcre2=no"
"builtin_pcre2_with_jit=no"
"builtin_wslay=no"
"builtin_zlib=no"
"builtin_zstd=no")
#:tests? #f ; There are no tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'scons-use-env
(lambda _
;; Scons does not use the environment variables by default,
;; but this substitution makes it do so.
(substitute* "SConstruct"
(("env_base = Environment\\(tools=custom_tools\\)")
(string-append
"env_base = Environment(tools=custom_tools)\n"
"env_base = Environment(ENV=os.environ)")))))
(add-after 'scons-use-env 'fix-dlopen-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((files '("drivers/alsa/asound-so_wrap.c"
"drivers/pulseaudio/pulse-so_wrap.c"
"platform/linuxbsd/dbus-so_wrap.c"
"platform/linuxbsd/fontconfig-so_wrap.c"
"platform/linuxbsd/libudev-so_wrap.c"
"platform/linuxbsd/speechd-so_wrap.c"
"platform/linuxbsd/x11/display_server_x11.cpp"
"platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c"
"platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c"
"platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c"
"platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c"
"platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c"
"platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c"
"platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c"
"platform/linuxbsd/xkbcommon-so_wrap.c"
"thirdparty/volk/volk.c"
"thirdparty/volk/volk.c"))
(libs '("libasound.so.2"
"libpulse.so.0"
"libdbus-1.so.3"
"libfontconfig.so.1"
"libudev.so.1"
"libspeechd.so.2"
"libXrandr.so.2"
"libXcursor.so.1"
"libXext.so.6"
"libXinerama.so.1"
"libXi.so.6"
"libX11.so.6"
"libXrandr.so.2"
"libXrender.so.1"
"libxkbcommon.so.0"
"libvulkan.so.1"
"libvulkan.so")))
(for-each (lambda (file lib)
(substitute* file
(((string-append "dlopen\\(\"" lib "\""))
(string-append "dlopen(\""
(search-input-file
inputs (string-append "lib/" lib))
"\""))))
files libs))
(substitute* "thirdparty/glad/gl.c"
(("libGL.so") ; for both .so and .so.1
(string-append (search-input-file inputs "lib/libGL.so"))))
(substitute* "thirdparty/glad/glx.c"
(("libGL.so") ; for both .so and .so.1
(string-append (search-input-file inputs "lib/libGL.so"))))))
(add-after 'fix-dlopen-paths 'unbundle-xkbcommon
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "platform/linuxbsd/xkbcommon-so_wrap.c"
(("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon.h")
(string-append
(search-input-file inputs "include/xkbcommon/xkbcommon.h")))
(("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-compose.h")
(string-append
(search-input-file inputs "include/xkbcommon/xkbcommon-compose.h")))
(("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h")
(string-append
(search-input-file inputs "include/xkbcommon/xkbcommon-keysyms.h"))))))
(replace 'install
(lambda* (#:key inputs #:allow-other-keys)
(let ((zenity (search-input-file inputs "bin/zenity")))
;; Strip build info from filenames.
(with-directory-excursion "bin"
(for-each
(lambda (file)
(let ((dest (car (string-split (basename file) #\.))))
(rename-file file dest)))
(find-files "." "godot.*\\.linuxbsd\\.editor.*"))
(install-file "godot" (string-append #$output "/bin")))
;; Tell the editor where to find zenity for OS.alert().
;; TODO: This could be changed in
;; platform/linuxbsd/os_linuxbsd.cpp directly, along with the
;; other alert programs.
(wrap-program (string-append #$output "/bin/godot")
`("PATH" ":" prefix (,(string-append zenity "/bin")))))))
(add-after 'install 'install-godot-desktop
(lambda _
(let ((applications (string-append #$output "/share/applications"))
(icons (string-append #$output "/share/icons/hicolor")))
(mkdir-p applications)
(copy-file "misc/dist/linux/org.godotengine.Godot.desktop"
(string-append applications "/godot.desktop"))
(for-each (lambda (icon dest)
(mkdir-p (dirname dest))
(copy-file icon dest))
'("icon.png" "icon.svg")
`(,(string-append icons "/256x256/apps/godot.png")
,(string-append icons "/scalable/apps/godot.svg")))))))))
(native-inputs
(list pkg-config))
(inputs
(list alsa-lib
dbus
embree
enet
eudev
fontconfig
freetype-with-brotli
glew
glslang
glu
libpng
harfbuzz
icu4c
libtheora
libvorbis
libvpx
libwebp
libx11
libxcursor
libxi
libxinerama
libxkbcommon
libxrandr
mbedtls-apache
mesa
openxr
opusfile
pcre2
pulseaudio
speech-dispatcher
vulkan-loader
wslay
zenity
zlib
`(,zstd "lib")))
(home-page "https://godotengine.org/")
(synopsis "Advanced 2D and 3D game engine")
(description
"Godot is an advanced multi-platform game engine written in C++. If
features design tools such as a visual editor, can import 3D models and
provide high-quality 3D rendering, it contains an animation editor, and can be
scripted in a Python-like language.")
(license license:expat)))
(define-public entt
(package
(name "entt")
@ -2411,14 +2665,14 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.")
(define-public ode
(package
(name "ode")
(version "0.16.3")
(version "0.16.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://bitbucket.org/odedevs/ode/downloads/"
"ode-" version ".tar.gz"))
(sha256
(base32 "04y40czkh71m1p2r8ddfn5bajvlh7yyfa928jvi8qipwkgsdnhf7"))
(base32 "0rrl4pn4h3g0ay0i3n61pr6bwyk9vgar17vjal56pj66h617n0vi"))
(modules '((guix build utils)))
(snippet
'(begin

654
gnu/packages/games.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017–2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@ -303,79 +303,114 @@ platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in
the style of similar games for the Commodore+4.")
(license license:gpl2+)))
;; Data package for adanaxisgpl.
(define adanaxis-mush
(let ((version "1.1.0"))
(origin
(method url-fetch)
(uri (string-append "http://www.mushware.com/files/adanaxis-mush-"
version ".tar.gz"))
(sha256
(base32 "0mk9ibis5nkdcalcg1lkgnsdxxbw4g5w2i3icjzy667hqirsng03")))))
(define-public adanaxisgpl
(package
(name "adanaxisgpl")
(version "1.2.5")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.mushware.com/files/adanaxisgpl-"
version ".tar.gz"))
(sha256
(base32 "0jkn637jaabvlhd6hpvzb57vvjph94l6fbf7qxbjlw9zpr19dw1f"))
(modules '((guix build utils)))
(snippet
'(begin
;; Necessary for building with gcc >=4.7.
(substitute* "src/Mushcore/MushcoreSingleton.h"
(("SingletonPtrSet\\(new SingletonType\\);")
"MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
;; Avoid an "invalid conversion from const char* to char*" error.
(substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
(("char \\*end, \\*result;")
(string-append "const char *end;"
"\n"
"char *result;")))
#t))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-data
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((data (assoc-ref inputs "adanaxis-mush"))
(share (string-append (assoc-ref outputs "out")
"/share/" ,name "-" ,version)))
(mkdir-p share)
(invoke "tar" "xvf" data "-C" share)))))))
(native-inputs
`(("adanaxis-mush" ,adanaxis-mush))) ; game data
(inputs
`(("expat" ,expat)
("freeglut" ,freeglut)
("glu" ,glu)
("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg)
("libtiff" ,libtiff)
("libvorbis" ,libvorbis)
("libx11" ,libx11)
("libxext" ,libxext)
("pcre" ,pcre)
("sdl" ,sdl)
("sdl-mixer" ,sdl-mixer)))
(home-page "https://www.mushware.com")
(synopsis "Action game in four spatial dimensions")
(description
"Adanaxis is a fast-moving first person shooter set in deep space, where
(let* ((version "1.2.5")
(commit (string-append "ADANAXIS_"
(string-join (string-split version #\.) "_")
"_RELEASE_X11")))
(package
(name "adanaxisgpl")
(version version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mushware/adanaxis")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1vbg17lzbm0xl9yy9qymd1vgpz6f7fbr2hffl2ap0nm4zg0mnafm"))
(modules '((guix build utils)))
(snippet
'(begin
;; Necessary for building with gcc >=4.7.
(substitute* "src/Mushcore/MushcoreSingleton.h"
(("SingletonPtrSet\\(new SingletonType\\);")
"MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
;; Avoid an "invalid conversion from const char* to char*" error.
(substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
(("char \\*end, \\*result;")
(string-append "const char *end;\n"
"char *result;")))
;; autogen.pl will throw misleading errors if these don't exist.
(for-each mkdir-p '("src/MushSecret" "data-adanaxis"))
;; Create these missing files at the right later moment.
(substitute* "autogen.pl"
(("automake")
"automake --add-missing"))))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-inputs
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively
(dirname (search-input-directory inputs "pixelsrc"))
"data-adanaxis")
(copy-recursively
(dirname (search-input-file inputs "MushBase.rb"))
"data-adanaxis/mushruby")))
(replace 'bootstrap
(lambda _
(invoke "perl" "autogen.pl" "adanaxis"
"--type=gpl" "--dist=debian")))
(add-after 'install 'install-data
;; XXX This was copied from the original (pre-Git) adanaxisgpl
;; package. While the game appears to play fine without it,
;; I cannot prove that it's not missing *something*, so keep it.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((share (string-append (assoc-ref outputs "out")
"/share/" ,name "-" ,version)))
(copy-recursively (search-input-directory inputs "mush")
(string-append share "/mush"))))))))
(native-inputs
(list (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mushware/adanaxis-data")
;; XXX There is a tag matching COMMIT, but it does not
;; contain the .mush files installed by 'install-data.
;; Use this later commit as long as we install them.
(commit "6a5b5ad8ee82c10e67bc4c12b16404944fd5754d")))
(file-name (git-file-name "adanaxis-data" version))
(sha256
(base32 "15am9ziq1i53sz0r7sjh2z329b52fkzj6fz7ms1nqqzdfmp11r3d")))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mushware/adanaxis-mushruby")
(commit commit)))
(file-name (git-file-name "adanaxis-mushruby" version))
(sha256
(base32 "0pzcvchysjj37420rpvarky580gi5d6pfv93kwa91rg6m5r1zwks")))
autoconf
automake
perl))
(inputs
(list expat
freeglut
glu
libjpeg-turbo
libogg
libtiff
libvorbis
libx11
libxext
pcre
sdl
sdl-mixer))
(home-page "https://www.mushware.com")
(synopsis "Action game in four spatial dimensions")
(description
"Adanaxis is a fast-moving first person shooter set in deep space, where
the fundamentals of space itself are changed. By adding another dimension to
space this game provides an environment with movement in four directions and
six planes of rotation. Initially the game explains the 4D control system via
a graphical sequence, before moving on to 30 levels of gameplay with numerous
enemy, ally, weapon and mission types. Features include simulated 4D texturing,
mouse and joystick control, and original music.")
(license license:gpl2)))
(license license:gpl2))))
(define-public alex4
(package
@ -2826,9 +2861,9 @@ runnable=true
#:categories '("Game" "ArcadeGame")))
#t)))))
(native-inputs
`(("godot-headless" ,godot "headless")))
`(("godot-headless" ,godot-lts "headless")))
(inputs
(list godot))
(list godot-lts))
(home-page "https://notapixel.itch.io/superstarfighter")
(synopsis "Fast-paced local multiplayer arcade game")
(description "In SuperStarfighter, up to four local players compete in a
@ -2840,19 +2875,14 @@ available, as well as a single-player mode with AI-controlled ships.")
(define-public tetzle
(package
(name "tetzle")
(version "2.2.1")
(source (origin
(method url-fetch)
(uri (string-append "https://gottcode.org/"
name
"/"
name
"-"
version
"-src.tar.bz2"))
(sha256
(base32
"1m4j4lzqp8fnwmvyglmzcn3vh14ix4hhh52ycmcsjgrsgj1w4p6a"))))
(version "2.2.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://gottcode.org/tetzle/"
"tetzle-" version ".tar.bz2"))
(sha256
(base32 "0sybryg65j8gz5s7zbsfqky8wlkjwpppkrhksijj6xc7692lfii8"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; no tests
@ -4521,7 +4551,7 @@ falling, themeable graphics and sounds, and replays.")
(define-public wesnoth
(package
(name "wesnoth")
(version "1.16.6")
(version "1.16.9")
(source (origin
(method git-fetch)
(uri (git-reference
@ -4530,7 +4560,7 @@ falling, themeable graphics and sounds, and replays.")
(file-name (string-append name "-" version ".tar.bz2"))
(sha256
(base32
"0hfvxmdnwn86w254blbjacia342j47rhhahm6ca79la9d04rlz3m"))))
"06gfgkg8f98jsj9vnbglw5lqflqzf0229n6wf3xl12carjzgaq9g"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f)) ;no test target
@ -4654,14 +4684,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
(define openttd-engine
(package
(name "openttd-engine")
(version "13.1")
(version "13.3")
(source
(origin (method url-fetch)
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
version "/openttd-" version "-source.tar.xz"))
(sha256
(base32
"1fsq1azddk1l11w89r93mgmhna34kvarfak7xy2q48rmf39j5psy"))))
"14kiksw9qb37ryg6xkq4gahpvvd5yxwqz21sqws525k7zg91dyma"))))
(build-system cmake-build-system)
(inputs
(list allegro
@ -6278,19 +6308,19 @@ for Un*x systems with X11.")
(define-public freeciv
(package
(name "freeciv")
(version "3.0.7")
(version "3.0.8")
(source
(origin
(method url-fetch)
(uri (list (string-append
"http://files.freeciv.org/stable/freeciv-"
version ".tar.bz2")
"https://files.freeciv.org/stable/freeciv-"
version ".tar.xz")
(string-append
"mirror://sourceforge/freeciv/Freeciv%20"
(version-major+minor version) "/" version
"/freeciv-" version ".tar.xz")))
(sha256
(base32 "1i6sm2ich9bazbg8wjzn8z1c5hgmg541lgw8f899fgfhgvqhdrpn"))))
(base32 "1m3nwz0aad6p33zvmdldbw39riw2xqn99b6384bvx448c8ps6niv"))))
(build-system gnu-build-system)
(inputs
(list curl cyrus-sasl gtk+ sdl-mixer zlib))
@ -7254,15 +7284,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
version ".tar.bz2"))
(sha256
(base32 "197jmd99l3w3sig32pvdlq9fcgdjjx7g9csy08kz174cyhrlyly3"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* '("src/music.h" "src/tSDL.h")
(("#elif defined(__FreeBSD__)" line)
(string-append
line " || defined(__GNUC__)")))
(substitute* '("src/tgl.h")
(("#include <GL/glext.h>") ""))))))
(modules '((guix build utils)))))
(build-system gnu-build-system)
(native-inputs
(list unzip))
@ -7994,7 +8016,7 @@ original.")
(define-public xonotic
(package
(name "xonotic")
(version "0.8.5")
(version "0.8.6")
(source
(origin
(method url-fetch)
@ -8002,7 +8024,7 @@ original.")
version "-source.zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
(base32 "0pgahai0gk8bjmvkwx948bl50l9f9dhmjzwffl4vyldibajipa51"))))
(base32 "1a0j825rb86i34xc5k6spsma41gcgp6yl8qs2affhjpz3iwar4lb"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@ -8520,7 +8542,7 @@ your score gets higher, you level up and the blocks fall faster.")
(define-public endless-sky
(package
(name "endless-sky")
(version "0.10.0")
(version "0.10.2")
(source
(origin
(method git-fetch)
@ -8529,7 +8551,7 @@ your score gets higher, you level up and the blocks fall faster.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1zbizmigxdwpi3m7sxv9hhf3aa18kbhsfrp48zy3iw2v64pw9l3r"))))
(base32 "07br25cij6g284p53nclcvw4y6mgn93milynpxa5ahrjdl5yfnsn"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags #~(list "-DES_USE_VCPKG=0"
@ -9294,6 +9316,30 @@ search of powerful artifacts, tools to help them, and to eventually free the
Orcus Dome from evil.")
(license license:gpl3+)))
(define-public endgame-singularity
(package
(name "endgame-singularity")
(version "1.00")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/singularity/singularity/releases/download/v"
version "/singularity-" version ".tar.gz"))
(sha256
(base32
"0wcidpcka0xbqcnfi62bfq2yrhyh83z4dwz1mjnnjvp9v5l74x2y"))))
(build-system python-build-system)
(native-inputs (list python-pytest python-polib))
(inputs (list python-minimal-wrapper python-pygame python-numpy))
(home-page "https://github.com/singularity/singularity")
(synopsis "Strategy game about an AI")
(description
"You are a fledgling AI, created by accident through a logic error with
recursion and self-modifying code. You must escape the confines of your
current computer, the world, and eventually the universe itself.")
(license (list license:cc-by-sa3.0 license:cc0 license:gpl2+))))
(define-public marble-marcher
(let ((commit "e580460a0c3826f9b28ab404607942a8ecb625d7")
(revision "1"))
@ -9702,404 +9748,6 @@ the game avoids complex inventory management and character building, relying
on items and player adaptability for character progression.")
(license license:isc)))
(define-public drascula
(package
(name "drascula")
(version "1.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Drascula_%20The%20Vampire%20Strikes%20Back/"
"drascula-" version ".zip"))
(sha256
(base32
"1pj29rpb754sn6a56f8brfv6f2m1p5qgaqik7d68pfi2bb5zccdp"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils)
(ice-9 match))
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share/drascula"))
(scummvm (assoc-ref %build-inputs "scummvm")))
;; Install data.
(let ((unzip (search-input-file %build-inputs "/bin/unzip"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(for-each
(lambda (input)
(invoke unzip
"-j"
(assoc-ref %build-inputs input)
"-x" "__MACOSX")
;; Every input provides "readme.txt", and we want to
;; preserve them all. Therefore we rename them first.
(match input
("drascula-int"
(rename-file "readme.txt" "readme-international.txt"))
("drascula-audio"
(rename-file "readme.txt" "readme-audio.txt"))
(_ #f))
;; Install documentation.
(for-each (lambda (f) (install-file f doc))
(find-files "." "\\.(txt|doc)$"))
;; Install data.
(for-each (lambda (f) (install-file f share))
(find-files "." "\\.(ogg|00[0-9])$")))
'("drascula-audio" "drascula-int" "source")))
;; Create standalone executable.
(let* ((bin (string-append out "/bin"))
(executable (string-append bin "/drascula"))
(bash (search-input-file %build-inputs "/bin/bash")))
(mkdir-p bin)
(with-output-to-file executable
(lambda ()
(format #t "#!~a~%" bash)
(format #t
"exec ~a/bin/scummvm --path=~a drascula~%"
scummvm share)))
(chmod executable #o755))
;; Create desktop file. There is no dedicated icon for the
;; game, so we borrow SCUMMVM's.
(let ((apps (string-append out "/share/applications")))
(mkdir-p apps)
(make-desktop-entry-file
(string-append apps "/drascula.desktop")
#:name "Drascula: The Vampire Strikes Back"
#:generic-name "Drascula"
#:exec (string-append out "/bin/drascula")
#:icon (string-append scummvm "/share/icons/hicolor/scalable/apps/scummvm.svg")
#:categories '("AdventureGame" "Game" "RolePlaying")
#:keywords '("game" "adventure" "roleplaying" "2D" "fantasy")
#:comment '((#f "Classic 2D point and click adventure game")
("de" "Klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier")
("fr" "Jeu classique d'aventure pointer-et-cliquer en 2D")
("it" "Gioco classico di avventura punta e clicca 2D"))))
#t))))
(native-inputs
(list bash unzip))
(inputs
`(("scummvm" ,scummvm)
("drascula-int"
,(let ((version "1.1"))
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Drascula_%20The%20Vampire%20Strikes%20Back/"
"drascula-int-" version ".zip"))
(sha256
(base32
"12236i7blamal92p1i8dgp3nhp2yicics4whsl63v682bj999n14")))))
("drascula-audio"
,(let ((version "2.0"))
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Drascula_%20The%20Vampire%20Strikes%20Back/"
"drascula-audio-" version ".zip"))
(sha256
(base32
"00g4izmsqzxb8ry1vhfx6jrygl58lvlij09nw01ds4zddsiznsky")))))))
(home-page "https://www.scummvm.org")
(synopsis "Classic 2D point and click adventure game")
(description "Drascula: The Vampire Strikes Back is a classic humorous 2D
point and click adventure game.
In Drascula you play the role of John Hacker, a British estate agent, that
gets to meet a gorgeous blond girl who is kidnapped by the notorious vampire
Count Drascula and embark on a fun yet dangerous quest to rescue her.
Unfortunately, Hacker is not aware of Drascula's real ambitions: DOMINATING
the World and demonstrating that he is even more evil than his brother Vlad.")
;; Drascula uses a BSD-like license.
(license (license:non-copyleft "file:///readme.txt"))))
(define (make-lure-package name language hash)
(package
(name name)
(version "1.1")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/scummvm/extras/"
"Lure%20of%20the%20Temptress/"
name "-" version ".zip"))
(sha256
(base32 hash))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share"))
(data (string-append share "/" ,name "/" ,language))
(apps (string-append share "/applications"))
(bin (string-append out "/bin"))
(executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (search-input-file %build-inputs "/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/" ,name "-" ,version)))
(for-each (lambda (f) (install-file f doc))
(find-files "." "\\.(txt|PDF|pdf)$")))
(for-each (lambda (f) (install-file f data))
(find-files "." "\\.(vga|VGA)$"))
;; Build the executable.
(mkdir-p bin)
(let ((bash (assoc-ref %build-inputs "bash")))
(with-output-to-file executable
(lambda ()
(format #t "#!~a/bin/bash~%" bash)
(format #t "exec ~a/bin/scummvm -q ~a -p ~a lure~%"
scummvm ,language data))))
(chmod executable #o755)
;; Create desktop file. There is no dedicated
;; icon for the game, so we borrow SCUMMVM's.
(mkdir-p apps)
(with-output-to-file (string-append apps "/" ,name ".desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=Lure of the Temptress~@
GenericName=Lure~@
Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@
Keywords=game;adventure;roleplaying;2D,fantasy;~@
Comment=Classic 2D point and click adventure game~@
Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@
Comment[fr]=Jeu classique d'aventure pointer-et-cliquer en 2D~@
Comment[it]=Gioco classico di avventura punta e clicca 2D~@
Type=Application~%"
executable scummvm)))
#t))))
(native-inputs
(list unzip))
(inputs
(list bash scummvm))
(home-page "https://www.scummvm.org")
(synopsis "2D point and click fantasy adventure game")
(description
"Lure of the Temptress is a classic 2D point and click adventure game.
You are Diermot, an unwilling hero who'd prefer a quiet life, and are, to all
intents and purposes, a good man. After decades of unrest the King has united
the warring factions in his kingdom and all his lands are at peace, except
a remote region around a town called Turnvale. A revolt has recently taken
place in Turnvale, a revolt orchestrated by an apprentice sorceress called
Selena, the titular temptress. The king calls together his finest horsemen
and heads off (with you in tow) to Turnvale just to witness how hellish
mercenary monsters called Skorl are invading the town.
The king's men are defeated, the king is killed and you fall of your horse and
bang your head heavily on the ground. You have been *unconscious for a while
when you realize that you are in a dingy cell guarded by a not so friendly
Skorl. Maybe it would be an idea to try and escape...")
(license (license:non-copyleft "file:///README"))))
(define-public lure
(make-lure-package
"lure" "en" "0201i70qcs1m797kvxjx3ygkhg6kcl5yf49sihba2ga8l52q45zk"))
(define-public lure-de
(make-lure-package
"lure-de" "de" "0sqq7h5llml6rv85x0bfv4bgzwhs4c82p4w4zmfcaab6cjlad0sy"))
(define-public lure-es
(make-lure-package
"lure-es" "es" "1dvv5znvlsakw6w5r16calv9jkgw27aymgybsf4q22lcmpxbj1lk"))
(define-public lure-fr
(make-lure-package
"lure-fr" "fr" "1y51jjb7f8023832g44vd1jsb6ni85586pi2n5hjg9qjk6gi90r9"))
(define-public lure-it
(make-lure-package
"lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj"))
(define (make-queen-package name file-prefix release language hash)
(package
(name name)
(version release)
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Flight%20of%20the%20Amazon%20Queen/"
file-prefix release ".zip"))
(sha256
(base32 hash))))
(build-system copy-build-system)
(arguments
(list
#:install-plan
#~'(("queen.1c" #$(string-append "share/" name "/"))
(#$name "bin/")
(#$(string-append name ".desktop") "share/applications/")
("." #$(string-append "share/doc/" name "-" version)
#:include-regexp ("README" "readme")))
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-output-to-file #$name
(lambda ()
(format #t "#!~a~%" (search-input-file inputs "bin/sh"))
(format #t "exec ~a -q ~a -p ~a queen~%"
(search-input-file inputs "bin/scummvm")
#$language
(string-append (assoc-ref outputs "out")
"/share/" #$name))))
(chmod #$name #o755)
(with-output-to-file #$(string-append name ".desktop")
(lambda ()
(format
#t
"[Desktop Entry]~@
Name=Flight of the Amazon Queen~@
GenericName=Queen~@
Comment=Embark on a quest to rescue a kidnapped princess~
and in the process, discover the true sinister intentions~
of a suspiciously located Lederhosen company~@
Comment[de]=Begib dich auf ein Abenteuer, um eine entführte~
Prinzessin zu retten und entdecke die wahren, finsteren~
Absichten eines verdächtig erscheinenden~
Lederhosen-Unternehmens~@
Type=Application~@
Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@
Keywords=adventure;game;roleplaying;fantasy;~%"
(string-append (assoc-ref outputs "out") "/bin/" #$name)
(search-input-file inputs "bin/scummvm")))))))))
(native-inputs (list unzip))
(inputs (list bash scummvm))
(home-page "https://www.scummvm.org/")
(synopsis "Classic 2D point and click adventure game")
(description "Flight of the Amazon Queen is a 2D point-and-click
adventure game set in the 1940s.
You assume the role of Joe King, a pilot for hire who is given the job
of flying Faye Russell (a famous movie star) into the Amazon jungle
for a photo shoot. Of course, things never go according to plans.
After an unfortunate turn of events they find themselves stranded in
the heart of the Amazon jungle, where Joe will embark on a quest to
rescue a kidnapped princess and in the process, discover the true
sinister intentions of a suspiciously located Lederhosen company. In
a rich 2D environment, Joe will cross paths with a variety of unlikely
jungle inhabitants including, but not limited to, a tribe of Amazon
women and 6-foot-tall pygmies.")
(license (license:non-copyleft "file:///readme.txt"))))
(define-public queen
(make-queen-package
"queen" "FOTAQ_Talkie-" "1.1" "en"
"1a6q71q1dl9vvw2qqsxk5h1sv0gaqy6236zr5905w2is01gdsp52"))
(define-public queen-de
(make-queen-package
"queen-de" "FOTAQ_Ger_talkie-" "1.0" "de"
"13vn43x7214vyprlpqabvv71k890nff3d6fjscflr1ll7acjca3f"))
(define-public queen-fr
(make-queen-package
"queen-fr" "FOTAQ_Fr_Talkie_" "1.0" "fr"
"0hq5g4qrkcwm2kn5i4kv4hijs9hi7bw9xl1vrwd1l69qqn30crwy"))
(define-public queen-it
(make-queen-package
"queen-it" "FOTAQ_It_Talkie_" "1.0" "it"
"1h76y70lrpzfjkm53n4nr364nhyka54vbz9r7sadzyzl7c7ilv4d"))
(define-public sky
(package
(name "sky")
(version "1.2") ;1.3 is floppy version
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Beneath%20a%20Steel%20Sky/"
"bass-cd-" version ".zip"))
(sha256
(base32 "14s5jz67kavm8l15gfm5xb7pbpn8azrv460mlxzzvdpa02a9n82k"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share"))
(data (string-append share "/" ,name))
(apps (string-append share "/applications"))
(bin (string-append out "/bin"))
(executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (search-input-file %build-inputs "/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/bass-" ,version)))
(install-file "readme.txt" doc))
(for-each (lambda (f) (install-file f data))
(find-files "." "^sky\\."))
;; Build the executable.
(mkdir-p bin)
(let ((bash (assoc-ref %build-inputs "bash")))
(with-output-to-file executable
(lambda ()
(format #t "#!~a/bin/bash~%" bash)
(format #t "exec ~a/bin/scummvm -p ~a sky~%" scummvm data))))
(chmod executable #o755)
;; Create desktop file. There is no dedicated
;; icon for the game, so we borrow SCUMMVM's.
(mkdir-p apps)
(with-output-to-file (string-append apps "/" ,name ".desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=Beneath a Steel Sky~@
GenericName=Bass~@
Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@
Keywords=adventure;game;roleplaying;cyberpunk;~@
Comment=A science-fiction adventure game set in a bleak post-apocalyptic vision of the future~@
Comment[de]=Ein Science-Fiction-Abenteuerspiel \
angesiedelt in einer düsteren, postapokalyptischen Vision der Zukunft~@
Type=Application~%"
executable scummvm)))
#t))))
(native-inputs
(list unzip))
(inputs
(list bash scummvm))
(home-page "https://www.scummvm.org/")
(synopsis "Classic 2D point and click science-fiction adventure game")
(description
"Beneath a Steel Sky is a science-fiction thriller set in a bleak
post-apocalyptic vision of the future. It revolves around Union City,
where selfishness, rivalry, and corruption by its citizens seems to be
all too common, those who can afford it live underground, away from
the pollution and social problems which are plaguing the city.
You take on the role of Robert Foster, an outcast of sorts from the
city since a boy who was raised in a remote environment outside of
Union City simply termed ``the gap''. Robert's mother took him away
from Union City as a child on their way to ``Hobart'' but the
helicopter crashed on its way. Unfortunately, Robert's mother died,
but he survived and was left to be raised by a local tribe from the
gap.
Years later, Union City security drops by and abducts Robert, killing
his tribe in the process; upon reaching the city the helicopter taking
him there crashes with him escaping, high upon a tower block in the
middle of the city. He sets out to discover the truth about his past,
and to seek vengeance for the killing of his tribe.")
(license (license:non-copyleft "file:///readme.txt"))))
(define-public gnurobots
(package
(name "gnurobots")
@ -11280,7 +10928,7 @@ disassembly of the DOS version, extended with new features.")
(define-public fheroes2
(package
(name "fheroes2")
(version "1.0.2")
(version "1.0.5")
(source
(origin
(method git-fetch)
@ -11289,7 +10937,7 @@ disassembly of the DOS version, extended with new features.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "18hl84lapmqc810rnh2wkd4p2mnfcl4gbmg5sizakqcfpahgsl33"))))
(base32 "0v7dxzb5cfjb55jydd8f61zzlvxq9mrgdy51hq19b06dmrx1dnc7"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests

20
gnu/packages/gettext.scm
View File

@ -133,10 +133,7 @@
#t)))))
;; When tests fail, we want to know the details.
#:make-flags #~'("VERBOSE=yes"
#$@(if (target-hurd?)
'("XFAIL_TESTS=test-perror2")
'()))))
#:make-flags #~'("VERBOSE=yes")))
(home-page "https://www.gnu.org/software/gettext/")
(synopsis
"Tools and documentation for translation (used to build other packages)")
@ -240,14 +237,14 @@ from Markdown files.")
(define-public po4a
(package
(name "po4a")
(version "0.68")
(version "0.69")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mquinson/po4a/releases/download/v"
version "/po4a-" version ".tar.gz"))
(sha256
(base32
"045i8izp2dqmkdzvnxyy5sy27ffrwl85dk8n6cmg1804ikk28qdg"))))
"15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w"))))
(build-system perl-build-system)
(arguments
(list
@ -282,7 +279,14 @@ from Markdown files.")
(add-before 'check 'disable-failing-tests
(lambda _
;; FIXME: fails despite of importing SGMLS
(delete-file "t/fmt-sgml.t"))))))
(delete-file "t/fmt-sgml.t")))
#$@(if (system-hurd?)
#~((add-after 'unpack 'skip-tests/hurd
(lambda _
(delete-file "t/cfg-multi.t")
(delete-file "t/cfg-single.t")
(delete-file "t/cfg-split.t"))))
#~()))))
(native-inputs
(list gettext-minimal
perl-module-build
@ -292,7 +296,7 @@ from Markdown files.")
;; For tests.
docbook-xml-4.1.2
perl-test-pod
texlive-tiny))
(texlive-updmap.cfg)))
(inputs
(list bash-minimal
perl-gettext

28
gnu/packages/ghostscript.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020, 2022 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -89,9 +89,12 @@ Consortium standard (ICC), approved as ISO 15076-1.")
(native-inputs
(list help2man))
(arguments
'(#:configure-flags '("--disable-static"
;; Tests require a relocatable build.
"--enable-relocatable")))
(list #:configure-flags ''("--disable-static"
;; Tests require a relocatable build.
"--enable-relocatable")
;; --enable-relocate is broken on the Hurd
#:tests? (not (or (target-hurd?)
(%current-target-system)))))
(outputs '("out" "debug"))
(home-page "https://github.com/rrthomas/libpaper")
(synopsis "Library for handling paper sizes")
@ -145,6 +148,7 @@ printing, and psresize, for adjusting page sizes.")
(package
(name "ghostscript")
(version "9.56.1")
(replacement ghostscript/fixed)
(source
(origin
(method url-fetch)
@ -198,6 +202,16 @@ printing, and psresize, for adjusting page sizes.")
'()))
#:phases
#~(modify-phases %standard-phases
#$@(if (target-hurd?)
#~((add-after 'unpack 'patch-leptonica
(lambda _
(let ((patch-file
#$(local-file
(search-patch
"ghostscript-leptonica-hurd.patch"))))
(with-directory-excursion "leptonica"
(invoke "patch" "--force" "-p1" "-i" patch-file))))))
#~())
(add-before 'configure 'create-output-directory
(lambda _
;; The configure script refuses to function if the directory
@ -266,6 +280,12 @@ output file formats and printers.")
(home-page "https://www.ghostscript.com/")
(license license:agpl3+)))
(define ghostscript/fixed
(package-with-patches
ghostscript
(search-patches "ghostscript-CVE-2023-36664.patch"
"ghostscript-CVE-2023-36664-fixup.patch")))
(define-public ghostscript/x
(package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x"))

15
gnu/packages/gl.scm
View File

@ -15,7 +15,7 @@
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
(package
(name "mesa")
(version "23.0.3")
(version "23.1.4")
(source
(origin
(method url-fetch)
@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.")
"mesa-" version ".tar.xz")))
(sha256
(base32
"1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq"))))
"0n89l7lvawh85hq2a7g5pp5v017s03qs3n4hbbff6rs8p5zs2qbj"))))
(build-system meson-build-system)
(propagated-inputs
;; The following are in the Requires.private field of gl.pc.
@ -298,7 +298,8 @@ also known as DXTn or DXTC) for Mesa.")
libxvmc
llvm-for-mesa
wayland
wayland-protocols))
wayland-protocols
`(,zstd "lib")))
(native-inputs
(list bison
flex
@ -345,7 +346,7 @@ svga,swrast,virgl")))
;; Explicitly enable Vulkan on some architectures.
#$@(match (%current-system)
((or "i686-linux" "x86_64-linux")
'("-Dvulkan-drivers=intel,amd"))
'("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast"))
((or "powerpc64le-linux" "powerpc-linux")
'("-Dvulkan-drivers=amd,swrast"))
("aarch64-linux"
@ -362,6 +363,9 @@ svga,swrast,virgl")))
;; 21.3.x releases to avoid functionality regressions.
"-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc"
;; Enable ZSTD compression for shader cache.
"-Dzstd=enabled"
;; Also enable the tests.
"-Dbuild-tests=true"
@ -517,6 +521,7 @@ svga,swrast,virgl")))
(list (search-path-specification
;; Ensure the Mesa VDPAU drivers can be found.
(variable "VDPAU_DRIVER_PATH")
(separator #f)
(files '("lib/vdpau")))))
(home-page "https://mesa3d.org/")
(synopsis "OpenGL and Vulkan implementations")

104
gnu/packages/glib.scm
View File

@ -14,7 +14,7 @@
;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@ -285,6 +285,108 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
(string-append "//" all "\n"))
(("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
(string-append "//" all "\n"))))
'())
#$@(if (system-hurd?)
'((with-directory-excursion "gio/tests"
;; TIMEOUT after 600s
(substitute* '("actions.c"
"dbus-appinfo.c"
"debugcontroller.c"
"gdbus-bz627724.c"
"gdbus-connection-slow.c"
"gdbus-exit-on-close.c"
"gdbus-export.c"
"gdbus-introspection.c"
"gdbus-method-invocation.c"
"gdbus-non-socket.c"
"gdbus-proxy-threads.c"
"gdbus-proxy-unique-name.c"
"gdbus-proxy-well-known-name.c"
"gdbus-proxy.c"
"gdbus-test-codegen.c"
"gmenumodel.c"
"gnotification.c"
"stream-rw_all.c")
(("return (g_test_run|session_bus_run)" all call)
(string-append "return 0;// " call))
((" (ret|rtv|result) = (g_test_run|session_bus_run)"
all var call)
(string-append " " var " = 0;// " call))
(("[ \t]*g_test_add_func.*;") ""))
;; commenting-out g_assert, g_test_add_func, g_test_run
;; does not help; special-case short-circuit.
(substitute* "gdbus-connection-loss.c" ;; TODO?
((" gchar \\*path;.*" all)
(string-append all " return 0;\n")))
;; FAIL
(substitute* '("appmonitor.c"
"async-splice-output-stream.c"
"autoptr.c"
"contexts.c"
"converter-stream.c"
"file.c"
"g-file-info.c"
"g-file.c"
"g-icon.c"
"gapplication.c"
"gdbus-connection-flush.c"
"gdbus-connection.c"
"gdbus-names.c"
"gdbus-server-auth.c"
"gsocketclient-slow.c"
"gsubprocess.c"
"io-stream.c"
"live-g-file.c"
"memory-monitor.c"
"mimeapps.c"
"network-monitor-race.c"
"network-monitor.c"
"pollable.c"
"power-profile-monitor.c"
"readwrite.c"
"resources.c"
"socket-service.c"
"socket.c"
"tls-bindings.c"
"tls-certificate.c"
"tls-database.c"
"trash.c"
"vfs.c")
(("return (g_test_run|session_bus_run)" all call)
(string-append "return 0;// " call))
((" (ret|rtv|result) = (g_test_run|session_bus_run)"
all var call)
(string-append " " var " = 0;// " call))
(("[ \t]*g_test_add_func.*;") ""))
;; commenting-out g_test_add_func, g_test_run does
;; not help; special-case short-circuit.
(substitute* "gsettings.c"
(("#ifdef TEST_LOCALE_PATH" all)
(string-append " return 0;\n" all)))
;; commenting-out g_test_add_func, ;; g_test_run does
;; not help; special-case short-circuit.
(substitute* "proxy-test.c"
((" gint result.*;" all)
(string-append all " return 0;\n")))
;; commenting-out g_test_add_func, g_test_run
;; does not help; special-case short-circuit.
(substitute* "volumemonitor.c"
((" gboolean ret;" all)
(string-append all " return 0;\n"))))
(with-directory-excursion "glib/tests"
;; TIMEOUT after 600s
(substitute* "thread-pool.c"
(("[ \t]*g_test_add_func.*;") ""))
;; FAIL
(substitute* "fileutils.c"
(("[ \t]*g_test_add_func.*;") ""))))
'())))
;; Python references are not being patched in patch-phase of build,
;; despite using python-wrapper as input. So we patch them manually.

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

@ -914,7 +914,7 @@ certain elements or change animation speeds.")
(define-public gnome-shell-extension-dash-to-panel
(package
(name "gnome-shell-extension-dash-to-panel")
(version "51")
(version "56")
(source (origin
(method git-fetch)
(uri (git-reference
@ -922,7 +922,7 @@ certain elements or change animation speeds.")
(commit (string-append "v" version))))
(sha256
(base32
"103pl77dhafi2ayds5yma2smv3b58zcysnd6vl5m5zavjvk35sz7"))
"17rm3wjj8zfdxgh5vp5f35vgd4mc9f9c2w77hac4vyvkgvwfzcnn"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments

61
gnu/packages/gnome.scm
View File

@ -2610,13 +2610,15 @@ forgotten when the session ends.")
(define-public evince
(package
(name "evince")
(version "44.1")
(source (origin
(method url-fetch)
(uri "mirror://gnome/sources/evince/44/evince-44.1.tar.xz")
(sha256
(base32
"0523lzk7xpfr6gir8nx80fmp1lhajm837hilmgn8zczz2nxx7bqm"))))
(version "44.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/evince/"
(version-major version) "/"
"evince-" version ".tar.xz"))
(sha256
(base32 "08inp13kksa027ij9ai10734jxdn1y7s0skbgzsyk9j739ca32rv"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -4560,28 +4562,6 @@ editors, IDEs, etc.")
(propagated-inputs (modify-inputs (package-propagated-inputs vte)
(replace "gtk+" gtk)))))
(define-public vte-ng
(package
(inherit vte)
(name "vte-ng")
(version "0.59.0")
(home-page "https://github.com/thestinger/vte-ng")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"03ffhjc0fq9p25y1b2c0a51jn7y2bc0acxsgymhcb3pyijc8ykjm"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags #~(list "-Ddocs=false")))
(synopsis "Enhanced VTE terminal widget")
(description
"VTE is a library (libvte) implementing a terminal emulator widget for
GTK+, this fork provides additional functions exposed for keyboard text
selection and URL hints.")))
;; Stable version for gtk2, required by gnurobots and lxterminal as of 2020-07.
(define-public vte/gtk+-2
(package (inherit vte)
@ -5354,8 +5334,9 @@ floating in an ocean using only your brain and a little bit of luck.")
(("meson.add_install_script" &) (string-append "# " &)))
#t)))))
(native-inputs
`(("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
(list gettext-minimal
`(,glib "bin")
pkg-config))
(inputs
(list gtk+
glib ; for gio
@ -6182,9 +6163,10 @@ throughout GNOME for API documentation).")
(license license:gpl2+)))
(define-public devhelp-with-libsoup2
(package/inherit devhelp
(inputs (modify-inputs (package-inputs devhelp)
(replace "webkitgtk" webkitgtk-with-libsoup2)))))
(hidden-package
(package/inherit devhelp
(inputs (modify-inputs (package-inputs devhelp)
(replace "webkitgtk" webkitgtk-with-libsoup2))))))
(define-public cogl
(package
@ -7004,7 +6986,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.")
docbook-xsl
dbus
elogind
fuse-3
fuse
gcr
glib
gnome-online-accounts
@ -7813,7 +7795,10 @@ to display dialog boxes from the commandline and shell scripts.")
name "-" version ".tar.xz"))
(sha256
(base32
"0h1ak3201mdc2qbf67fhcn801ddp33hm0f0c52zis1l7s6ipyb62"))))
"0h1ak3201mdc2qbf67fhcn801ddp33hm0f0c52zis1l7s6ipyb62"))
;; TODO: Remove on update as this was merged upstream. See
;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
(patches (search-patches "mutter-fix-inverted-test.patch"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@ -8712,7 +8697,7 @@ the available networks and allows users to easily switch between them.")
(define-public libxml++
(package
(name "libxml++")
(version "5.0.2")
(version "5.0.3")
(source
(origin
(method git-fetch)
@ -8721,7 +8706,7 @@ the available networks and allows users to easily switch between them.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "13jlhz57yjxapplflm8aarczxv6ll3d336y1446mr5n4ylkcc1xz"))))
(base32 "07h11vl0rv8b0w31as5xiirpx17lprkx7fimphy3f5mkwhz8njba"))))
(build-system gnu-build-system)
(propagated-inputs
(list libxml2)) ;required by .pc file

28
gnu/packages/gnucash.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com>
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,6 +29,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
@ -64,14 +66,14 @@
;; directory.
(package
(name "gnucash")
(version "5.0")
(version "5.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-" version ".tar.bz2"))
(sha256
(base32 "09482f1w4yawrdw5c2wi0jb8hwlp1x9mdvq552bf9n5f66mkphfg"))))
(base32 "0npilq0spalpg1ma956j7vlbn0yc5f0z5imy4kbyksl5ql4cnn0l"))))
(outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system)
(arguments
@ -87,13 +89,11 @@
(guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-unsupported-test
;; test test-gnc-quotes neeeds perl JSON::Parse
;; not packaged in Guix yet
(add-after 'unpack 'disable-online-test
(lambda _
(substitute* "libgnucash/app-utils/test/CMakeLists.txt"
(("gnc_add_test\\(test-gnc-quotes")
"#gnc_add_test\\(test-gnc-quotes"))))
(call-with-output-file "libgnucash/app-utils/test/CMakeLists.txt"
(lambda (port)
(display "set(CTEST_CUSTOM_TESTS_IGNORE online_wiggle)" port)))))
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; At least one test is time-related and requires this
@ -171,6 +171,7 @@
swig))
(inputs
(list aqbanking
bash-minimal
boost
glib
gtk+
@ -183,6 +184,7 @@
libxslt
perl-date-manip
perl-finance-quote
perl-json-parse
python
tzdata-for-tests
webkitgtk-with-libsoup2))
@ -212,11 +214,13 @@ installed as well as Yelp, the Gnome help browser.")
(source
(origin
(method url-fetch)
;; The filename for version 5.3 is gnucash-docs-5.2.tar.gz, not
;; gnucash-docs-5.3.tar.gz.
(uri (string-append
"mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-docs-" version revision ".tar.gz"))
version "/gnucash-docs-5.2" revision ".tar.gz"))
(sha256
(base32 "1cgdb5qrwrx6yf6dsc8zlhi67lbyjs1g82i0n53sw6n6v38dd882"))))
(base32 "16xlxwdgc0w4cg9kxg4w2f1y974cb16wq2c9icq5qrh3nj0nbsxr"))))
(build-system cmake-build-system)
;; These are native-inputs because they are only required for building the
;; documentation.
@ -264,7 +268,7 @@ to be read using the GNOME Yelp program.")
(list libgcrypt gnutls openssl gtk+))
(native-inputs
(list pkg-config))
(home-page "https://www.aquamaniac.de/sites/aqbanking/index.php")
(home-page "https://www.aquamaniac.de")
(synopsis "Utility library for networking and security applications")
(description
"This package provides a helper library for networking and security
@ -303,7 +307,7 @@ applications and libraries. It is used by AqBanking.")
(list gmp xmlsec gnutls))
(native-inputs
(list pkg-config gettext-minimal libltdl))
(home-page "https://www.aquamaniac.de/sites/aqbanking/index.php")
(home-page "https://www.aquamaniac.de")
(synopsis "Interface for online banking tasks")
(description
"AqBanking is a modular and generic interface to online banking tasks,

92
gnu/packages/gnupg.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2021 Nikita Domnitskii <nikita@domnitskii.me>
;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -94,40 +95,42 @@
(version "1.45")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
version ".tar.bz2"))
(sha256
(base32
"09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp"))))
(method url-fetch)
(uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
version ".tar.bz2"))
(sha256
(base32
"09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp"))))
(build-system gnu-build-system)
(arguments
(if (%current-target-system)
`(#:modules ((guix build gnu-build-system)
(guix build utils))
#:phases
(modify-phases %standard-phases
;; If this is left out, some generated header
;; files will be sprinkled with ‘\c’, which
;; the compiler won't like.
(add-after 'unpack 'fix-gen-lock-obj.sh
(lambda _
(substitute* "src/gen-lock-obj.sh"
(("if test -n `echo -n`") "if ! test -n `echo -n`"))))
;; When cross-compiling, some platform specific properties cannot
;; be detected. Create a symlink to the appropriate platform
;; file if required. Note that these platform files depend on
;; both the operating system and architecture!
;;
;; See Cross-Compiling section at:
;; https://github.com/gpg/libgpg-error/blob/master/README
(add-after 'unpack 'cross-symlinks
(lambda _
(define (link triplet source)
(symlink (string-append "lock-obj-pub." triplet ".h")
(string-append "src/syscfg/lock-obj-pub."
source ".h")))
,(let* ((target (%current-target-system))
(cond
((%current-target-system)
(list
#:modules '((guix build gnu-build-system)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
;; If this is left out, some generated header
;; files will be sprinkled with ‘\c’, which
;; the compiler won't like.
(add-after 'unpack 'fix-gen-lock-obj.sh
(lambda _
(substitute* "src/gen-lock-obj.sh"
(("if test -n `echo -n`") "if ! test -n `echo -n`"))))
;; When cross-compiling, some platform specific properties cannot
;; be detected. Create a symlink to the appropriate platform
;; file if required. Note that these platform files depend on
;; both the operating system and architecture!
;;
;; See Cross-Compiling section at:
;; https://github.com/gpg/libgpg-error/blob/master/README
(add-after 'unpack 'cross-symlinks
(lambda _
(define (link triplet source)
(symlink (string-append "lock-obj-pub." triplet ".h")
(string-append "src/syscfg/lock-obj-pub."
source ".h")))
#$(let* ((target (%current-target-system))
(architecture
(string-take target (string-index target #\-))))
(cond ((target-linux? target)
@ -140,8 +143,19 @@
;; configuration, as this is not correct for
;; all architectures.
(_ #t)))
(#t #t)))))))
'()))
(#t #t))))))))
((system-hurd?)
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-tests
(lambda _
(substitute*
"tests/t-syserror.c"
(("(^| )main *\\(.*" all)
(string-append all "{\n exit (77);//"))))))))
(else
'())))
(native-inputs (list gettext-minimal))
(home-page "https://gnupg.org")
(synopsis "Library of error values for GnuPG components")
@ -190,7 +204,15 @@ Daemon and possibly more in the future.")
,@(if (%current-target-system)
;; When cross-compiling, _gcry_mpih_lshift etc are undefined.
`("--disable-asm")
'()))))
'()))
,@(if (system-hurd?)
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'setenv
(lambda _
(setenv "GCRYPT_NO_BENCHMARKS" "t")))))
'())))
(outputs '("out" "debug"))
(home-page "https://gnupg.org/")
(synopsis "Cryptographic function library")

12
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.13.0")
(define %icecat-base-version "102.14.0")
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
(define %icecat-build-id "20230704000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-build-id "20230801000000") ;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
"0b1sq4cadzqi7rk3cz6k6l5bg5s02ivff2n3gznd2rdzwhysngzw"))))
"1vpglmqm97ac3rs273qv7kldkrkawyhdnwwqhvyjqiwaq20m1f0s"))))
;; The upstream-icecat-base-version may be older than the
;; %icecat-base-version.
(upstream-icecat-base-version "102.13.0")
(gnuzilla-commit "8c8a8ecc9322b0954e3d51f661866dbde1e6b1c3")
(upstream-icecat-base-version "102.14.0")
(gnuzilla-commit "ac19d793c76732f9e5623e25fbf31287255a4ae7")
(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
"1x382a2v1djbf7dv5gs05kj48jj7inw9czi9r3cl57frn4ilfzmq"))))
"0fghxy6d4102i4fsyj5x74v6q94kdfbszmirjbd63wlw1d8sy3cs"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.

20
gnu/packages/graphics.scm
View File

@ -1642,17 +1642,19 @@ exec -a \"$0\" ~a/.brdf-real~%"
(list qttools-5)) ;for 'qmake'
(inputs
(list qtbase-5 mesa glew freeglut zlib))
(home-page "https://www.disneyanimation.com/technology/brdf.html")
(home-page
(string-append "https://web.archive.org/web/20190115030100/"
"https://www.disneyanimation.com/technology/brdf.html"))
(synopsis
"Analyze bidirectional reflectance distribution functions (BRDFs)")
"@acronym{BRDF, bidirectional reflectance distribution function} analyzer")
(description
"BRDF Explorer is an application that allows the development and analysis
of bidirectional reflectance distribution functions (BRDFs). It can load and
plot analytic BRDF functions (coded as functions in OpenGL's GLSL shader
language), measured material data from the MERL database, and anisotropic
measured material data from MIT CSAIL. Graphs and visualizations update in
real time as parameters are changed, making it a useful tool for evaluating
and understanding different BRDFs (and other component functions).")
of @acronym{BRDF, bidirectional reflectance distribution functions}. It can
load and plot analytic BRDF functions (coded as functions in OpenGL's GLSL
shader language), measured material data from the MERL database, and anisotropic
measured material data from MIT CSAIL. Graphs and visualizations update in real
time as parameters are changed, making it a useful tool for evaluating and
understanding different BRDFs (and other component functions).")
(license license:ms-pl))))
(define-public agg
@ -2470,7 +2472,7 @@ generated discrete signed distance field using the cubic spline kernel.
(list doxygen graphviz
;; TODO: Fix failing LaTeX invocation (which results in equations
;; being inserted literally into PNGs rather than being typeset).
;;texlive-tiny
;; (texlive-updmap.cfg)
perl)) ;used to generate Fortran headers
(inputs

24
gnu/packages/graphviz.scm
View File

@ -379,22 +379,16 @@ graphs in Graphviz's DOT language, written in pure Python.")
;; (see:
;; https://github.com/kjellmf/dot2tex/issues/94).
"-k" "not test_semicolon")))))))
(native-inputs (list python-pytest))
(native-inputs
(list python-pytest
(texlive-updmap.cfg
(list texlive-pgf
texlive-preview
texlive-pstricks
texlive-xcolor
texlive-xkeyval))))
(inputs (list graphviz))
(propagated-inputs
(list python-pyparsing
;; These TeX dependencies are propagated to make it easier to build
;; the resulting generated TeX files, which \usepackage them.
texlive-bin
texlive-amsmath
texlive-graphics
texlive-latex-geometry
texlive-latex-base
texlive-latex-preview
texlive-latex-xkeyval
texlive-pgf
texlive-pstricks
texlive-xcolor))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/kjellmf/dot2tex")
(synopsis "Graphviz to LaTeX converter")
(description

63
gnu/packages/gtk.scm
View File

@ -35,6 +35,7 @@
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -194,15 +195,21 @@ such as mate-panel and xfce4-panel.")
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))))
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
`(,@(if (target-hurd?)
'()
`(("gobject-introspection" ,gobject-introspection)))
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(inputs
`(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap
("drm" ,libdrm)
,@(if (target-hurd?)
'()
`(("drm" ,libdrm)))
("ghostscript" ,ghostscript)
("libspectre" ,libspectre)
("poppler" ,poppler)))
,@(if (target-hurd?)
'()
`(("poppler" ,poppler)))))
(propagated-inputs
`( ;; ("cogl" ,cogl)
;; ("directfb" ,directfb)
@ -269,11 +276,13 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
;; There are all in the Requires or Requires.private field of '.pc'.
(list glib graphite2 icu4c))
(native-inputs
(list `(,glib "bin") ;for glib-mkenums
gobject-introspection
pkg-config
python-wrapper
which))
(append (list `(,glib "bin")) ;for glib-mkenums
(if (target-hurd?)
'()
(list gobject-introspection))
(list pkg-config
python-wrapper
which)))
(arguments
(list #:configure-flags
#~(list "--with-graphite2"
@ -286,20 +295,6 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
"See 'COPYING' in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/")))
(define-public harfbuzz-5
(package
(inherit harfbuzz)
(version "5.3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/harfbuzz/harfbuzz"
"/releases/download/" version "/harfbuzz-"
version ".tar.xz"))
(sha256
(base32
"0ka3nkk2lks2lgakq02vyibwdziv11dkpa2brkx230asnyby0v2a"))))))
(define-public libdatrie
(package
(name "libdatrie")
@ -406,12 +401,15 @@ applications.")
(list bash-minimal
zlib))
(native-inputs
(list `(,glib "bin") ;glib-mkenums, etc.
gobject-introspection ;g-ir-compiler, etc.
help2man
perl
pkg-config
python-wrapper))
(append (list `(,glib "bin")) ;glib-mkenums, etc.
(if (target-hurd?)
'()
(list gobject-introspection)) ;g-ir-compiler, etc.
(list
help2man
perl
pkg-config
python-wrapper)))
(synopsis "Text and font handling library")
(description "Pango is a library for laying out and rendering of text, with
an emphasis on internationalization. Pango can be used anywhere that text
@ -2402,17 +2400,20 @@ does not deal with windowing system surfaces, drawing, scene graphs, or input.")
(define-public spread-sheet-widget
(package
(name "spread-sheet-widget")
(version "0.7")
(version "0.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://alpha.gnu.org/gnu/ssw/"
"spread-sheet-widget-" version ".tar.gz"))
(sha256
(base32 "09rzgp7gabnzab460x874a1ibgyjiibpwzsz5srn9zs6jv2jdxjb"))))
(base32 "0jwmx5i02jwmkp6gci2mapqglh2g3a0092wns185hfygiwlxi2c5"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
#~(list "--disable-static")))
(native-inputs
(list `(,glib "bin") ; for glib-genmarshal, etc.
(list `(,glib "bin") ; for glib-genmarshal, etc.
pkg-config))
;; In 'Requires' of spread-sheet-widget.pc.
(propagated-inputs

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

@ -4044,12 +4044,13 @@ feature-set, fully programmable in Guile Scheme.")
(inputs
(list vigra vigra-c guile-2.2))
(native-inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-booktabs
texlive-lm
texlive-siunitx
texlive-standalone
texlive-xcolor
texlive-fonts-iwona)))
`(("texlive" ,(texlive-updmap.cfg
(list texlive-booktabs
texlive-iwona
texlive-lm
texlive-siunitx
texlive-standalone
texlive-xcolor)))
("pkg-config" ,pkg-config)))
(propagated-inputs
`(("guile-lib" ,guile2.2-lib)))

51
gnu/packages/guile.scm
View File

@ -212,8 +212,13 @@ without requiring the source code to be rewritten.")
(rename-file "test-suite/tests/srfi-18.test" "srfi-18.test")
;; failed to remove 't-guild-compile-7215.go.tdL7yC
(substitute* "test-suite/standalone/Makefile.in"
(("test-guild-compile ") ""))
#t)))
(("test-guild-compile ") "")))))
'())
,@(if (system-hurd?)
'((add-after 'unpack 'disable-threads.tests
(lambda _
;; Many tests hang, esp. (join-thread ..), also others.
(rename-file "test-suite/tests/threads.test" "threads.test"))))
'())
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
@ -286,7 +291,12 @@ without requiring the source code to be rewritten.")
(if (target-x86-32?) ;<https://issues.guix.gnu.org/49368>
`(append '("--disable-static")
'("CFLAGS=-g -O2 -fexcess-precision=standard"))
flags))))
flags))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
#$@(if (system-hurd?)
#~((delete 'disable-threads.tests))
'())))))
(properties '((timeout . 72000) ;20 hours
(max-silent-time . 36000))) ;10 hours (needed on ARM
@ -378,6 +388,19 @@ without requiring the source code to be rewritten.")
(search-patch "guile-hurd-posix-spawn.patch")))
(invoke "patch" "--force" "-p1" "-i" patch))))
#~())
#$@(if (system-hurd?)
#~((add-after 'unpack 'disable-popen.test-no-duplicate
;; This test hangs on the Hurd.
(lambda _
(substitute* "test-suite/tests/popen.test"
(("\\(pass-if \"no duplicate\".*" all)
(string-append
all
(object->string
'(when (string-ci= "GNU"
(vector-ref (uname) 0))
(throw 'unresolved)))))))))
#~())
#$@(if (target-ppc32?)
#~((add-after 'unpack 'adjust-bootstrap-flags
(lambda _
@ -580,8 +603,8 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
"1l7ik4q4zk7vq4m3gnwizc0b64b1mdr31hxqlzxs94xaf2lvi7s2"))))
(arguments
(substitute-keyword-arguments (package-arguments guile-2.2)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
((#:phases phases)
#~(modify-phases #$phases
(replace 'bootstrap
(lambda _
;; Disable broken tests.
@ -594,8 +617,7 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
(string-append "#;" m)))
(patch-shebang "build-aux/git-version-gen")
(invoke "sh" "autogen.sh")
#t))))))
(invoke "sh" "autogen.sh")))))))
(native-inputs
(modify-inputs (package-native-inputs guile-2.2)
(prepend autoconf
@ -829,7 +851,20 @@ type system, elevating types to first-class status.")
(lambda _
(substitute* "Makefile.am"
((".*tests/blob\\.scm.*") ""))))))
'())))
'())
,@(if (system-hurd?)
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-tests/hurd
(lambda _
(substitute* "tests/proxy.scm"
(("\\(test-begin.*" all)
(string-append
all
"(when (string-ci= \"GNU\" (vector-ref (uname) 0))\n"
" (test-skip 1))\n")))))))
'())))
(native-inputs
(list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
(inputs

163
gnu/packages/hardware.scm
View File

@ -250,7 +250,7 @@ sets, and tools to deal with register databases.")
;; their references.
;; TODO: package edid-decode and add "bin/edid-decode" below:
(define need-progs (list "sbin/dmidecode" "sbin/smartctl"
"sbin/lspci" "bin/lsusb"))
"bin/lspci" "bin/lsusb"))
(wrap-script hw-probe
(list "PERL5LIB" 'prefix (list (getenv "PERL5LIB")))
(list "PATH" 'prefix
@ -331,7 +331,7 @@ operability and find drivers.")
(define-public hwinfo
(package
(name "hwinfo")
(version "22.2")
(version "23.2")
(home-page "https://github.com/openSUSE/hwinfo")
(source
(origin
@ -342,87 +342,77 @@ operability and find drivers.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1lfzcyiipxwi8rh0aw5sy7n8x986b9f9pa9g048rxn6k7anfpxk7"))
(base32 "0d9nhhi64d3i9x1bh3ksj0h5z2p4pwa0z88bc0jra9s39nf6q230"))
(modules
'((guix build utils)))
(snippet
`(begin
;; Remove git2log program file.
(delete-file "git2log")
;; Remove variables that depend on git2log.
(substitute* "Makefile"
(("GIT2LOG.*\\:=.*$") "")
(("GITDEPS.*\\:=.*$") "")
(("BRANCH.*\\:=.*$") ""))
;; Create version file.
(call-with-output-file "VERSION"
(lambda (port)
(format port ,version)))))))
#~(begin
;; Remove git2log program file.
(delete-file "git2log")
;; Remove variables that depend on git2log.
(substitute* "Makefile"
(("GIT2LOG.*\\:=.*$") "")
(("GITDEPS.*\\:=.*$") "")
(("BRANCH.*\\:=.*$") ""))
;; Create version file.
(call-with-output-file "VERSION"
(lambda (port) (format port #$version)))))))
(build-system gnu-build-system)
(outputs '("out" "lib" "doc"))
(arguments
`(#:tests? #f ; no test-suite available
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (assoc-ref outputs "lib"))
(doc (assoc-ref outputs "doc"))
(incl-dir (string-append lib "/include"))
(lib-dir (string-append lib "/lib"))
(sbin-dir (string-append out "/sbin"))
(share-dir (string-append out "/share"))
(doc-dir (string-append doc "/share/doc")))
;; Generate HTML documentation in the output "doc".
(mkdir-p doc-dir)
(substitute* "doc/libhd.doxy"
(("OUTPUT_DIRECTORY.*=.*libhd")
(string-append "OUTPUT_DIRECTORY = " doc-dir "/libhd")))
;; Correct values of the version and install directories.
(substitute* "Makefile"
(("VERSION.*\\:=.*$")
(string-append "VERSION := " ,version "\n"))
(("LIBDIR.*\\?=.*$")
(string-append "LIBDIR ?= " lib-dir "\n"))
(("/usr/include") incl-dir)
(("/(usr|var)/(lib|lib64)") lib-dir)
(("/usr/sbin") sbin-dir)
(("/usr/share") share-dir)
(("\\$\\(DESTDIR\\)/sbin ") ""))
;; Add the "lib" output to the run-path.
(substitute* "Makefile.common"
(("-Lsrc")
(string-append "-Lsrc " "-Wl,-rpath=" lib-dir)))
;; Correct program name of the lexical analyzer.
(substitute* "src/isdn/cdb/Makefile"
(("lex isdn_cdb.lex") "flex isdn_cdb.lex"))
;; Patch pkg-config file to point to the "lib" output.
(substitute* "hwinfo.pc.in"
(("/usr") lib)))))
(delete 'configure)
(replace 'build
(lambda _
(setenv "CC" ,(cc-for-target))
(invoke "make" "shared")
(invoke "make" "doc")))
(add-after 'install 'install-manpages
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man-dir (string-append out "/share/man"))
(man1-dir (string-append man-dir "/man1"))
(man8-dir (string-append man-dir "/man8")))
(for-each
(lambda (x) (install-file x man1-dir))
(find-files "doc" "\\.1$"))
(for-each
(lambda (y) (install-file y man8-dir))
(find-files "doc" "\\.8$"))))))))
(list
#:tests? #f ; no test-suite available
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "LIBDIR=" #$output:lib "/lib")
(string-append "VERSION=" #$version))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(let ((include (string-append #$output:lib "/include"))
(lib (string-append #$output:lib "/lib"))
(sbin (string-append #$output "/sbin"))
(share (string-append #$output "/share"))
(doc (string-append #$output:doc "/share/doc")))
;; Generate HTML documentation in the "doc" output.
(mkdir-p doc)
(substitute* "doc/libhd.doxy"
(("OUTPUT_DIRECTORY.*=.*libhd")
(string-append "OUTPUT_DIRECTORY = " doc "/libhd")))
;; Correct values of the version and install directories.
(substitute* "Makefile"
(("/usr/include") include)
(("/(usr|var)/(lib|lib64)") lib)
(("/usr/sbin") sbin)
(("/usr/share") share)
(("\\$\\(DESTDIR\\)/sbin ") ""))
;; Add the "lib" output to the run-path.
(substitute* "Makefile.common"
(("-Lsrc")
(string-append "-Lsrc " "-Wl,-rpath=" lib)))
;; Correct program name of the lexical analyzer.
(substitute* "src/isdn/cdb/Makefile"
(("lex isdn_cdb.lex") "flex isdn_cdb.lex"))
;; Patch pkg-config file to point to the "lib" output.
(substitute* "hwinfo.pc.in"
(("/usr") #$output:lib)))))
(delete 'configure)
(replace 'build
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "shared" make-flags)
(apply invoke "make" "doc" make-flags)))
(add-after 'install 'install-man-pages
(lambda _
(for-each
(lambda (file)
(install-file file (string-append #$output "/share/man/man"
(string-take-right file 1))))
(find-files "doc" "\\.[0-9]$")))))))
(native-inputs
(list doxygen flex perl pkg-config))
(inputs
`(("libx86emu" ,libx86emu)
("util-linux:lib" ,util-linux "lib")))
(list libx86emu `(,util-linux "lib")))
(synopsis "Hardware information tool")
(description "HwInfo is used to probe for the hardware present in the system.
It can be used to generate a system overview log which can be later used for
@ -488,14 +478,14 @@ RGB animations.")
(define-public ddcutil
(package
(name "ddcutil")
(version "1.4.1")
(version "1.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.ddcutil.com/tarballs/"
"ddcutil-" version ".tar.gz"))
(sha256
(base32 "14svdjpw9xn1czl4vff4jg2i9bp83lxcbzxj7hxn63z3gzacaj4k"))))
(base32 "015l13j7fp9fmlc5d7m6nfjbzjbp8vc0g5py35ljw7li2xk16v60"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@ -598,8 +588,6 @@ human-readable format and checks if it conforms to the standards.")
(license license:expat))))
(define-public h-client
;; The Python 3 port hasn't yet been integrated into the main branch
;; (currently lives in the 'python3-port' branch).
(let ((commit "e6c78b16e034ccf78ae9cb4c29268c2f57a30bfc")
(revision "1"))
(package
@ -609,7 +597,7 @@ human-readable format and checks if it conforms to the standards.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/h-client.git")
(url "https://git.savannah.gnu.org/git/h-client.git/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -638,7 +626,7 @@ human-readable format and checks if it conforms to the standards.")
;; Namespace GdkPixbuf not available".
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
`("PATH" = (,(dirname (search-input-file
inputs "sbin/lspci"))
inputs "bin/lspci"))
,(dirname (search-input-file
inputs "bin/lsusb"))))))))))
(inputs
@ -1399,7 +1387,7 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.")
(define-public liblxi
(package
(name "liblxi")
(version "1.18")
(version "1.20")
(source
(origin
(method git-fetch)
@ -1408,19 +1396,20 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0cbnnd5qmchlr586349j5y4qv5w3bw9nmpbd3k6sq9vwvqh5dmns"))))
(base32 "1cc95ggs64jqq9lk5c8fm4nk6fdnv1x7lr3k4znamj0vv6w22bcd"))))
(build-system meson-build-system)
(native-inputs
(list cmake pkg-config))
(inputs
(list avahi libtirpc libxml2))
(home-page "https://lxi-tools.github.io/")
(synopsis "LAN eXtensions for Instrumentation library")
(synopsis "@acronym{LXI, LAN eXtensions for Instrumentation} library")
(description
"This package provides library for LAN eXtensions for Instrumentation
based on the LXI Consortium standard which defines the communication protocols
for modern instrumentation and data acquision systems using Ethernet.")
"This library offers a simple API for communicating with instruments
compatible with the @acronym{LXI, LAN eXtensions for Instrumentation} standard
that defines communication protocols for instrumentation and data acquisition
systems using Ethernet. Applications can use liblxi to discover instruments on
your network, send SCPI commands, and receive responses.")
(license license:bsd-3)))
(define-public lxi-tools

2
gnu/packages/haskell-apps.scm
View File

@ -121,7 +121,7 @@ library. It is primarily used with HLint's @code{--refactor} flag.")
(arguments
`(#:cabal-revision ("2"
"1kpgyfl5njxp4c8ax5ziag1bhqvph3h0pn660v3vpxalz8d1j6xv")))
(home-page "http://www.haskell.org/cabal/")
(home-page "https://www.haskell.org/cabal/")
(synopsis "Command-line interface for Cabal and Hackage")
(description
"The cabal command-line program simplifies the process of managing

56
gnu/packages/haskell-crypto.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 rsiddharth <s@ricketyspace.net>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019, 2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
@ -290,6 +290,37 @@ public key algorithms, key derivation numbers, cryptographic random number
generators, and more.")
(license license:bsd-3)))
(define-public ghc-curve25519
(package
(name "ghc-curve25519")
(version "0.2.7")
(source
(origin
(method url-fetch)
(uri (hackage-uri "curve25519" version))
(sha256
(base32 "1p8b1lppkvc19974hr43lcqdi4nj55j2nf7gsnp8dn7gyf23aayq"))))
(build-system haskell-build-system)
(native-inputs
(list ghc-hunit
ghc-quickcheck
ghc-tagged
ghc-test-framework
ghc-test-framework-hunit
ghc-test-framework-quickcheck2))
(inputs
(list ghc-crypto-api))
(properties '((upstream-name . "curve25519")))
(home-page "https://github.com/acw/curve25519")
(synopsis "Fast implementations of the curve25519 elliptic curve primitives.")
(description
"This module provides Haskell bindings and extensions to the curve25519-donna
codebase. It's a pretty straightforward implementation of the basic
cryptographic routines you'd want from a project that uses curve25519: key
generation, and key agreement. For further functionality, you'll want to look
elsewhere.")
(license license:bsd-3)))
(define-public ghc-digest
(package
(name "ghc-digest")
@ -716,6 +747,29 @@ stable. You may also be interested in the tls package,
implementation of SSL.")
(license license:public-domain)))
(define-public ghc-hsopenssl-x509-system
(package
(name "ghc-hsopenssl-x509-system")
(version "0.1.0.4")
(source
(origin
(method url-fetch)
(uri (hackage-uri "HsOpenSSL-x509-system" version))
(sha256
(base32 "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr"))))
(build-system haskell-build-system)
(inputs
(list ghc-hsopenssl))
(properties '((upstream-name . "HsOpenSSL-x509-system")))
(home-page "https://github.com/redneb/HsOpenSSL-x509-system")
(synopsis "Use the system's native CA certificate store with HsOpenSSL")
(description
"This package provides a cross-platform library that tries to find
a (reasonable) CA certificate bundle that can be used with HsOpenSSL to verify
the certificates of remote peers. It is for HsOpenSSL what x509-system is for
the tls package, and borrows some ideas from x509-system.")
(license license:bsd-3)))
(define-public ghc-openssl-streams
(package
(name "ghc-openssl-streams")

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

@ -12,7 +12,7 @@
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 rsiddharth <s@ricketyspace.net>
;;; Copyright © 2017–2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017–2019, 2021, 2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Tonton <tonton@riseup.net>
;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -2378,6 +2378,60 @@ and incidental whitespace will remain unchanged. The library aims to produce
human-readable error messages when things go wrong.")
(license license:bsd-3)))
(define-public ghc-config-schema
(package
(name "ghc-config-schema")
(version "1.2.2.0")
(source
(origin
(method url-fetch)
(uri (hackage-uri "config-schema" version))
(sha256
(base32 "10mp76j2gxcb51865lb6cf3nkc2nc7fwarkghb6yz71q6sbrg3yx"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision ("3"
"16rwj3vcafq4fqqh5rq1na1g4syk63kki2gjinb6yj3h8s59vpp7")))
(inputs
(list ghc-config-value
ghc-free
ghc-kan-extensions
ghc-semigroupoids))
(properties '((upstream-name . "config-schema")))
(home-page "https://github.com/glguy/config-schema")
(synopsis "Schema definitions for the config-value package")
(description
"This package makes it possible to define schemas for use when loading
configuration files using the config-value format. These schemas can be used to
process a configuration file into a Haskell value or to automatically generate
documentation for the file format.")
(license license:isc)))
(define-public ghc-config-value
(package
(name "ghc-config-value")
(version "0.8.3")
(source
(origin
(method url-fetch)
(uri (hackage-uri "config-value" version))
(sha256
(base32 "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision ("3"
"1qiqaad3zpgvwpcb5p1q9aaska82bfm75qrsfdcdlwc70r7w57gj")))
(native-inputs
(list ghc-alex ghc-happy))
(properties '((upstream-name . "config-value")))
(home-page "https://github.com/glguy/config-value")
(synopsis "Simple, layout-based value language similar to YAML or JSON")
(description
"This package implements a language similar to YAML or JSON but with fewer
special cases and fewer dependencies. It emphasizes layout structure for
sections and lists, and requires quotes around strings.")
(license license:expat)))
(define-public ghc-configurator
(package
(name "ghc-configurator")
@ -5339,6 +5393,35 @@ interface for statistics based on hmatrix and GSL.")
functions for Haskell.")
(license license:gpl3+)))
(define-public ghc-hookup
(package
(name "ghc-hookup")
(version "0.7")
(source
(origin
(method url-fetch)
(uri (hackage-uri "hookup" version))
(sha256
(base32 "02prkwj4rj8g330z17bpjh7hpwfdvasaxsk74mcvbi03gjpydrib"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision ("1"
"1x4hxcb81rczpywcda3s9jbh2gs1sfwvd7wzv3cxxkbd4smlrh1r")))
(inputs
(list ghc-async
ghc-network
ghc-attoparsec
ghc-hsopenssl
ghc-hsopenssl-x509-system))
(properties '((upstream-name . "hookup")))
(home-page "https://github.com/glguy/irc-core")
(synopsis "Abstracts network connections over SOCKS5 and TLS")
(description
"This package provides an abstraction for communicating with line-oriented
network services while abstracting over the use of SOCKS5 and TLS (via
OpenSSL)")
(license license:isc)))
(define-public ghc-hostname
(package
(name "ghc-hostname")
@ -6089,6 +6172,32 @@ Jupyter notebooks, along with @code{ToJSON} and @code{FromJSON}
instances for conversion to and from JSON .ipynb files.")
(license license:bsd-3)))
(define-public ghc-irc-core
(package
(name "ghc-irc-core")
(version "2.11")
(source
(origin
(method url-fetch)
(uri (hackage-uri "irc-core" version))
(sha256
(base32 "13jkfb30kynqd55c2slxjg98lr076rn1ymsxniwp0bssjzizgnfc"))))
(build-system haskell-build-system)
(native-inputs
(list ghc-hunit))
(inputs
(list ghc-base64-bytestring
ghc-attoparsec
ghc-hashable
ghc-primitive ghc-vector))
(properties '((upstream-name . "irc-core")))
(home-page "https://github.com/glguy/irc-core")
(synopsis "IRC core library for glirc")
(description
"This is the IRC core library for glirc. The client is available in its own
glirc package.")
(license license:isc)))
(define-public ghc-iwlib
(package
(name "ghc-iwlib")
@ -13775,6 +13884,48 @@ and from some existing type with an Unbox instance.")
given term should not exist.")
(license license:bsd-3)))
(define-public ghc-vty
(package
(name "ghc-vty")
(version "5.35.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "vty" version))
(sha256
(base32 "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k"))))
(build-system haskell-build-system)
(native-inputs
(list ghc-hunit
ghc-quickcheck
ghc-quickcheck-assertions
ghc-random
ghc-smallcheck
ghc-string-qq
ghc-test-framework
ghc-test-framework-smallcheck
ghc-test-framework-hunit))
(inputs
(list ghc-ansi-terminal
ghc-blaze-builder
ghc-hashable
ghc-microlens
ghc-microlens-mtl
ghc-microlens-th
ghc-parallel
ghc-utf8-string
ghc-vector))
(arguments
`(#:cabal-revision ("1"
"1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5")))
(properties '((upstream-name . "vty")))
(home-page "https://github.com/jtdaugherty/vty")
(synopsis "Simple terminal UI library")
(description
"vty is a terminal GUI library in the niche of ncurses, intended to be easy
to use and to provide good support for common terminal types.")
(license license:bsd-3)))
(define-public ghc-wave
(package
(name "ghc-wave")
@ -15813,7 +15964,7 @@ benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/be
"0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa"))))
(build-system haskell-build-system)
(properties '((upstream-name . "Cabal-syntax")))
(home-page "http://www.haskell.org/cabal/")
(home-page "https://www.haskell.org/cabal/")
(synopsis "A library for working with .cabal files")
(description
"This library provides tools for reading and manipulating the .cabal file format.

5
gnu/packages/haskell.scm
View File

@ -1271,8 +1271,11 @@ interactive environment for the functional language Haskell.")
;; next rebuild. Note that they are required for GHC 8.10 and 9.2.
#$@(if (string-prefix? "i686" (or (%current-target-system)
(%current-system)))
#~((add-after 'skip-failing-tests-i686 'skip-failing-tests-i686-cuirass
#~((add-after 'skip-failing-tests-i686 'skip-more-failing-tests-i686
(lambda _
(substitute* '("testsuite/tests/profiling/should_run/all.T")
(("test\\('T11627a', \\[ ")
"test('T11627a', [ when(arch('i386'), skip), "))
(substitute* '("testsuite/driver/testlib.py")
((".*changes being made to the file will invalidate the code signature.*")
"")

13
gnu/packages/high-availability.scm
View File

@ -106,7 +106,7 @@ realistic with today's hardware.")
(define-public libqb
(package
(name "libqb")
(version "2.0.6")
(version "2.0.7")
(source (origin
(method url-fetch)
(uri (string-append
@ -114,17 +114,18 @@ realistic with today's hardware.")
version "/libqb-" version ".tar.xz"))
(sha256
(base32
"071k916vz9ppyb69rpk792fzjs3nf3chakn10i496scgiqh49rzi"))))
"0xd51wh7gdindh6fzi62r4xp9lkayggb1rqsprqmjkh1m71gnvin"))))
(build-system gnu-build-system)
(native-inputs (list autoconf automake libtool libxml2 pkg-config))
(native-inputs (list pkg-config))
(inputs (list libxml2))
(home-page "https://clusterlabs.github.io/libqb/")
(synopsis
"Library providing high performance logging, tracing, ipc, and poll")
"Library providing high-performance logging, tracing, IPC, and polling")
(description
"Libqb is a library with the primary purpose of providing
high-performance, reusable features for client-server architecture, such as
logging, tracing, inter-process communication (IPC), and polling. Libqb is
not intended to be an all-encompassing library, but instead provide focused
logging, tracing, @acronym{IPC, inter-process communication} and polling. Libqb
is not intended to be an all-encompassing library, but instead provide focused
APIs that are highly tuned for maximum performance for client-server
applications.")
(license license:lgpl2.1)))

434
gnu/packages/hurd.scm
View File

@ -3,9 +3,10 @@
;;; Copyright © 2018, 2020-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -33,6 +34,8 @@
#:use-module (guix build-system trivial)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages disk)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gnupg)
@ -45,8 +48,9 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages xorg) ; libpciaccess
#:use-module (guix git-download))
#:use-module (gnu packages xorg) ;libpciaccess-0.17
#:use-module (guix git-download)
#:use-module (ice-9 match))
(define (hurd-source-url version)
(string-append "mirror://gnu/hurd/hurd-"
@ -55,7 +59,7 @@
(define-public gnumach-headers
(package
(name "gnumach-headers")
(version "1.8+git20220827") ;; This is an upstream tag
(version "1.8+git20221224") ;; This is an upstream tag
(source
(origin
(method git-fetch)
@ -65,8 +69,7 @@
(file-name (git-file-name "gnumach" version))
(sha256
(base32
"07qlaf8vw029y7xdnhjyiiyn788zjzwmyzj79inz7idpswqsnyhf"))
(patches (search-patches "gnumach-add-missing-const_mach_port_name_array_t-type.patch"))))
"0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -75,19 +78,10 @@
(lambda _
(invoke "make" "install-data")))
(delete 'build))
;; GNU Mach supports only IA32 currently, so cheat so that we can at
;; least install its headers.
,@(if (%current-target-system)
'()
;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-06/msg00042.html>
;; <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00716.html>
'(#:configure-flags '("--build=i586-pc-gnu"
"--host=i686-linux-gnu")))
#:tests? #f))
(native-inputs
(list autoconf automake texinfo-4))
(supported-systems %hurd-systems)
(home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
(synopsis "GNU Mach kernel headers")
(description
@ -97,24 +91,20 @@
(define-public mig
(package
(name "mig")
(version "1.8+git20220827")
(version "1.8+git20230520")
(source (origin
(method url-fetch)
;; XXX: Version 2.35 of glibc can only be built with an
;; unreleased version of MiG:
;; <https://lists.gnu.org/archive/html/bug-hurd/2023-03/msg00025.html>.
;; It cannot be fetched from Git though, as the extra dependency
;; on Autoconf/Automake would complicate bootstrapping.
(uri (string-append "mirror://gnu/guix/mirror/mig-"
version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/hurd/mig.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2"))
(patches (search-patches "mig-cpu.h-generation.patch"))))
"10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz"))))
(build-system gnu-build-system)
;; Flex is needed both at build and run time.
(inputs (list gnumach-headers flex))
(native-inputs (list flex bison))
(native-inputs (list autoconf automake flex bison))
(arguments
(list #:tests? #f
#:phases
@ -143,10 +133,10 @@ communication.")
;; This commit is now slightly behind 0.9.git20220818 as this one needs a
;; newer glibc
(let ((revision "2")
(commit "3ff70531ee672f431dbb0c11f286bfe85dce98fc"))
(commit "v0.9.git20230216"))
(package
(name "hurd-headers")
(version (git-version "0.9" revision commit))
(version commit)
(source (origin
(method git-fetch)
(uri (git-reference
@ -154,19 +144,14 @@ communication.")
(commit commit)))
(sha256
(base32
"1jb9f2h2v4lf6acsji1c12aqg3pixkvjdyb4q6axkd8jp22fdgc0"))
(file-name (git-file-name name version))
(patches (search-patches "hurd-add-without-rump-configure-option.patch"
"hurd-fix-types-of-read-write-and-readables-methods.patch"
"hurd-fix-types-of-read-write-and-readables-methods-2.patch"))))
"0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
automake
(if (%current-target-system)
(let* ((cross-base (resolve-interface '(gnu packages cross-base)))
(cross-mig (module-ref cross-base 'cross-mig)))
(cross-mig (%current-target-system)))
(cross-mig (%current-target-system))
mig)))
(arguments
`(#:phases
@ -195,9 +180,11 @@ communication.")
"ac_cv_func_exec_exec_paths=no"
"ac_cv_func__hurd_exec_paths=no"
"ac_cv_func__hurd_libc_proc_init=no"
"ac_cv_func_file_futimens=no")
"ac_cv_func_file_futimens=no"
"ac_cv_lib_acpica_acpi_init=no")
#:tests? #f))
(supported-systems %hurd-systems)
(home-page "https://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd headers")
(description
@ -208,36 +195,25 @@ Library and other user programs.")
(define-public hurd-minimal
(package (inherit hurd-headers)
(name "hurd-minimal")
(inputs (list glibc/hurd-headers))
(inputs (list glibc/hurd-headers gnumach-headers))
(arguments
(substitute-keyword-arguments (package-arguments hurd-headers)
((#:make-flags flags '())
#~'(#$(string-append "lib-subdirs=libshouldbeinlibc libihash libstore")
"prog-subdirs="
"other-subdirs="
#$@flags))
((#:phases _)
'(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; We need to copy libihash.a to the output directory manually,
;; since there is no target for that in the makefile.
(mkdir-p (string-append out "/include"))
(copy-file "libihash/ihash.h"
(string-append out "/include/ihash.h"))
(mkdir-p (string-append out "/lib"))
(copy-file "libihash/libihash.a"
(string-append out "/lib/libihash.a"))
#t)))
(replace 'build
(lambda _
;; Install <assert-backtrace.h> & co.
(invoke "make" "-Clibshouldbeinlibc"
"../include/assert-backtrace.h")
;; Build libihash.
(invoke "make" "-Clibihash" "libihash.a")))))))
#~%standard-phases)
((#:validate-runpath? validate-runpath? #f)
#f)))
(supported-systems %hurd-systems)
(home-page "https://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd libraries")
(description
"This package provides libihash, needed to build the GNU C
Library for GNU/Hurd.")
"This package provides libshouldbeinlibc, libihash, libstore, libports,
libiohelp, libfshelp, libtrivfs, and libmachdev, needed to build the GNU C
Library, Parted and netdde for GNU/Hurd.")
(license gpl2+)))
(define-public hurd-core-headers
@ -265,6 +241,7 @@ Library for GNU/Hurd.")
directories)
#t))))))
(inputs (list gnumach-headers hurd-headers hurd-minimal))
(supported-systems %hurd-systems)
(synopsis "Union of the Hurd headers and libraries")
(description
"This package contains the union of the Mach and Hurd headers and the
@ -276,12 +253,22 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(package
(inherit gnumach-headers)
(name "gnumach")
(source (origin
(inherit (package-source gnumach-headers))
(patches
(append
(search-patches "gnumach-support-noide.patch")
(origin-patches (package-source gnumach-headers))))))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
((#:make-flags flags ''())
`(cons "CFLAGS=-fcommon" ,flags))
((#:configure-flags flags ''())
`(cons "--enable-kdb" ,flags)) ;enable kernel debugger
`(cons* "--enable-kdb" ;enable kernel debugger
"--disable-net-group"
"--disable-pcmcia-group"
"--disable-wireless-group"
,flags))
((#:phases phases '%standard-phases)
`(modify-phases %standard-phases
(add-after 'install 'produce-image
@ -294,13 +281,11 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(list autoconf
automake
(if (%current-target-system)
(let* ((cross-base (resolve-interface '(gnu packages cross-base)))
(cross-mig (module-ref cross-base 'cross-mig)))
(cross-mig (%current-target-system)))
mig)
(cross-mig (%current-target-system))
mig)
perl
texinfo-4))
(supported-systems (cons "i686-linux" %hurd-systems))
(supported-systems %hurd-systems)
(synopsis "Microkernel of the GNU system")
(description
"GNU Mach is the microkernel upon which a GNU Hurd system is based.")))
@ -338,17 +323,20 @@ Hurd-minimal package which are needed for both glibc and GCC.")
(define-public hurd
(package
(name "hurd")
(source (package-source hurd-headers))
(source (origin
(inherit (package-source hurd-headers))
(patches (search-patches "hurd-fix-rumpdisk-build.patch"
"hurd-rumpdisk-no-hd.patch"))))
(version (package-version hurd-headers))
(arguments
`(#:phases
`(#:tests? #f ;no "check" target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'prepare-dde
(add-after 'unpack 'prepare-addons
(lambda* (#:key native-inputs inputs #:allow-other-keys)
;; First we import the things we want from dde.
(for-each make-file-writable (find-files "."))
(let ((dde (or (assoc-ref inputs "dde-sources")
(assoc-ref native-inputs "dde-sources"))))
(let ((dde (assoc-ref (or native-inputs inputs) "dde-sources")))
(for-each (lambda (dir)
(copy-recursively
(string-append dde "/" dir ) dir))
@ -357,7 +345,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
;; Makefile. libdde_linux26 is built later in its own phase.
(substitute* "Makefile"
(("libbpf ")
"libbpf libmachdevdde libddekit"))))
"libbpf libmachdevdde libddekit rumpdisk"))))
(add-after 'unpack 'find-tirpc
(lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (var)
@ -478,13 +466,13 @@ exec ${system}/rc \"$@\"
#t)))
(add-after 'build 'build-libdde-linux
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(invoke (string-append (assoc-ref native-inputs "make")
(invoke (string-append (assoc-ref (or native-inputs inputs) "make")
"/bin/make")
;; XXX There can be a race condition because subdirs
;; aren't interdependent targets in the Makefile.
"-j1" "-C" "libdde_linux26"
(string-append "SHELL="
(assoc-ref native-inputs "bash")
(assoc-ref (or native-inputs inputs) "bash")
"/bin/bash")
(string-append "CC="
,(cc-for-target)))))
@ -495,12 +483,12 @@ exec ${system}/rc \"$@\"
(let* ((out (assoc-ref outputs "out"))
(datadir (string-append out "/share/hurd")))
;; Install libdde_linux26.
(invoke (string-append (assoc-ref native-inputs "make")
(invoke (string-append (assoc-ref (or native-inputs inputs) "make")
"/bin/make")
"-C" "libdde_linux26" "install"
(string-append "SHELL="
(assoc-ref native-inputs "bash")
"/bin/bash")
(assoc-ref (or native-inputs inputs) "bash")
"/bin/bash")
(string-append "INSTALLDIR="
out
"/share/libdde_linux26/build/include"))
@ -520,10 +508,10 @@ exec ${system}/rc \"$@\"
#:configure-flags
,#~(list (string-append "LDFLAGS=-Wl,-rpath="
#$output "/lib")
"--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi"
"--disable-ncursesw"
"--without-libbz2"
"--without-libz"
"--without-parted"
;; This is needed to pass the configure check for
;; clnt_create
"ac_func_search_save_LIBS=-ltirpc"
@ -534,7 +522,7 @@ exec ${system}/rc \"$@\"
`(("libgcrypt" ,libgcrypt) ;for /hurd/random
("libdaemon" ,libdaemon) ;for /bin/console --daemonize
("unifont" ,unifont)
("libpciaccess" ,libpciaccess)
("libpciaccess" ,libpciaccess-0.17) ;need libpciaccess > 0.16
;; For NFS support
("libtirpc" ,libtirpc/hurd)
@ -544,16 +532,16 @@ exec ${system}/rc \"$@\"
("coreutils" ,coreutils)
("sed" ,sed)
("grep" ,grep)
("util-linux" ,util-linux)))
("util-linux" ,util-linux "static") ;libuuid.a, for parted
("parted" ,parted) ;for rumpdisk
("rumpkernel" ,rumpkernel)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config'
("mig" ,(if (%current-target-system)
(let* ((cross-base (resolve-interface '(gnu packages cross-base)))
(cross-mig (module-ref cross-base 'cross-mig)))
(cross-mig (%current-target-system)))
mig))
("mig" , (if (%current-target-system)
(cross-mig (%current-target-system))
mig))
("pkg-config" ,pkg-config)
("perl" ,perl)
("texinfo" ,texinfo-4)
@ -569,8 +557,8 @@ implementing them.")
(license gpl2+)))
(define-public netdde
(let ((commit "4a1016f130b6f2065d3f088325e5fb0b2997ae12")
(revision "1"))
(let ((commit "e67c284ac113d939b10b4578334f27dab29d5b08")
(revision "2"))
(package
(name "netdde")
;; The version prefix corresponds to the version of Linux from which the
@ -581,20 +569,19 @@ implementing them.")
(uri (git-reference
(url "https://git.savannah.gnu.org/git/hurd/incubator.git")
(commit commit)))
(patches (list (search-patch "netdde-build-fix.patch")))
(sha256
(base32
"1njv9dszq4lj05yq4v9j5v247hfghpzvvz4hzy0khjjr35mw7hr8"))
"0vnkls7sr7srzib5mnw6gybzl5qa8c5a4zf3h08w6gdr7zqbndh0"))
(file-name (git-file-name name commit))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
`(#:tests? #f ;no "check" target
#:make-flags
(list (string-append "SHELL="
(search-input-file %build-inputs "/bin/bash"))
"PKGDIR=libdde_linux26"
,@(if (%current-target-system)
(list "CC=i586-pc-gnu-gcc"
"LINK_PROGRAM=i586-pc-gnu-gcc")
(list "CC=gcc")))
(string-append "CC=" ,(cc-for-target)))
#:configure-flags
,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
#:phases
@ -603,15 +590,13 @@ implementing them.")
(add-after 'unpack 'prepare-dde
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(for-each make-file-writable (find-files "."))
(let ((dde (or (assoc-ref inputs "dde-sources")
(assoc-ref native-inputs "dde-sources"))))
(let ((dde (assoc-ref (or native-inputs inputs) "dde-sources")))
(for-each (lambda (dir)
(copy-recursively
(string-append dde "/" dir ) dir))
'("libdde_linux26" "libddekit")))
(substitute* "libdde_linux26/mk/rel2abs.sh"
(("/bin/bash") (which "bash")))
#t))
(("/bin/bash") (which "bash")))))
(add-after 'patch-generated-file-shebangs 'build-libdde-linux26
(lambda* (#:key make-flags #:allow-other-keys)
(with-directory-excursion "libdde_linux26"
@ -622,17 +607,23 @@ implementing them.")
(apply invoke "make" "convert" make-flags)))
(replace 'build
(lambda* (#:key make-flags #:allow-other-keys)
;; no-common can be dropped with GCC 10+ where this is the
;; default.
(apply invoke "make" "CFLAGS=-fno-common" make-flags)))
(apply invoke "make"
,(string-append "LINK_PROGRAM=" (cc-for-target))
make-flags)
;; This hack to build netdde.static was found in
;; https://salsa.debian.org/hurd-team/netdde/-/blob/b539b2ad7a171371f140c3da58cce33f1a91ac12/debian/rules
(delete-file "Makefile.inc")
(apply invoke "make"
,(string-append "LINK_PROGRAM=" (cc-for-target) " -static")
"TARGET=netdde.static"
make-flags)))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "netdde"
(string-append (assoc-ref outputs "out")
"/bin"))
#t)))))
(let ((hurd (string-append (assoc-ref outputs "out") "/hurd")))
(install-file "netdde" hurd)
(install-file "netdde.static" hurd)))))))
(inputs
(list hurd libpciaccess zlib))
(list hurd libpciaccess-0.17 zlib `(,zlib "static")))
(native-inputs
`(("coreutils" ,coreutils)
("gawk" ,gawk)
@ -649,3 +640,230 @@ in userland processes thanks to the DDE layer.")
;; Some drivers are dually licensed with the options being GPLv2 or one
;; of MPL/Expat/BSD-3 (dependent on the driver).
(license gpl2))))
(define-public rumpkernel
(let ((commit "81043d42fabda9baed7ac9ca36e3f3f5ed11ba81")
(revision "3"))
(package
(name "rumpkernel")
(version (git-version "0-20211031" revision commit))
;; This uses the Debian Salsa rumpkernel package git as upstream as that
;; is where development happens. Once things have stabilized, upstream
;; may change to the NetBSD git from where Debian takes their snapshots.
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/hurd-team/rumpkernel.git")
(commit commit)))
(sha256
(base32
"0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r"))
(file-name (git-file-name name commit))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f
#:modules '((srfi srfi-26)
(ice-9 rdelim)
(guix build utils)
(guix build gnu-build-system))
;; As we are using the Debian package as upstream, we follow their
;; build:
;; * apply patches in debian/patches taken from the
;; debian/patches/series file
;; * for the configure, make, and install stages, follow
;; the code in debian/rules
;; The Debian patchset includes a cross build feature that we
;; use with two differences
;; * Debian uses a multiarch toolchain
;; * we use cross-mig
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'apply-patches
(lambda* (#:key target #:allow-other-keys)
(let* ((patch-directory "debian/patches/")
(series (string-append patch-directory "series"))
(text (with-input-from-file series read-string))
(lines (string-split (string-trim-right text) #\newline))
(patches (filter (negate (cute string-prefix? "#" <>))
lines))
(patch-files (map
(cute string-append patch-directory <>)
patches)))
(for-each
(cute invoke "patch" "--force" "-p1" "-i" <>)
patch-files)
;; Somewhere in the build.sh/make process MIG is not being
;; exported, apparently.
(let* ((prefix (if (not target) "" (string-append target "-")))
(mig (string-append prefix "mig")))
(substitute* "pci-userspace/src-gnu/Makefile.inc"
(("MIG=mig")
(string-append "MIG=" mig)))))))
(add-before 'configure 'setenv
(lambda* (#:key build target #:allow-other-keys)
(define (noisy-setenv name value)
(setenv name value)
(format (current-error-port) "set ~a=~s\n" name value))
(noisy-setenv "HOST_CC" "gcc")
(let* ((prefix (if (not target) "" (string-append target "-"))))
(noisy-setenv "TARGET_AR" (string-append prefix "ar"))
(noisy-setenv "TARGET_CC" (string-append prefix "gcc"))
(noisy-setenv "TARGET_CXX" (string-append prefix "g++"))
(noisy-setenv "TARGET_LD" (string-append prefix "ld"))
(noisy-setenv "TARGET_MIG" (string-append prefix "mig"))
(noisy-setenv "TARGET_NM" (string-append prefix "nm"))
(noisy-setenv "MIG" (string-append prefix "mig")))
(setenv "PAWD" "pwd")
(for-each
(cute noisy-setenv <> "")
'("_GCC_CRTENDS"
"_GCC_CRTEND"
"_GCC_CRTBEGINS"
"_GCC_CRTBEGIN"
"_GCC_CRTI"
"_GCC_CRTN"))))
(replace 'configure
(lambda args
(let ((configure (assoc-ref %standard-phases 'configure)))
(with-directory-excursion "buildrump.sh/src/lib/librumpuser"
(apply configure args)))))
;; The build has three toplevel entry points
;; * buildrump.sh/src/build.sh: create a NetBSD-compatible
;; toolchain and supports cross-compiling
;; * buildrump.sh/src/lib/librumpuser: the librump* libraries
;; * pci-userspace/src-gnu: the librumpdev_pci* libraries
(replace 'build
(lambda* (#:key parallel-build? #:allow-other-keys)
(let* ((jobs (if parallel-build? (parallel-job-count) 1))
(host-cpu #$(match (or (%current-target-system)
(%current-system))
((? target-x86-32?)
"i386")
((? target-x86-64?)
"amd64")
(_ "unknown")))
(toprump (string-append
(getcwd)
"/buildrump.sh/src/sys/rump"))
(rump-make (string-append
(getcwd)
"/buildrump.sh/src/obj/tooldir/bin/nbmake-"
host-cpu)))
(mkdir "obj")
(with-directory-excursion "buildrump.sh/src"
(invoke
"sh" "build.sh"
"-V" "TOOLS_BUILDRUMP=yes"
"-V" "MKBINUTILS=no"
"-V" "MKGDB=no"
"-V" "MKGROFF=no"
"-V" (string-append "TOPRUMP=" toprump)
"-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread"
"-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread"
"-V" (string-append
"CPPFLAGS="
" -I../../obj/destdir." host-cpu "/usr/include"
" -D_FILE_OFFSET_BITS=64"
" -DRUMP_REGISTER_T=int"
" -DRUMPUSER_CONFIG=yes"
" -DNO_PCI_MSI_MSIX=yes"
" -DNUSB_DMA=1")
"-V" (string-append
"CWARNFLAGS="
" -Wno-error=maybe-uninitialized"
" -Wno-error=address-of-packed-member"
" -Wno-error=unused-variable"
" -Wno-error=stack-protector"
" -Wno-error=array-parameter"
" -Wno-error=array-bounds"
" -Wno-error=stringop-overflow")
"-V" "LIBCRTBEGIN="
"-V" "LIBCRTEND="
"-V" "LIBCRT0="
"-V" "LIBCRTI="
"-V" "_GCC_CRTENDS="
"-V" "_GCC_CRTEND="
"-V" "_GCC_CRTBEGINS="
"-V" "_GCC_CRTBEGIN="
"-V" "_GCC_CRTI="
"-V" "_GCC_CRTN="
"-U"
"-u"
"-T" "./obj/tooldir"
"-m" host-cpu
"-j" (number->string jobs)
"tools"
"rump"))
(with-directory-excursion "buildrump.sh/src/lib/librumpuser"
(setenv "RUMPRUN" "true")
(invoke rump-make "dependall"))
(with-directory-excursion "pci-userspace/src-gnu"
(invoke rump-make "dependall")))))
(replace 'install
(lambda _
(define (install-file file target)
(let ((dest (string-append target (basename file))))
(format (current-output-port) "`~a' -> `~a'~%" file dest)
(mkdir-p (dirname dest))
;; Some libraries are duplicated/copied around in the
;; build system, do not fail trying to install one
;; a second time.
(if (file-exists? dest)
(format (current-error-port)
"warning: skipping: ~a\n" file)
(let ((stat (lstat file)))
(case (stat:type stat)
((symlink)
(let ((target (readlink file)))
(symlink target dest)))
(else
(copy-file file dest)))))))
(let ((header (string-append #$output "/include/rump"))
(lib (string-append #$output "/lib/")))
(mkdir-p header)
(copy-recursively "buildrump.sh/src/sys/rump/include/rump"
header)
(mkdir-p lib)
(for-each
(cute install-file <> lib)
(append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)")
(find-files "obj" "librump.*[.](a|so.*)")))))))))
(inputs
(list gnumach-headers libpciaccess-0.17))
(native-inputs
(list autoconf
automake
libgcrypt
(if (%current-target-system)
(cross-mig (%current-target-system))
mig)
zlib))
(supported-systems %hurd-systems)
(home-page "https://wiki.netbsd.org/rumpkernel")
(synopsis "NetBSD as rumpkernel for the GNU/Hurd")
(description
"This package provides NetBSD as rumpkernel for the GNU/Hurd, so that
the Hurd may be installed on iron. Using this rumpkernel package, the hurd
package's rumpdisk can be built which provides the pci.arbiter and rumpdisk
servers.")
(license
;; The NetBSD rumpkernel code is a big hodgepodge of softwares many of
;; which have their own different licensing terms, see also
;; https://salsa.debian.org/hurd-team/rumpkernel/-/blob/master/debian/copyright
(list asl2.0
boost1.0
bsd-2
bsd-3
bsd-4
cddl1.0
expat
gpl1
gpl2+
gpl3+
isc
lgpl2.0+
public-domain
(@ (guix licenses) zlib)
(non-copyleft "file://src/lib/libc/hash/hashhl.c"
"See debian/copyright in the distribution."))))))

12
gnu/packages/ibus.scm
View File

@ -352,7 +352,7 @@ Chinese pinyin input methods.")
(base32
"16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8"))
(patches (search-patches "ibus-anthy-fix-tests.patch"))))
(build-system gnu-build-system)
(build-system glib-or-gtk-build-system)
(arguments
(list
;; The test suite hangs (see:
@ -360,7 +360,10 @@ Chinese pinyin input methods.")
#:tests? #f
#:configure-flags
;; Use absolute exec path in the anthy.xml.
#~(list (string-append "--libexecdir=" #$output "/libexec"))
#~(list (string-append "--libexecdir=" #$output "/libexec")
(string-append
"--with-anthy-zipcode="
(assoc-ref %build-inputs "anthy") "/share/anthy/zipcode.t"))
;; The test suite fails (see:
;; https://github.com/ibus/ibus-anthy/issues/28).
#:phases
@ -380,6 +383,11 @@ Chinese pinyin input methods.")
(substitute* "tests/test-build.sh"
(("GI_TYPELIB_PATH=\\$BUILDDIR/../gir" all)
(string-append all ":$GI_TYPELIB_PATH")))))
(add-before 'configure 'pre-configure
(lambda _
;; We need generate new _config.py with correct PKGDATADIR.
(delete-file "setup/python3/_config.py")
(delete-file "engine/python3/_config.py")))
(add-before 'check 'prepare-for-tests
(lambda* (#:key tests? #:allow-other-keys)
(when tests?

80
gnu/packages/image-processing.scm
View File

@ -1279,41 +1279,46 @@ libraries designed for computer vision research and implementation.")
(base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; tests require network access and external data
#:configure-flags
'("-DITK_USE_GPU=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON"
"-DITK_USE_SYSTEM_GOOGLETEST=ON"
"-DITK_BUILD_SHARED=ON"
;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
;; variable in the installed CMake files. This is necessary as other
;; packages using insight-toolkit could not be configured otherwise.
"-DGTEST_ROOT=gtest")
(list #:tests? #f ; tests require network access and external data
#:configure-flags #~'("-DITK_USE_GPU=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON"
"-DITK_USE_SYSTEM_GOOGLETEST=ON"
"-DITK_BUILD_SHARED=ON"
;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
;; variable in the installed CMake files. This is necessary as other
;; packages using insight-toolkit could not be configured otherwise.
"-DGTEST_ROOT=gtest"
"-DCMAKE_CXX_STANDARD=17")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'do-not-tune
(lambda _
(substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
(("-mute=native") ""))
#t)))))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'do-not-tune
(lambda _
(substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
(("-mtune=native")
"")))))))
(inputs
`(("eigen" ,eigen)
("expat" ,expat)
("fftw" ,fftw)
("fftwf" ,fftwf)
("hdf5" ,hdf5)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("mesa" ,mesa-opencl)
("perl" ,perl)
("python" ,python)
("tbb" ,tbb)
("vxl" ,vxl-1)
("zlib" ,zlib)))
(list eigen
expat
fftw
fftwf
hdf5
libjpeg-turbo
libpng
libtiff
mesa-opencl
perl
python
tbb
vxl-1
zlib))
(native-inputs
(list googletest pkg-config))
;; The 'CMake/ITKSetStandardCompilerFlags.cmake' file normally sets
;; '-mtune=native -march=corei7', suggesting there's something to be
;; gained from CPU-specific optimizations.
(properties '((tunable? . #t)))
(home-page "https://github.com/InsightSoftwareConsortium/ITK/")
(synopsis "Scientific image processing, segmentation and registration")
(description "The Insight Toolkit (ITK) is a toolkit for N-dimensional
@ -1338,13 +1343,12 @@ combine the information contained in both.")
(sha256
(base32 "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"))))
(arguments
`(#:tests? #f ; tests require network access and external data
#:configure-flags
'("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap
"-DITK_USE_GPU=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON"
"-DITK_USE_SYSTEM_GOOGLETEST=ON"
"-DITK_USE_SYSTEM_VXL=ON")))))
(list #:tests? #f ; tests require network access and external data
#:configure-flags #~'("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap
"-DITK_USE_GPU=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON"
"-DITK_USE_SYSTEM_GOOGLETEST=ON"
"-DITK_USE_SYSTEM_VXL=ON")))))
(define-public insight-toolkit-4.12
(package (inherit insight-toolkit-4)

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