Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-10-13 23:39:27 +02:00
commit f7175626ff
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
128 changed files with 8637 additions and 1422 deletions

View file

@ -47,6 +47,18 @@ scripts/guix: scripts/guix.in Makefile
$(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t"
$(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@" $(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@"
# This is our variant of the 'guile' executable, one that doesn't complain
# about locales.
pkglibexec_PROGRAMS = guile
guile_SOURCES = gnu/packages/aux-files/guile-launcher.c
guile_LDADD = $(GUILE_LIBS)
guile_CFLAGS = $(GUILE_CFLAGS)
# Have the 'guix' command refer to our 'guile'.
install-exec-hook:
$(SED) -i "$(DESTDIR)$(bindir)/guix" \
-e 's,^#![[:graph:]]\+,#!$(pkglibexecdir)/guile,g'
nodist_noinst_SCRIPTS = \ nodist_noinst_SCRIPTS = \
pre-inst-env \ pre-inst-env \
test-env test-env

View file

@ -105,6 +105,9 @@ if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3]) PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3])
fi fi
dnl Get CFLAGS and LDFLAGS for libguile.
GUILE_FLAGS
dnl Installation directories for .scm and .go files. dnl Installation directories for .scm and .go files.
guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION" guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache" guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"

View file

@ -121,8 +121,9 @@ more information.
Then, run @command{./configure} as usual. Make sure to pass Then, run @command{./configure} as usual. Make sure to pass
@code{--localstatedir=@var{directory}} where @var{directory} is the @code{--localstatedir=@var{directory}} where @var{directory} is the
@code{localstatedir} value used by your current installation (@pxref{The @code{localstatedir} value used by your current installation (@pxref{The
Store}, for information about this). We recommend to use the value Store}, for information about this), usually @file{/var}. Note that you
@code{/var}. will probably not run @command{make install} at the end (you don't have
to) but it's still important to pass the right @code{localstatedir}.
Finally, you have to invoke @code{make check} to run tests Finally, you have to invoke @code{make check} to run tests
(@pxref{Running the Test Suite}). If anything (@pxref{Running the Test Suite}). If anything
@ -159,13 +160,11 @@ with all the dependencies available (@pxref{Building from Git}), and then
simply prefix each command with simply prefix each command with
@command{./pre-inst-env} (the @file{pre-inst-env} script lives in the @command{./pre-inst-env} (the @file{pre-inst-env} script lives in the
top build tree of Guix; it is generated by @command{./configure}). top build tree of Guix; it is generated by @command{./configure}).
An example@footnote{The @option{-E} flag to As an example, here is how you would build the @code{hello} package as
@command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set defined in your working tree (this assumes @command{guix-daemon} is
such that @command{guix-daemon} and the tools it uses can find the Guile already running on your system; it's OK if it's a different version):
modules they need.}:
@example @example
$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild
$ ./pre-inst-env guix build hello $ ./pre-inst-env guix build hello
@end example @end example
@ -200,6 +199,17 @@ scheme@@(guile-user)> (length snakes)
$1 = 361 $1 = 361
@end example @end example
If you are hacking on the daemon and its supporting code or if
@command{guix-daemon} is not already running on your system, you can
launch it straight from the build tree@footnote{The @option{-E} flag to
@command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set
such that @command{guix-daemon} and the tools it uses can find the Guile
modules they need.}:
@example
$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild
@end example
The @command{pre-inst-env} script sets up all the environment variables The @command{pre-inst-env} script sets up all the environment variables
necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}. necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.

View file

@ -1081,7 +1081,28 @@ architecture natively supports it, via emulation (@pxref{Transparent
Emulation with QEMU}), or both. Missing prerequisites for the build are Emulation with QEMU}), or both. Missing prerequisites for the build are
copied over SSH to the target machine, which then proceeds with the copied over SSH to the target machine, which then proceeds with the
build; upon success the output(s) of the build are copied back to the build; upon success the output(s) of the build are copied back to the
initial machine. initial machine. The offload facility comes with a basic scheduler that
attempts to select the best machine. The best machine is chosen among
the available machines based on criteria such as:
@enumerate
@item
The availability of a build slot. A build machine can have as many
build slots (connections) as the value of the @code{parallel-builds}
field of its @code{build-machine} object.
@item
Its relative speed, as defined via the @code{speed} field of its
@code{build-machine} object.
@item
Its load. The normalized machine load must be lower than a threshold
value, configurable via the @code{overload-threshold} field of its
@code{build-machine} object.
@item
Disk space availability. More than a 100 MiB must be available.
@end enumerate
The @file{/etc/guix/machines.scm} file typically looks like this: The @file{/etc/guix/machines.scm} file typically looks like this:
@ -1185,6 +1206,13 @@ when transferring files to and from build machines.
File name of the Unix-domain socket @command{guix-daemon} is listening File name of the Unix-domain socket @command{guix-daemon} is listening
to on that machine. to on that machine.
@item @code{overload-threshold} (default: @code{0.6})
The load threshold above which a potential offload machine is
disregarded by the offload scheduler. The value roughly translates to
the total processor usage of the build machine, ranging from 0.0 (0%) to
1.0 (100%). It can also be disabled by setting
@code{overload-threshold} to @code{#f}.
@item @code{parallel-builds} (default: @code{1}) @item @code{parallel-builds} (default: @code{1})
The number of builds that may run in parallel on the machine. The number of builds that may run in parallel on the machine.
@ -6530,6 +6558,35 @@ cross-compiling:
It is an error to refer to @code{this-package} outside a package definition. It is an error to refer to @code{this-package} outside a package definition.
@end deffn @end deffn
Because packages are regular Scheme objects that capture a complete
dependency graph and associated build procedures, it is often useful to
write procedures that take a package and return a modified version
thereof according to some parameters. Below are a few examples.
@cindex tool chain, choosing a package's tool chain
@deffn {Scheme Procedure} package-with-c-toolchain @var{package} @var{toolchain}
Return a variant of @var{package} that uses @var{toolchain} instead of
the default GNU C/C++ toolchain. @var{toolchain} must be a list of
inputs (label/package tuples) providing equivalent functionality, such
as the @code{gcc-toolchain} package.
The example below returns a variant of the @code{hello} package built
with GCC@tie{}10.x and the rest of the GNU tool chain (Binutils and the
GNU C Library) instead of the default tool chain:
@lisp
(let ((toolchain (specification->package "gcc-toolchain@@10")))
(package-with-c-toolchain hello `(("toolchain" ,toolchain))))
@end lisp
The build tool chain is part of the @dfn{implicit inputs} of
packages---it's usually not listed as part of the various ``inputs''
fields and is instead pulled in by the build system. Consequently, this
procedure works by changing the build system of @var{package} so that it
pulls in @var{toolchain} instead of the defaults. @ref{Build Systems},
for more on build systems.
@end deffn
@node origin Reference @node origin Reference
@subsection @code{origin} Reference @subsection @code{origin} Reference
@ -6666,6 +6723,9 @@ ornamentation---in other words, a bag is a lower-level representation of
a package, which includes all the inputs of that package, including some a package, which includes all the inputs of that package, including some
that were implicitly added by the build system. This intermediate that were implicitly added by the build system. This intermediate
representation is then compiled to a derivation (@pxref{Derivations}). representation is then compiled to a derivation (@pxref{Derivations}).
The @code{package-with-c-toolchain} is an example of a way to change the
implicit inputs that a package's build system pulls in (@pxref{package
Reference, @code{package-with-c-toolchain}}).
Build systems accept an optional list of @dfn{arguments}. In package Build systems accept an optional list of @dfn{arguments}. In package
definitions, these are passed @i{via} the @code{arguments} field definitions, these are passed @i{via} the @code{arguments} field
@ -9124,11 +9184,9 @@ Non-deterministic build processes are a problem because they make it
practically impossible for users to @emph{verify} whether third-party practically impossible for users to @emph{verify} whether third-party
binaries are genuine. @xref{Invoking guix challenge}, for more. binaries are genuine. @xref{Invoking guix challenge}, for more.
Note that, currently, the differing build results are not kept around, When used in conjunction with @option{--keep-failed}, the differing
so you will have to manually investigate in case of an error---e.g., by output is kept in the store, under @file{/gnu/store/@dots{}-check}.
stashing one of the build results with @code{guix archive --export} This makes it easy to look for differences between the two results.
(@pxref{Invoking guix archive}), then rebuilding, and finally comparing
the two results.
@item --no-offload @item --no-offload
Do not use offload builds to other machines (@pxref{Daemon Offload Do not use offload builds to other machines (@pxref{Daemon Offload
@ -9303,6 +9361,44 @@ must be compatible. If @var{replacement} is somehow incompatible with
@var{package}, then the resulting package may be unusable. Use with @var{package}, then the resulting package may be unusable. Use with
care! care!
@cindex tool chain, changing the build tool chain of a package
@item --with-c-toolchain=@var{package}=@var{toolchain}
This option changes the compilation of @var{package} and everything that
depends on it so that they get built with @var{toolchain} instead of the
default GNU tool chain for C/C++.
Consider this example:
@example
guix build octave-cli \
--with-c-toolchain=fftw=gcc-toolchain@@10 \
--with-c-toolchain=fftwf=gcc-toolchain@@10
@end example
The command above builds a variant of the @code{fftw} and @code{fftwf}
packages using version 10 of @code{gcc-toolchain} instead of the default
tool chain, and then builds a variant of the GNU@tie{}Octave
command-line interface using them. GNU@tie{}Octave itself is also built
with @code{gcc-toolchain@@10}.
This other example builds the Hardware Locality (@code{hwloc}) library
and its dependents up to @code{intel-mpi-benchmarks} with the Clang C
compiler:
@example
guix build --with-c-toolchain=hwloc=clang-toolchain \
intel-mpi-benchmarks
@end example
@quotation Note
There can be application binary interface (ABI) incompatibilities among
tool chains. This is particularly true of the C++ standard library and
run-time support libraries such as that of OpenMP. By rebuilding all
dependents with the same tool chain, @option{--with-c-toolchain} minimizes
the risks of incompatibility but cannot entirely eliminate them. Choose
@var{package} wisely.
@end quotation
@item --with-git-url=@var{package}=@var{url} @item --with-git-url=@var{package}=@var{url}
@cindex Git, using the latest commit @cindex Git, using the latest commit
@cindex latest commit, building @cindex latest commit, building
@ -12059,11 +12155,15 @@ following in your operating system declaration:
(guix-service-type config => (guix-service-type config =>
(guix-configuration (guix-configuration
(inherit config) (inherit config)
(use-substitutes? #f) ;; Fetch substitutes from example.org.
(extra-options '("--gc-keep-derivations")))) (substitute-urls
(list "https://example.org/guix"
"https://ci.guix.gnu.org"))))
(mingetty-service-type config => (mingetty-service-type config =>
(mingetty-configuration (mingetty-configuration
(inherit config))))) (inherit config)
;; Automatially log in as "guest".
(auto-login "guest")))))
(operating-system (operating-system
;; @dots{} ;; @dots{}
@ -15316,6 +15416,9 @@ example:
This is the configuration record for OpenSSH's @command{sshd}. This is the configuration record for OpenSSH's @command{sshd}.
@table @asis @table @asis
@item @code{openssh} (default @var{openssh})
The Openssh package to use.
@item @code{pid-file} (default: @code{"/var/run/sshd.pid"}) @item @code{pid-file} (default: @code{"/var/run/sshd.pid"})
Name of the file where @command{sshd} writes its PID. Name of the file where @command{sshd} writes its PID.
@ -23360,6 +23463,60 @@ disables caching.
@item @code{negative-cache?} (default: @code{#t}) @item @code{negative-cache?} (default: @code{#t})
When false, disable negative caching. When false, disable negative caching.
@item @code{tftp-enable?} (default: @code{#f})
Whether to enable the built-in TFTP server.
@item @code{tftp-no-fail?} (default: @code{#f})
If true, does not fail dnsmasq if the TFTP server could not start up.
@item @code{tftp-single-port?} (default: @code{#f})
Whether to use only one single port for TFTP.
@item @code{tftp-secure?} (default: @code{#f})
If true, only files owned by the user running the dnsmasq process are accessible.
If dnsmasq is being run as root, different rules apply:
@code{tftp-secure?} has no effect, but only files which have the
world-readable bit set are accessible.
@item @code{tftp-max} (default: @code{#f})
If set, sets the maximal number of concurrent connections allowed.
@item @code{tftp-mtu} (default: @code{#f})
If set, sets the MTU for TFTP packets to that value.
@item @code{tftp-no-blocksize?} (default: @code{#f})
If true, stops the TFTP server from negotiating the blocksize with a client.
@item @code{tftp-lowercase?} (default: @code{#f})
Whether to convert all filenames in TFTP requests to lowercase.
@item @code{tftp-port-range} (default: @code{#f})
If set, fixes the dynamical ports (one per client) to the given range
(@code{"<start>,<end>"}).
@item @code{tftp-root} (default: @code{/var/empty,lo})
Look for files to transfer using TFTP relative to the given directory.
When this is set, TFTP paths which include ".." are rejected, to stop clients
getting outside the specified root. Absolute paths (starting with /) are
allowed, but they must be within the tftp-root. If the optional interface
argument is given, the directory is only used for TFTP requests via that
interface.
@item @code{tftp-unique-root} (default: @code{#f})
If set, add the IP or hardware address of the TFTP client as a path component
on the end of the TFTP-root. Only valid if a TFTP root is set and the
directory exists. Defaults to adding IP address (in standard dotted-quad
format).
For instance, if --tftp-root is "/tftp" and client 1.2.3.4 requests file
"myfile" then the effective path will be "/tftp/1.2.3.4/myfile" if
/tftp/1.2.3.4 exists or /tftp/myfile otherwise. When "=mac" is specified
it will append the MAC address instead, using lowercase zero padded digits
separated by dashes, e.g.: 01-02-03-04-aa-bb Note that resolving MAC
addresses is only possible if the client is in the local network or obtained
a DHCP lease from dnsmasq.
@end table @end table
@end deftp @end deftp
@ -27761,6 +27918,168 @@ The complete list of possible options can be found in the man page for
@node Guix Services @node Guix Services
@subsection Guix Services @subsection Guix Services
@subsubheading Guix Build Coordinator
The @uref{https://git.cbaines.net/guix/build-coordinator/,Guix Build
Coordinator} aids in distributing derivation builds among machines
running an @dfn{agent}. The build daemon is still used to build the
derivations, but the Guix Build Coordinator manages allocating builds
and working with the results.
@quotation Note
This service is considered experimental. Configuration options may be
changed in a backwards-incompatible manner, and not all features have
been thorougly tested.
@end quotation
The Guix Build Coordinator consists of one @dfn{coordinator}, and one or
more connected @dfn{agent} processes. The coordinator process handles
clients submitting builds, and allocating builds to agents. The agent
processes talk to a build daemon to actually perform the builds, then
send the results back to the coordinator.
There is a script to run the coordinator component of the Guix Build
Coordinator, but the Guix service uses a custom Guile script instead, to
provide better integration with G-expressions used in the configuration.
@defvar {Scheme Variable} guix-build-coordinator-service-type
Service type for the Guix Build Coordinator. Its value must be a
@code{guix-build-coordinator-configuration} object.
@end defvar
@deftp {Data Type} guix-build-coordinator-configuration
Data type representing the configuration of the Guix Build Coordinator.
@table @asis
@item @code{package} (default: @code{guix-build-coordinator})
The Guix Build Coordinator package to use.
@item @code{user} (default: @code{"guix-build-coordinator"})
The system user to run the service as.
@item @code{group} (default: @code{"guix-build-coordinator"})
The system group to run the service as.
@item @code{database-uri-string} (default: @code{"sqlite:///var/lib/guix-build-coordinator/guix_build_coordinator.db"})
The URI to use for the database.
@item @code{agent-communication-uri} (default: @code{"http://0.0.0.0:8745"})
The URI describing how to listen to requests from agent processes.
@item @code{client-communication-uri} (default: @code{"http://127.0.0.1:8746"})
The URI describing how to listen to requests from clients. The client
API allows submitting builds and currently isn't authenticated, so take
care when configuring this value.
@item @code{allocation-strategy} (default: @code{#~basic-build-allocation-strategy})
A G-expression for the allocation strategy to be used. This is a
procedure that takes the datastore as an argument and populates the
allocation plan in the database.
@item @code{hooks} (default: @var{'()})
An association list of hooks. These provide a way to execute arbitrary
code upon certian events, like a build result being processed.
@item @code{guile} (default: @code{guile-3.0-latest})
The Guile package with which to run the Guix Build Coordinator.
@end table
@end deftp
@defvar {Scheme Variable} guix-build-coordinator-agent-service-type
Service type for a Guix Build Coordinator agent. Its value must be a
@code{guix-build-coordinator-agent-configuration} object.
@end defvar
@deftp {Data Type} guix-build-coordinator-agent-configuration
Data type representing the configuration a Guix Build Coordinator agent.
@table @asis
@item @code{package} (default: @code{guix-build-coordinator})
The Guix Build Coordinator package to use.
@item @code{user} (default: @code{"guix-build-coordinator-agent"})
The system user to run the service as.
@item @code{coordinator} (default: @code{"http://localhost:8745"})
The URI to use when connecting to the coordinator.
@item @code{uuid}
The UUID of the agent. This should be generated by the coordinator
process, stored in the coordinator database, and used by the intended
agent.
@item @code{password} (default: @code{#f})
The password to use when connecting to the coordinator. A file to read
the password from can also be specified, and this is more secure.
@item @code{password-file} (default: @code{#f})
A file containing the password to use when connecting to the
coordinator.
@item @code{systems} (default: @var{#f})
The systems for which this agent should fetch builds. The agent process
will use the current system it's running on as the default.
@item @code{max-parallel-builds} (default: @code{1})
The number of builds to perform in parallel.
@item @code{derivation-substitute-urls} (default: @code{1})
URLs from which to attempt to fetch substitutes for derivations, if the
derivations aren't already available.
@item @code{non-derivation-substitute-urls} (default: @code{1})
URLs from which to attempt to fetch substitutes for build inputs, if the
input store items aren't already available.
@end table
@end deftp
The Guix Build Coordinator package contains a script to query an
instance of the Guix Data Service for derivations to build, and then
submit builds for those derivations to the coordinator. The service
type below assists in running this script. This is an additional tool
that may be useful when building derivations contained within an
instance of the Guix Data Service.
@defvar {Scheme Variable} guix-build-coordinator-queue-builds-service-type
Service type for the
guix-build-coordinator-queue-builds-from-guix-data-service script. Its
value must be a @code{guix-build-coordinator-queue-builds-configuration}
object.
@end defvar
@deftp {Data Type} guix-build-coordinator-queue-builds-configuration
Data type representing the options to the queue builds from guix data
service script.
@table @asis
@item @code{package} (default: @code{guix-build-coordinator})
The Guix Build Coordinator package to use.
@item @code{user} (default: @code{"guix-build-coordinator-queue-builds"})
The system user to run the service as.
@item @code{coordinator} (default: @code{"http://localhost:8745"})
The URI to use when connecting to the coordinator.
@item @code{systems} (default: @code{#f})
The systems for which to fetch derivations to build.
@item @code{systems-and-targets} (default: @code{#f})
An association list of system and target pairs for which to fetch
derivations to build.
@item @code{guix-data-service} (default: @code{"https://data.guix.gnu.org"})
The Guix Data Service instance from which to query to find out about
derivations to build.
@item @code{processed-commits-file} (default: @code{"/var/cache/guix-build-coordinator-queue-builds/processed-commits"})
A file to record which commits have been processed, to avoid needlessly
processing them again if the service is restarted.
@end table
@end deftp
@subsubheading Guix Data Service @subsubheading Guix Data Service
The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores
and provides data about GNU Guix. This includes information about and provides data about GNU Guix. This includes information about
@ -30212,7 +30531,7 @@ A service of this type is instantiated like this:
(service guix-service-type (service guix-service-type
(guix-configuration (guix-configuration
(build-accounts 5) (build-accounts 5)
(use-substitutes? #f))) (extra-options '("--gc-keep-derivations"))))
@end lisp @end lisp
The second argument to the @code{service} form is a value representing The second argument to the @code{service} form is a value representing

View file

@ -175,8 +175,8 @@ corresponding to the top-level definition containing the staged changes."
(let ((old-values (get-values old field)) (let ((old-values (get-values old field))
(new-values (get-values new field))) (new-values (get-values new field)))
(or (equal? old-values new-values) (or (equal? old-values new-values)
(let ((removed (lset-difference eq? old-values new-values)) (let ((removed (lset-difference equal? old-values new-values))
(added (lset-difference eq? new-values old-values))) (added (lset-difference equal? new-values old-values)))
(format port (format port
"[~a]: ~a~%" field "[~a]: ~a~%" field
(match (list (map symbol->string removed) (match (list (map symbol->string removed)

View file

@ -2,6 +2,11 @@
;; ;;
;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;; Copyright © 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -13,8 +18,48 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "abd7a474615353149a44f4504f0b4b248dcc0716")
(title (en "New @option{--with-c-toolchain} package transformation option")
(fr "Nouvelle option de transformation @option{--with-c-toolchain}"))
(body
(en "The new @option{--with-c-toolchain} package transformation
options provides an easy way for developers to rebuild their favorite packages
with the C/C++ tool chain of their choice instead of the default one.
For example, the following command rebuilds the @code{fftw} and @code{fftwf}
packages as well as every package that depends on them, up to and including
@code{octave-cli}, using GCC version 10 (currently GCC 7.5 is used by
default):
@example
guix build octave-cli \\
--with-c-toolchain=fftw=gcc-toolchain@@10 \\
--with-c-toolchain=fftwf=gcc-toolchain@@10
@end example
Run @command{info \"(guix) Package Transformation Options\"} for more info.")
(fr "La nouvelle option de transformation de paquets
@option{--with-c-toolchain} permet aux développeur·euses de recompiler leurs
paquets préférés avec la chaîne d'outils C/C++ de leur choix à la place de
celle par défaut.
Par exemple, la commande ci-dessous recompile @code{fftw}, @code{fftwf} et
tous les paquets qui en dépendent, jusqu @code{octave-cli} inclus, avec GCC
10 (actuellement c'est GCC 7.5 qui est utilisé par défaut):
@example
guix build octave-cli \\
--with-c-toolchain=fftw=gcc-toolchain@@10 \\
--with-c-toolchain=fftwf=gcc-toolchain@@10
@end example
Voir @command{info \"(guix.fr) Options de transformation de paquets\"} pour
plus de détails.")))
(entry (commit "8e1907a72430aa989125b053573ef0897c480697") (entry (commit "8e1907a72430aa989125b053573ef0897c480697")
(title (en "Package transformation options now recorded in profiles") (title (en "Package transformation options now recorded in profiles")
(es "Las opciones de transformación de paquetes ahora se
quedan registradas en el perfil")
(de "Paketumwandlungsoptionen werden nun in Profilen gesichert") (de "Paketumwandlungsoptionen werden nun in Profilen gesichert")
(fr "Options de transformation sauvegardées dans les profils")) (fr "Options de transformation sauvegardées dans les profils"))
(body (body
@ -24,6 +69,14 @@ you eventually run @command{guix upgrade}, those transformations will be
automatically applied to the upgraded packages. automatically applied to the upgraded packages.
Run @command{info \"(guix) Package Transformation Options\"} for more info.") Run @command{info \"(guix) Package Transformation Options\"} for more info.")
(es "Si durante la instalación de paquetes en un perfil se utilizaron
opciones de transformación de paquetes, como por ejemplo
@option{--with-input}, éstas se registran en el perfil. Cuando vuelva a
ejecutar @command{guix upgrade}, dichas transformaciones se aplicarán
automáticamente a los paquetes actualizados.
Ejecute @command{info \"(guix.es) Opciones de transformación de paquetes\"}
para obtener más información.")
(de "Wenn Sie ein Paket in ein Profil installieren, werden nun (de "Wenn Sie ein Paket in ein Profil installieren, werden nun
Paketumwandlungsoptionen wie @option{--with-input} im Profil gespeichert. Paketumwandlungsoptionen wie @option{--with-input} im Profil gespeichert.
Sobald Sie später @command{guix upgrade} ausführen, werden dieselben Sobald Sie später @command{guix upgrade} ausführen, werden dieselben
@ -41,6 +94,7 @@ plus de détails.")))
(entry (commit "313f492657f1d0863c641fa5ee7f5b7028e27c94") (entry (commit "313f492657f1d0863c641fa5ee7f5b7028e27c94")
(title (en "New @option{--image-type} option for @command{guix system disk-image}.") (title (en "New @option{--image-type} option for @command{guix system disk-image}.")
(es "Nueva opción @option{--image-type} para @command{guix system disk-image}.")
(de "Neue Option @option{--image-type} für @command{guix system disk-image}.") (de "Neue Option @option{--image-type} für @command{guix system disk-image}.")
(fr "Nouvelle option @option{--image-type} pour @command{guix system disk-image}.")) (fr "Nouvelle option @option{--image-type} pour @command{guix system disk-image}."))
(body (body
@ -51,6 +105,14 @@ By default, @code{raw} disk images are produced, but @code{hurd-qcow2},
are also available. are also available.
The @option{--list-image-types} option lists all the available image types.") The @option{--list-image-types} option lists all the available image types.")
(es "La opción @option{--file-system-type} de @command{guix system
disk-image} se ha sustituido por la nueva opción @option{--image-type}. De
manera predeterminada se producen imágenes en formato crudo (@code{raw}) pero
también están disponibles los tipos de imagen @code{hurd-qcow2},
@code{hurd-raw}, @code{uncompressed-iso9660} y @code{iso9660}.
La opción @option{--list-image-types} muestra una lista con todos los tipos
de imagen disponibles.")
(de "Anstelle der Befehlszeilenoption @option{--file-system-type} für (de "Anstelle der Befehlszeilenoption @option{--file-system-type} für
@command{guix system disk-image} gibt es nun die neue Option @command{guix system disk-image} gibt es nun die neue Option
@option{--image-type}. In der Vorgabeeinstellung @code{raw} werden rohe @option{--image-type}. In der Vorgabeeinstellung @code{raw} werden rohe
@ -72,6 +134,8 @@ disponibles.")))
(entry (commit "8819551c8d2a12cd4e84e09b51e434d05a012c9d") (entry (commit "8819551c8d2a12cd4e84e09b51e434d05a012c9d")
(title (en "Package transformations now apply to implicit inputs") (title (en "Package transformations now apply to implicit inputs")
(es "Las transformaciones de paquetes ahora afectan también
a las dependencias implícitas")
(de "Paketumwandlungen betreffen jetzt auch implizite Eingaben") (de "Paketumwandlungen betreffen jetzt auch implizite Eingaben")
(fr "Les transformations de paquets s'appliquent aux (fr "Les transformations de paquets s'appliquent aux
dépendances implicites")) dépendances implicites"))
@ -96,6 +160,26 @@ guix build --with-graft=glibc=glibc@@2.31 hello
Run @command{info \"(guix) Package Transformation Options\"} for more Run @command{info \"(guix) Package Transformation Options\"} for more
info.") info.")
(es "Las opciones de transformación de paquetes como
@option{--with-branch}, @option{--with-input}, etcétera, ahora también
influyen en las entradas implícitas---antes únicamente las entradas explícitas
del paquete se veían afectadas. Esto permite, por ejemplo, sustituir la
dependencia en python de un paquete que use @code{python-build-system}:
@example
guix install --with-input=python=python2 python-itsdangerous
@end example
Otro ejemplo podría ser el injerto de una versión diferente de la biblioteca
de C de GNU (@code{glibc} es una entrada implícita de casi todos los paquetes
y ``muy abajo'' en el grafo de dependencias):
@example
guix build --with-graft=glibc=glibc@@2.31 hello
@end example
Ejecute @command{info \"(guix.es) Opciones de transformación de paquetes\"}
para obtener más información.")
(de "Paketumwandlungsoptionen wie @option{--with-branch}, (de "Paketumwandlungsoptionen wie @option{--with-branch},
@option{--with-input} und so weiter betreffen nun auch implizite Eingaben  @option{--with-input} und so weiter betreffen nun auch implizite Eingaben 
zuvor haben sie sich nur auf die expliziten Eingaben eines Pakets zuvor haben sie sich nur auf die expliziten Eingaben eines Pakets
@ -140,6 +224,7 @@ plus de détails.")))
(entry (commit "f458cfbcc54ed87b1a87dd9e150ea276f17eab74") (entry (commit "f458cfbcc54ed87b1a87dd9e150ea276f17eab74")
(title (en "New @option{--without-tests} transformation option") (title (en "New @option{--without-tests} transformation option")
(es "Nueva opción de transformación @option{--without-tests}")
(de "Neue Paketumwandlungsoption @option{--without-tests}") (de "Neue Paketumwandlungsoption @option{--without-tests}")
(fr "Nouvelle option de transformation @option{--without-tests}")) (fr "Nouvelle option de transformation @option{--without-tests}"))
(body (body
@ -156,6 +241,21 @@ This is primarily useful as a way to speed up development cycles, or to work
around flaky test suites---skipping tests can hide real issues, so use with around flaky test suites---skipping tests can hide real issues, so use with
care. Run @command{info \"(guix) Package Transformation Options\"} for more care. Run @command{info \"(guix) Package Transformation Options\"} for more
info.") info.")
(es "La nueva opción de transformación de paquetes
@option{--without-tests} indica a Guix que omita la batería de pruebas del
paquete proporcionado. En el siguiente ejemplo @code{guile-gcrypt} se
construye usando una variación de @code{automake}, la cual se ha construido
sin ejecutar su (larga) batería de pruebas:
@example
guix build guile-gcrypt --without-tests=automake
@end example
Esto es principalmente útil como una forma de acelerar ciclos de desarrollo o
de omitir temporalmente baterías de pruebas problemáticas---omitir las pruebas
puede ocultar problemas reales, por lo que debe usarse con precaución.
Ejecute @command{info \"(guix.es) Opciones de transformación de paquetes\"}
para obtener más información.")
(de "Mit der neuen Paketumwandlungsoption @option{--without-tests} (de "Mit der neuen Paketumwandlungsoption @option{--without-tests}
wird Guix angewiesen, den Testkatalog des angegebenen Pakets zu wird Guix angewiesen, den Testkatalog des angegebenen Pakets zu
überspringen. Im folgenden Beispiel wird @code{guile-gcrypt} mit einer überspringen. Im folgenden Beispiel wird @code{guile-gcrypt} mit einer
@ -189,6 +289,7 @@ paquets\"} pour plus de détails.")))
(entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f") (entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f")
(title (en "New @command{guix git authenticate} command") (title (en "New @command{guix git authenticate} command")
(es "Nueva orden @command{guix git authenticate}")
(de "Neuer Befehl @command{guix git authenticate}") (de "Neuer Befehl @command{guix git authenticate}")
(fr "Nouvelle commande @command{guix git authenticate}")) (fr "Nouvelle commande @command{guix git authenticate}"))
(body (body
@ -204,6 +305,20 @@ to allow people to authenticate code fetched from your repository.
Run @command{info \"(guix) Invoking guix git authenticate\"} for more info, Run @command{info \"(guix) Invoking guix git authenticate\"} for more info,
and see @uref{https://guix.gnu.org/blog/2020/securing-updates/} for details on and see @uref{https://guix.gnu.org/blog/2020/securing-updates/} for details on
these mechanisms.") these mechanisms.")
(es "La nueva orden @command{guix git authenticate} comprueba la
validez de un repositorio git verificando las firmas de las revisiones y
comprobando que todas las firmas están autorizadas, exactamente igual que
@command{guix pull}.
Esta orden es principalmente útil para desarrolladoras de canales. Permite
asegurar, antes de subir nada al repositorio remoto, que el canal contiene
únicamente revisiones firmadas por claves autorizadas. No obstante esta orden
es útil siempre que use git y quiera que otras personas puedan verificar el
código obtenido de su repositorio.
Ejecute @command{info \"(guix.es) Invocación de guix git authenticate\"}
para obtener más información y vea detalles sobre estos mecanismos en
@uref{https://guix.gnu.org/blog/2020/securing-updates/}.")
(de "Mit dem neuen Befehl @command{guix git authenticate} können Sie (de "Mit dem neuen Befehl @command{guix git authenticate} können Sie
ein Git-Repository authentifizieren. Dazu werden alle Commit-Signaturen ein Git-Repository authentifizieren. Dazu werden alle Commit-Signaturen
verifiziert und geprüft, dass jede von einer autorisierten Quelle kommt, genau verifiziert und geprüft, dass jede von einer autorisierten Quelle kommt, genau
@ -236,6 +351,7 @@ pour en savoir plus sur ces mécanismes.")))
(entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835")
(title (en "@command{guix pull} authenticates channels") (title (en "@command{guix pull} authenticates channels")
(es "@command{guix pull} verifica los canales")
(de "@command{guix pull} authentifiziert Kanäle") (de "@command{guix pull} authentifiziert Kanäle")
(fr "@command{guix pull} authentifie les canaux")) (fr "@command{guix pull} authentifie les canaux"))
(body (body
@ -248,6 +364,16 @@ repository and from attempts to ship malicious code to users.
This feature is currently limited to the @code{guix} channel but will soon be This feature is currently limited to the @code{guix} channel but will soon be
available to third-party channel authors.") available to third-party channel authors.")
(es "Las ordenes @command{guix pull} y @command{guix time-machine}
ahora verifican el código fuente que obtienen, a menos que se proporcione la
opción @option{--disable-authentication}. Lo que esto significa es que Guix se
asegura de que cada revisión que recibe está firmada criptográficamente por
una desarrolladora autorizada. Esto le protege de intentos de modificación del
repositorio de Guix y de entregas de código con malas intenciones sobre las
usuarias.
Esta característica está limitada actualmente al canal @code{guix} pero pronto
estará disponible para autoras de canales independientes.")
(de "Die Befehle @command{guix pull} und @command{guix time-machine} (de "Die Befehle @command{guix pull} und @command{guix time-machine}
prüfen nun die Authentizität des heruntergeladenen Quellcodes, außer wenn die prüfen nun die Authentizität des heruntergeladenen Quellcodes, außer wenn die
neue Befehlszeilenoption @option{--disable-authentication} angegeben neue Befehlszeilenoption @option{--disable-authentication} angegeben
@ -271,6 +397,7 @@ Cette fonctionnalité n'est actuellement disponible que pour le canal
(entry (commit "c924e541390f9595d819edc33c19d979917c15ec") (entry (commit "c924e541390f9595d819edc33c19d979917c15ec")
(title (en "@command{guix repl} adds support for running Guile scripts") (title (en "@command{guix repl} adds support for running Guile scripts")
(es "@command{guix repl} puede ejecutar guiones de Guile")
(de "@command{guix repl} kann Guile-Skripte ausführen") (de "@command{guix repl} kann Guile-Skripte ausführen")
(fr "@command{guix repl} permet d'exécuter des scripts en langage Guile")) (fr "@command{guix repl} permet d'exécuter des scripts en langage Guile"))
(body (body
@ -284,6 +411,18 @@ guix repl -- my-script,scm --option1 --option2=option-arg arg1 arg2
@end example @end example
Run @command{info \"(guix) Invoking guix repl\"} for more information.") Run @command{info \"(guix) Invoking guix repl\"} for more information.")
(es "La orden @command{guix repl} ahora se puede usar para
ejecutar guiones de Guile. En comparación con únicamente la ejecución
de la orden @command{guile}, @command{guix repl} garantiza que todos
los módulos de Guix y sus dependencias están disponibles en la ruta
de búsqueda. Los guiones se ejecutan de este modo:
@example
guix repl -- mi-guion.scm --opcion1 --opcion2=param-op2 param1 param2
@end example
Ejecute @command{info \"(guix.es) Invocación de guix repl\"} para obtener
más información.")
(de "Der Befehl @command{guix repl} kann jetzt zur Ausführung von (de "Der Befehl @command{guix repl} kann jetzt zur Ausführung von
Guile-Skripten verwendet werden. Im Vergleich zum Befehl Guile-Skripten verwendet werden. Im Vergleich zum Befehl
@command{guile} garantiert @command{guix repl}, dass alle Guix-Module und @command{guile} garantiert @command{guix repl}, dass alle Guix-Module und
@ -310,6 +449,7 @@ Exécutez @command{info \"(guix.fr) Invoquer guix repl\"} pour plus d'informatio
(entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b") (entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b")
(title (en "Add support to boot from a Btrfs subvolume") (title (en "Add support to boot from a Btrfs subvolume")
(es "Implementado el arranque desde un subvolumen de Btrfs")
(de "Unterstützung für Systemstart von einem (de "Unterstützung für Systemstart von einem
Btrfs-Unterlaufwerk hinzugefügt") Btrfs-Unterlaufwerk hinzugefügt")
(fr "Ajout du support pour démarrer depuis un sous-volume Btrfs") (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs")
@ -320,6 +460,11 @@ operating system declaration now takes into account the use of a Btrfs
subvolume for the partition holding @file{/gnu/store}. Run the command subvolume for the partition holding @file{/gnu/store}. Run the command
@command{info \"(guix) Btrfs file system\"} for more information and @command{info \"(guix) Btrfs file system\"} for more information and
examples.") examples.")
(es "El fichero de configuración de GRUB producido por la
declaración de sistema operativo ahora tiene en cuenta el uso de
subvolúmenes de Btrfs en la partición que contiene @file{/gnu/store}.
Ejecute la orden @command{info \"(guix.es) Sistema de ficheros Btrfs\"}
para obtener más información y ejemplos.")
(de "Für die Erzeugung einer GRUB-Konfigurationsdatei aus einer (de "Für die Erzeugung einer GRUB-Konfigurationsdatei aus einer
Betriebssystemdeklaration kann jetzt ein Btrfs-Unterlaufwerk (Subvolume) für Betriebssystemdeklaration kann jetzt ein Btrfs-Unterlaufwerk (Subvolume) für
die Partition mit @file{/gnu/store} angegeben werden. Führen Sie die Partition mit @file{/gnu/store} angegeben werden. Führen Sie
@ -339,6 +484,8 @@ voorbeelden.")))
(entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e")
(title (en "@command{guix pack -RR} introduces a new execution (title (en "@command{guix pack -RR} introduces a new execution
engine") engine")
(es "@command{guix pack -RR} introduce un nuevo motor
de ejecución")
(de "@command{guix pack -RR} führt neuen Ausführungstreiber (de "@command{guix pack -RR} führt neuen Ausführungstreiber
ein")) ein"))
(body (body
@ -359,6 +506,26 @@ export GUIX_EXECUTION_ENGINE
@end example @end example
Run @command{info \"(guix) Invoking guix pack\"} for more information.") Run @command{info \"(guix) Invoking guix pack\"} for more information.")
(es "La orden @command{guix pack -RR} le permite crear un
archivador tar que contiene @dfn{binarios reposicionables}. Hasta ahora
dichos binarios dependían o bien de los ``espacios de nombres de usuarias
sin privilegios'' de Linux o en PRoot, cuando estos no estaban
implementados. No obstante, PRoot introduce una sobrecarga significativa
en algunos escenarios de trabajo.
Para estos casos @command{guix pack -RR} introduce una tercera opción
basada en una extensión al enlazador de tiempo de ejecución de GNU (ld.so)
y en Fakechroot, lo que conlleva muy poca sobrecarga. Puede seleccionar
la opción más rápida cuando ejecute un binario reposicionable de esta
manera:
@example
GUIX_EXECUTION_ENGINE=performance
export GUIX_EXECUTION_ENGINE
@end example
Ejecute @command{info \"(guix.es) Invocación de guix pack\"} para
obtener más información.")
(de "Mit dem Befehl @command{guix pack -RR} können Sie einen Tarball (de "Mit dem Befehl @command{guix pack -RR} können Sie einen Tarball
mit @dfn{verschieblichen Binärdateien} erzeugen (englisch Relocatable mit @dfn{verschieblichen Binärdateien} erzeugen (englisch Relocatable
Binaries). Bisher wurden diese entweder in unprivilegierten Binaries). Bisher wurden diese entweder in unprivilegierten
@ -383,6 +550,7 @@ mehr wissen wollen.")))
(entry (commit "88a96c568c47c97d05d883ada5afbc4e1200b10f") (entry (commit "88a96c568c47c97d05d883ada5afbc4e1200b10f")
(title (en "New @option{--path} option for @command{guix graph}") (title (en "New @option{--path} option for @command{guix graph}")
(es "Nueva opción @option{--path} para @command{guix graph}")
(de "Neue Option @option{--path} für @command{guix graph}")) (de "Neue Option @option{--path} für @command{guix graph}"))
(body (body
(en "The @command{guix graph} command has a new @option{--path} (en "The @command{guix graph} command has a new @option{--path}
@ -395,6 +563,18 @@ guix graph --path libreoffice libunistring
@end example @end example
Run @code{info \"(guix) Invoking guix graph\"} for more information.") Run @code{info \"(guix) Invoking guix graph\"} for more information.")
(es "La orden @command{guix graph} tiene una nueva opción
@option{--path} que le indica que debe mostrar la ruta más corta entre dos
paquetes, derivaciones o elementos del almacén. Por ejemplo, la siguiente
orden muestra la ruta más corta desde el paquete @code{libreoffice} hasta
@code{libunistring}:
@example
guix graph --path libreoffice libunistring
@end example
Ejecute @code{info \"(guix.es) Invocación de guix graph\"} para obtener más
información.")
(de "Der Befehl @command{guix graph} verfügt über eine neue (de "Der Befehl @command{guix graph} verfügt über eine neue
Befehlszeilenoption @option{--path}, die ihn den kürzesten Pfad zwischen zwei Befehlszeilenoption @option{--path}, die ihn den kürzesten Pfad zwischen zwei
Paketen, Ableitungen oder Store-Objekten ausgeben lässt. Zum Beispiel zeigt Paketen, Ableitungen oder Store-Objekten ausgeben lässt. Zum Beispiel zeigt

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,6 +54,7 @@ TARGET."
(append (map specification->package (append (map specification->package
'("xorg-server" "xfce" "gnome" "mate" "enlightenment" '("xorg-server" "xfce" "gnome" "mate" "enlightenment"
"openbox" "awesome" "i3-wm" "ratpoison" "openbox" "awesome" "i3-wm" "ratpoison"
"emacs" "emacs-exwm" "emacs-desktop-environment"
"xlockmore" "slock" "libreoffice" "xlockmore" "slock" "libreoffice"
"connman" "network-manager" "network-manager-applet" "connman" "network-manager" "network-manager-applet"
"openssh" "ntp" "tor" "openssh" "ntp" "tor"

View file

@ -244,6 +244,7 @@ set."
(false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin")))
(false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout")))
(false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))
(false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash")))
;; Make sure /etc/mtab is a symlink to /proc/mounts. ;; Make sure /etc/mtab is a symlink to /proc/mounts.
(false-if-exception (delete-file (scope "etc/mtab"))) (false-if-exception (delete-file (scope "etc/mtab")))

View file

@ -56,6 +56,7 @@
#:use-module (gnu system vm) #:use-module (gnu system vm)
#:use-module (gnu system install) #:use-module (gnu system install)
#:use-module (gnu system images hurd) #:use-module (gnu system images hurd)
#:use-module (gnu system images pine64)
#:use-module (gnu tests) #:use-module (gnu tests)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -203,7 +204,8 @@ SYSTEM."
'("x86_64-linux" "i686-linux")) '("x86_64-linux" "i686-linux"))
(define %guix-system-images (define %guix-system-images
(list hurd-barebones-qcow2-image)) (list hurd-barebones-qcow2-image
pine64-barebones-raw-image))
(define (image-jobs store system) (define (image-jobs store system)
"Return a list of jobs that build images for SYSTEM." "Return a list of jobs that build images for SYSTEM."

View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -40,7 +41,7 @@ choose the one to use on the log-in screen.")
#:items items #:items items
#:selection (map system-service-recommended? items) #:selection (map system-service-recommended? items)
#:item->text system-service-name ;no i18n for DE names #:item->text system-service-name ;no i18n for DE names
#:checkbox-tree-height 8 #:checkbox-tree-height 9
#:exit-button-callback-procedure #:exit-button-callback-procedure
(lambda () (lambda ()
(raise (raise

View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -82,6 +83,11 @@
(name "ratpoison") (name "ratpoison")
(packages '((specification->package "ratpoison") (packages '((specification->package "ratpoison")
(specification->package "xterm")))) (specification->package "xterm"))))
(desktop-environment
(name "Emacs EXWM")
(packages '((specification->package "emacs")
(specification->package "emacs-exwm")
(specification->package "emacs-desktop-environment"))))
;; Networking. ;; Networking.
(system-service (system-service

View file

@ -1229,6 +1229,7 @@ dist_patch_DATA = \
%D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbase-use-own-logging.patch \
%D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
%D%/packages/patches/libcanberra-wayland-crash.patch \
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \
%D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgit2-mtime-0.patch \
%D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnome-encoding.patch \
@ -1291,6 +1292,7 @@ dist_patch_DATA = \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \
%D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lrcalc-includes.patch \
%D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lrzip-CVE-2017-8842.patch \
%D%/packages/patches/lsh-fix-x11-forwarding.patch \
%D%/packages/patches/lua-CVE-2014-5461.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \
%D%/packages/patches/lua-pkgconfig.patch \ %D%/packages/patches/lua-pkgconfig.patch \
%D%/packages/patches/lua51-liblua-so.patch \ %D%/packages/patches/lua51-liblua-so.patch \
@ -1419,6 +1421,7 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \
%D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \
%D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
%D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patchutils-test-perms.patch \
%D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/patch-hurd-path-max.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \
@ -1489,6 +1492,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \
%D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \
%D%/packages/patches/python-chardet-3.0.4-pytest.patch \
%D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-cross-compile.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
%D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-configobj-setuptools.patch \

View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -25,6 +26,7 @@
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages hurd)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (guix packages) #:use-module (guix packages)
@ -49,6 +51,7 @@
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:configure-flags '("--disable-static") #:configure-flags '("--disable-static")
#:tests? ,(not (hurd-target?))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; XXX After repacking the sources the timestamps are reset to the ;; XXX After repacking the sources the timestamps are reset to the

View file

@ -443,7 +443,7 @@ graphs and can export its output to different formats.")
(define-public facter (define-public facter
(package (package
(name "facter") (name "facter")
(version "4.0.41") (version "4.0.43")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -452,7 +452,7 @@ graphs and can export its output to different formats.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09i3kv91g2y5hgl75ccd59gjjvkkri4cj80m7smlx6p14hmbgdif")))) "0ppzr7vsl6iw8x82c4g60mx1vz06nzwcy8byablhg0n0g6qa3pb0"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1414,18 +1414,12 @@ system administrator.")
(delete-file-recursively "lib/zlib") (delete-file-recursively "lib/zlib")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" "python")) (outputs (list "out"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--docdir=" (assoc-ref %outputs "out") (list (string-append "--docdir=" (assoc-ref %outputs "out")
"/share/doc/" ,name "-" ,version) "/share/doc/" ,name "-" ,version)
;; XXX: Disable Python support when cross-compiling because
;; 'configure' tries to run 'python', which fails.
,(if (%current-target-system)
"--disable-python"
"--enable-python") ; for plug-ins written in ~
"--with-logpath=/var/log/sudo.log" "--with-logpath=/var/log/sudo.log"
"--with-rundir=/var/run/sudo" ; must be cleaned up at boot time "--with-rundir=/var/run/sudo" ; must be cleaned up at boot time
"--with-vardir=/var/db/sudo" "--with-vardir=/var/db/sudo"
@ -1472,34 +1466,19 @@ system administrator.")
(substitute* "plugins/sudoers/Makefile.in" (substitute* "plugins/sudoers/Makefile.in"
(("^pre-install:" match) (("^pre-install:" match)
(string-append match "\ndisabled-" match))) (string-append match "\ndisabled-" match)))
#t)) #t)))
(add-after 'install 'separate-python-output
(lambda* (#:key target outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(out:python (assoc-ref outputs "python")))
(if target
(mkdir-p (string-append out:python "/empty"))
(for-each
(lambda (file)
(let ((old (string-append out "/" file))
(new (string-append out:python "/" file)))
(mkdir-p (dirname new))
(rename-file old new)))
(list "libexec/sudo/python_plugin.so"
"libexec/sudo/python_plugin.la")))
#t))))
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
;; the chroot's /etc/passwd doesn't have it. Turn off the tests. ;; the chroot's /etc/passwd doesn't have it. Turn off the tests.
#:tests? #f)) #:tests? #f))
(native-inputs (native-inputs
`(("groff" ,groff))) ;; XXX TODO: Remove on next rebuild cycle.
(if (hurd-target?)
'()
`(("groff" ,groff))))
(inputs (inputs
`(("coreutils" ,coreutils) `(("coreutils" ,coreutils)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
,@(if (%current-target-system)
'()
`(("python" ,python)))
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://www.sudo.ws/") (home-page "https://www.sudo.ws/")
(synopsis "Run commands as root") (synopsis "Run commands as root")
@ -2606,14 +2585,14 @@ done with the @code{auditctl} utility.")
(define-public nmap (define-public nmap
(package (package
(name "nmap") (name "nmap")
(version "7.90") (version "7.91")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nmap.org/dist/nmap-" version (uri (string-append "https://nmap.org/dist/nmap-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm")) "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2691,7 +2670,7 @@ advanced netcat implementation (ncat), a utility for comparing scan
results (ndiff), and a packet generation and response analysis tool (nping).") results (ndiff), and a packet generation and response analysis tool (nping).")
;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license. ;; both use a 3-clause BSD license.
(license (list license:nmap license:bsd-3)))) (license (list license:npsl license:bsd-3))))
(define-public dstat (define-public dstat
(package (package
@ -2945,6 +2924,8 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) (base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd"))
(patches
(search-patches "sunxi-tools-remove-sys-io.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove binaries contained in the tarball which are only for the ;; Remove binaries contained in the tarball which are only for the
@ -4098,3 +4079,44 @@ the system configuration; hosts only works when using the Guix package manager
on a foreign distro. @command{hosts} works with existing hosts files and on a foreign distro. @command{hosts} works with existing hosts files and
entries, providing commands to add, remove, comment, and search.") entries, providing commands to add, remove, comment, and search.")
(license license:expat))) (license license:expat)))
(define-public nmrpflash
(package
(name "nmrpflash")
(version "0.9.14")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/jclehner/nmrpflash.git")
(commit (string-append "v" version))))
(sha256
(base32 "1fdjrxhjs96rdclbkld57xarf592slhkp79h46z833npxpn12ck1"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libnl" ,libnl)
("libpcap" ,libpcap)))
(arguments
`(#:tests? #f ; None exist
#:make-flags
(list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'install 'prepare-install
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "out") "/bin"))
#t)))))
(home-page "https://github.com/jclehner/nmrpflash")
(synopsis "Netgear unbrick utility")
(description "This package provides a utility to flash a new firmware
image to a Netgear device. It has been tested on Netgear EX2700, EX6120,
EX6150v2, DNG3700v2, R6100, R6220, R7000, D7000, WNR3500, R6400, R6800,
R8000, R8500, WNDR3800, but is likely to be compatible with many other
Netgear devices.")
(license license:gpl3+)))

View file

@ -48,6 +48,7 @@
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
@ -354,7 +355,7 @@ precision.")
(define-public giac (define-public giac
(package (package
(name "giac") (name "giac")
(version "1.6.0-23") (version "1.6.0-25")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -366,7 +367,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/" "~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz")) "giac_" version ".tar.gz"))
(sha256 (sha256
(base32 "0bgc3jw9r0f2bkqv0m4hla7r7mxi3fzscnkjfc5cvffp3nk2gwvf")))) (base32 "11kik2csdg9wy0npiih21kaag0nc89i9ldgk7ak7gvf9ycddm6mh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
@ -431,6 +432,7 @@ precision.")
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("flex" ,flex) ("flex" ,flex)
("hevea" ,hevea)
("python" ,python-wrapper) ("python" ,python-wrapper)
("readline" ,readline) ("readline" ,readline)
("texlive" ,texlive-tiny))) ("texlive" ,texlive-tiny)))

View file

@ -0,0 +1,46 @@
/* GNU Guix --- Functional package management for GNU
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018
Free Software Foundation, Inc.
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
This file is part of GNU Guix.
GNU Guix is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or (at
your option) any later version.
GNU Guix is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. */
/* This file implements a variant of the 'guile' executable that does not
complain about locale issues. */
#include <locale.h>
#include <libguile.h>
static void
inner_main (void *unused, int argc, char **argv)
{
scm_shell (argc, argv);
}
int
main (int argc, char **argv)
{
/* Try to install the current locale; remain silent if it fails. */
if (setlocale (LC_ALL, "") == NULL)
/* The 'guix pull'-provided 'guix' includes at least en_US.utf8 so use
that. That gives us UTF-8 support for 'scm_to_locale_string', etc.,
which is always preferable over the C locale. */
setlocale (LC_ALL, "en_US.utf8");
scm_install_gmp_memory_functions = 1;
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}

View file

@ -569,13 +569,13 @@ detection, and lossless compression.")
(define-public borg (define-public borg
(package (package
(name "borg") (name "borg")
(version "1.1.13") (version "1.1.14")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "borgbackup" version)) (uri (pypi-uri "borgbackup" version))
(sha256 (sha256
(base32 "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn")) (base32 "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -606,7 +606,7 @@ detection, and lossless compression.")
#t)))) #t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:modules ((srfi srfi-26) ; for cut `(#:modules ((srfi srfi-26) ; for cut
(guix build utils) (guix build utils)
(guix build python-build-system)) (guix build python-build-system))
#:phases #:phases

View file

@ -1609,14 +1609,14 @@ problems in genomics, brain imaging, astrophysics, and data mining.")
(define-public r-diffbind (define-public r-diffbind
(package (package
(name "r-diffbind") (name "r-diffbind")
(version "2.16.0") (version "2.16.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DiffBind" version)) (uri (bioconductor-uri "DiffBind" version))
(sha256 (sha256
(base32 (base32
"1mwqgljya1c7r2dfrdds3nswn9bn1l3ak1wavbpv4lbv3nkmykn5")))) "11y9kigdikqcd0cnksh306nsaadak0kgivk7773mv3yszrxxwzj1"))))
(properties `((upstream-name . "DiffBind"))) (properties `((upstream-name . "DiffBind")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -2707,13 +2707,13 @@ gene and isoform level using RNA-seq data")
(define-public r-karyoploter (define-public r-karyoploter
(package (package
(name "r-karyoploter") (name "r-karyoploter")
(version "1.14.0") (version "1.14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "karyoploteR" version)) (uri (bioconductor-uri "karyoploteR" version))
(sha256 (sha256
(base32 (base32
"0h0gk4xd95k5phy6qcsv7j931d7gk3p24i2fg4mz5dsk110lpifs")))) "1wlnzkq58baqj9854nzf5rbglchb2xy4wsp3s0q8xfq8v0p3baxf"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi) `(("r-annotationdbi" ,r-annotationdbi)
@ -3628,14 +3628,14 @@ information about samples and features can be added to the plot.")
(define-public r-gosemsim (define-public r-gosemsim
(package (package
(name "r-gosemsim") (name "r-gosemsim")
(version "2.14.1") (version "2.14.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GOSemSim" version)) (uri (bioconductor-uri "GOSemSim" version))
(sha256 (sha256
(base32 (base32
"0v4q9xr1cm5xr08pgbzrss41kh3yz7xyh31n55l0sjmr1629ykln")))) "02r7m1x6g8bb7q8l0hpvakdzdv5v1nplhx5lbiy798a7c3xg895b"))))
(properties `((upstream-name . "GOSemSim"))) (properties `((upstream-name . "GOSemSim")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -4364,14 +4364,14 @@ position-specific scores within R and Bioconductor.")
(define-public r-atacseqqc (define-public r-atacseqqc
(package (package
(name "r-atacseqqc") (name "r-atacseqqc")
(version "1.12.4") (version "1.12.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ATACseqQC" version)) (uri (bioconductor-uri "ATACseqQC" version))
(sha256 (sha256
(base32 (base32
"1gs9862hhh4gr1akij6ykhcj29s9dzg1vnj87hqrm19dfgl43qbh")))) "1103daz82k97vzmxjmf7jwm2nd3w8i0jwplrsi9996bkih11qwbf"))))
(properties `((upstream-name . "ATACseqQC"))) (properties `((upstream-name . "ATACseqQC")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -5062,14 +5062,14 @@ based on @dfn{Continuous Wavelet Transform} (CWT).")
(define-public r-xcms (define-public r-xcms
(package (package
(name "r-xcms") (name "r-xcms")
(version "3.10.1") (version "3.10.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "xcms" version)) (uri (bioconductor-uri "xcms" version))
(sha256 (sha256
(base32 (base32
"1aa11gy1v7kkamv3hsnvdx715q8f1saw9p664j6wifyjj0hx13kn")))) "0sk53jcl7sjrpw2ncdpl8sw1b1j9mizlrj517rinr1qrbm6lsn8f"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-biobase" ,r-biobase) `(("r-biobase" ,r-biobase)
@ -7161,14 +7161,14 @@ data.")
(define-public r-activedriverwgs (define-public r-activedriverwgs
(package (package
(name "r-activedriverwgs") (name "r-activedriverwgs")
(version "1.1.0") (version "1.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ActiveDriverWGS" version)) (uri (cran-uri "ActiveDriverWGS" version))
(sha256 (sha256
(base32 (base32
"0l6h0f54zjvcx19ngq3kp01dypsjqf28vssjm8yzccmpyacfypag")))) "06mvakdc8d2pn91p0sr4ixc561s4ia5h1cvd1p7pqd6s50dy4say"))))
(properties (properties
`((upstream-name . "ActiveDriverWGS"))) `((upstream-name . "ActiveDriverWGS")))
(build-system r-build-system) (build-system r-build-system)
@ -7247,14 +7247,14 @@ gene expression.")
(define-public r-bgx (define-public r-bgx
(package (package
(name "r-bgx") (name "r-bgx")
(version "1.54.0") (version "1.54.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "bgx" version)) (uri (bioconductor-uri "bgx" version))
(sha256 (sha256
(base32 (base32
"0r67a6m5hrnsxgk0f57hl5yaagi2wai2kpfyjjlhrck4rlm1sjcx")))) "0a10fg9n5p024jrmbis102gqpbz23sc6vdn1sal2697hlxikzb46"))))
(properties `((upstream-name . "bgx"))) (properties `((upstream-name . "bgx")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -8187,14 +8187,14 @@ truncated data.")
(define-public r-interval (define-public r-interval
(package (package
(name "r-interval") (name "r-interval")
(version "1.1-0.1") (version "1.1-0.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "interval" version)) (uri (cran-uri "interval" version))
(sha256 (sha256
(base32 (base32
"1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8")))) "1b31lh0sv7lzy76230djipahxa10lblbr37kdiigr6hp3dd1xmz9"))))
(properties `((upstream-name . "interval"))) (properties `((upstream-name . "interval")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -8214,14 +8214,14 @@ plot them, and perform logrank or Wilcoxon type tests.")
(define-public r-fhtest (define-public r-fhtest
(package (package
(name "r-fhtest") (name "r-fhtest")
(version "1.4") (version "1.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "FHtest" version)) (uri (cran-uri "FHtest" version))
(sha256 (sha256
(base32 (base32
"1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2")))) "00mql2r4f5hxhdqf27q3x9s5rz2zzakx2myym97b1w1s7c5znl4q"))))
(properties `((upstream-name . "FHtest"))) (properties `((upstream-name . "FHtest")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

View file

@ -4225,6 +4225,13 @@ performance.")
(base32 (base32
"16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0")))) "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Let htslib translate "gs://" and "s3://" to regular https links with
;; "--enable-gcs" and "--enable-s3". For these options to work, we also
;; need to set "--enable-libcurl".
(arguments
`(#:configure-flags '("--enable-gcs"
"--enable-libcurl"
"--enable-s3")))
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
("openssl" ,openssl))) ("openssl" ,openssl)))
@ -7539,13 +7546,13 @@ also known as views, in a controlled vocabulary.")
(define-public r-biocstyle (define-public r-biocstyle
(package (package
(name "r-biocstyle") (name "r-biocstyle")
(version "2.16.0") (version "2.16.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BiocStyle" version)) (uri (bioconductor-uri "BiocStyle" version))
(sha256 (sha256
(base32 (base32
"07rjl2n4sazdg581zh7w3yykzphgr2gpz41ba4ryqs7347vh9nbf")))) "09sz2bnbfbj8wz16k0q8xrvag9fldxqyp5vbg9pvd9skh28hv7c7"))))
(properties (properties
`((upstream-name . "BiocStyle"))) `((upstream-name . "BiocStyle")))
(build-system r-build-system) (build-system r-build-system)
@ -8848,13 +8855,13 @@ of gene-level counts.")
(define-public r-rhdf5 (define-public r-rhdf5
(package (package
(name "r-rhdf5") (name "r-rhdf5")
(version "2.32.2") (version "2.32.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "rhdf5" version)) (uri (bioconductor-uri "rhdf5" version))
(sha256 (sha256
(base32 (base32
"1v6ygi0avh3gmaj2ld2nr7vww4ipw39b5kqci9w27i3ja985lb8j")))) "0fnx60dpf6s2qwq48lg98g18g8k7wgm66pw0kamlbb7l2hnwycvf"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-rhdf5lib" ,r-rhdf5lib))) `(("r-rhdf5lib" ,r-rhdf5lib)))
@ -10272,14 +10279,14 @@ interval to data view, mismatch pileup, and several splicing summaries.")
(define-public r-gqtlbase (define-public r-gqtlbase
(package (package
(name "r-gqtlbase") (name "r-gqtlbase")
(version "1.20.0") (version "1.20.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "gQTLBase" version)) (uri (bioconductor-uri "gQTLBase" version))
(sha256 (sha256
(base32 (base32
"06xvzp4fn3qfa46ggg8kxi267gbyd821vvx4040173xkqxpr0g5j")))) "1ly14vhhqxjpbxjypi6ppd37dycabdhf4ny4nsvp9969k418zv41"))))
(properties `((upstream-name . "gQTLBase"))) (properties `((upstream-name . "gQTLBase")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

View file

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -40,6 +40,7 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages hurd)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -138,6 +139,15 @@
,(%current-target-system))))) ,(%current-target-system)))))
'()) '())
;; Change an #ifdef __MACH__ that really targets macOS.
;; TODO: Inline this on the next rebuild cycle.
,@(if (hurd-target?)
'((substitute* "boost/test/utils/timer.hpp"
(("defined\\(__MACH__\\)")
"(defined __MACH__ && !defined __GNU__)"))
#t)
'())
(invoke "./bootstrap.sh" (invoke "./bootstrap.sh"
(string-append "--prefix=" out) (string-append "--prefix=" out)
;; Auto-detection looks for ICU only in traditional ;; Auto-detection looks for ICU only in traditional

View file

@ -8,7 +8,7 @@
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright @ 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

View file

@ -349,7 +349,7 @@ a multi-paradigm automated test framework for C++ and Objective-C.")
(define-public catch-framework2 (define-public catch-framework2
(package (package
(name "catch2") (name "catch2")
(version "2.13.1") (version "2.13.2")
(home-page "https://github.com/catchorg/Catch2") (home-page "https://github.com/catchorg/Catch2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -359,7 +359,7 @@ a multi-paradigm automated test framework for C++ and Objective-C.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1fbzdqzvad3nxsxlwd5ws7csj6rbyyrza0ckq6km2cf5bhhxagrs")))) "100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("python" ,python-wrapper))) `(("python" ,python-wrapper)))

View file

@ -68,8 +68,8 @@
(file-name (string-append name "-" version "-checkout"))))))) (file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass (define-public cuirass
(let ((commit "71aac24f3fe8cb396c9d232453d8721519cae914") (let ((commit "cb2c4e3d8f7eda187adf6da1fc35aef838c49828")
(revision "50")) (revision "51"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -81,7 +81,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0d9s39zi44fvck3dqd58j35wdiwa1s4f86lms3gagvkzbc0mwdia")))) "0f2di2pqqw8k4ii7h65kbzyf2d4w7nd5n3a93a8l9si4phf6a5c7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)

View file

@ -39,7 +39,7 @@
(define-public drbd-utils (define-public drbd-utils
(package (package
(name "drbd-utils") (name "drbd-utils")
(version "9.13.1") (version "9.15.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Older releases are moved to /archive. List it first because in ;; Older releases are moved to /archive. List it first because in
@ -51,7 +51,7 @@
"/utils/drbd-utils-" version ".tar.gz"))) "/utils/drbd-utils-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0di55y0vzaw8jhcgz0fakww03h1gpg4a5q1zklxhjw3dwzjvysnk")) "0jh7zdxpbjkq53pmrn0jfn33abi4vs8axp55h5256czwc2gfb6z8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View file

@ -3856,8 +3856,12 @@ COREUTILS-FINAL vs. COREUTILS, etc."
"libc-static"))) "libc-static")))
#t)))) #t))))
(native-search-paths (package-native-search-paths gcc)) (native-search-paths
(search-paths (package-search-paths gcc)) (append (package-native-search-paths gcc)
(package-native-search-paths libc))) ;GUIX_LOCPATH
(search-paths
(append (package-search-paths gcc)
(package-search-paths libc)))
(license (package-license gcc)) (license (package-license gcc))
(synopsis "Complete GCC tool chain for C/C++ development") (synopsis "Complete GCC tool chain for C/C++ development")

View file

@ -41,12 +41,22 @@
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages code) #:use-module (gnu packages code)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages logging)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web)) #:use-module (gnu packages web))
@ -669,3 +679,52 @@ parsers according to a Parsing Expression Grammar (PEG).")
standard GNU style syntax for options.") standard GNU style syntax for options.")
(home-page "https://github.com/jarro2783/cxxopts/wiki") (home-page "https://github.com/jarro2783/cxxopts/wiki")
(license license:expat))) (license license:expat)))
(define-public folly
(package
(name "folly")
(version "2020.10.05.00")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/facebook/folly")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))))
(build-system cmake-build-system)
(arguments
'(;; Tests must be explicitly enabled
;;#:configure-flags '("-DBUILD_TESTS=ON")))
;; Leave tests disabled; see https://github.com/facebook/folly/issues/1456
#:tests? #f))
(propagated-inputs
`(("boost" ,boost)
("gflags" ,gflags)
("glog" ,glog)
("liburing" ,liburing)))
(inputs
`(("bzip2" ,bzip2)
("double-conversion" ,double-conversion)
("fmt" ,fmt)
("libaio" ,libaio)
("libevent" ,libevent)
("libiberty" ,libiberty)
("libsodium" ,libsodium)
("libunwind" ,libunwind)
("lz4" ,lz4)
("openssl" ,openssl)
("snappy" ,snappy)
("zlib" ,zlib)
("zstd" ,zstd "lib")))
(native-inputs
`(("googletest" ,googletest)))
(synopsis "Collection of C++ components complementing the standard library")
(description
"Folly (acronymed loosely after Facebook Open Source Library) is a library
of C++14 components that complements @code{std} and Boost.")
(home-page "https://github.com/facebook/folly/wiki")
;; 32-bit is not supported: https://github.com/facebook/folly/issues/103
(supported-systems '("aarch64-linux" "x86_64-linux"))
(license license:asl2.0)))

File diff suppressed because it is too large Load diff

View file

@ -910,7 +910,7 @@ for computer graphics.")
`(#:tests? #f ; Some test images are missing from the release. `(#:tests? #f ; Some test images are missing from the release.
#:cargo-inputs #:cargo-inputs
(("rust-bytemuck" ,rust-bytemuck-1) (("rust-bytemuck" ,rust-bytemuck-1)
("rust-byteorder" ,rust-byteorder-1.3) ("rust-byteorder" ,rust-byteorder-1)
("rust-gif" ,rust-gif-0.10) ("rust-gif" ,rust-gif-0.10)
("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1)
("rust-num-iter" ,rust-num-iter-0.1) ("rust-num-iter" ,rust-num-iter-0.1)
@ -920,7 +920,7 @@ for computer graphics.")
("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
("rust-tiff" ,rust-tiff-0.5)) ("rust-tiff" ,rust-tiff-0.5))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-crc32fast" ,rust-crc32fast-1.2) (("rust-crc32fast" ,rust-crc32fast-1)
("rust-criterion" ,rust-criterion-0.3) ("rust-criterion" ,rust-criterion-0.3)
("rust-glob" ,rust-glob-0.3) ("rust-glob" ,rust-glob-0.3)
("rust-num-complex" ,rust-num-complex-0.3) ("rust-num-complex" ,rust-num-complex-0.3)
@ -949,7 +949,7 @@ for the most common image formats.")
(arguments (arguments
`(#:tests? #f ; Some test images are missing from the release. `(#:tests? #f ; Some test images are missing from the release.
#:cargo-inputs #:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-gif" ,rust-gif-0.10) ("rust-gif" ,rust-gif-0.10)
("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1)
("rust-num-iter" ,rust-num-iter-0.1) ("rust-num-iter" ,rust-num-iter-0.1)
@ -959,7 +959,7 @@ for the most common image formats.")
("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
("rust-tiff" ,rust-tiff-0.3)) ("rust-tiff" ,rust-tiff-0.3))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-crc32fast" ,rust-crc32fast-1.2) (("rust-crc32fast" ,rust-crc32fast-1)
("rust-glob" ,rust-glob-0.3) ("rust-glob" ,rust-glob-0.3)
("rust-num-complex" ,rust-num-complex-0.2) ("rust-num-complex" ,rust-num-complex-0.2)
("rust-quickcheck" ,rust-quickcheck-0.9)))))) ("rust-quickcheck" ,rust-quickcheck-0.9))))))
@ -980,7 +980,7 @@ for the most common image formats.")
"1sv534xp8yyn7jj0q6yn2bgng1350f962g81sv8v7c6pgi31wdrm")))) "1sv534xp8yyn7jj0q6yn2bgng1350f962g81sv8v7c6pgi31wdrm"))))
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-gif" ,rust-gif-0.10) ("rust-gif" ,rust-gif-0.10)
("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1)
("rust-lzw" ,rust-lzw-0.10) ("rust-lzw" ,rust-lzw-0.10)
@ -1011,7 +1011,7 @@ for the most common image formats.")
"01058n0jcw25pq5shn7lkvywv8c28xsxb3nwwyb4r16ijm1mnrj4")))) "01058n0jcw25pq5shn7lkvywv8c28xsxb3nwwyb4r16ijm1mnrj4"))))
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-gif" ,rust-gif-0.10) ("rust-gif" ,rust-gif-0.10)
("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1) ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1)
("rust-lzw" ,rust-lzw-0.10) ("rust-lzw" ,rust-lzw-0.10)
@ -1043,7 +1043,7 @@ for the most common image formats.")
(arguments (arguments
`(#:tests? #f ; Some test files missing. `(#:tests? #f ; Some test files missing.
#:cargo-inputs #:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-rayon" ,rust-rayon-1)) ("rust-rayon" ,rust-rayon-1))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3) (("rust-criterion" ,rust-criterion-0.3)
@ -1538,7 +1538,7 @@ interactive applications.")
`(#:skip-build? #t `(#:skip-build? #t
#:cargo-inputs #:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1) (("rust-bitflags" ,rust-bitflags-1)
("rust-crc32fast" ,rust-crc32fast-1.2) ("rust-crc32fast" ,rust-crc32fast-1)
("rust-deflate" ,rust-deflate-0.8) ("rust-deflate" ,rust-deflate-0.8)
("rust-miniz-oxide" ,rust-miniz-oxide-0.3)) ("rust-miniz-oxide" ,rust-miniz-oxide-0.3))
#:cargo-development-inputs #:cargo-development-inputs
@ -1573,7 +1573,7 @@ interactive applications.")
`(#:skip-build? #t `(#:skip-build? #t
#:cargo-inputs #:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1) (("rust-bitflags" ,rust-bitflags-1)
("rust-crc32fast" ,rust-crc32fast-1.2) ("rust-crc32fast" ,rust-crc32fast-1)
("rust-deflate" ,rust-deflate-0.7) ("rust-deflate" ,rust-deflate-0.7)
("rust-inflate" ,rust-inflate-0.4)) ("rust-inflate" ,rust-inflate-0.4))
#:cargo-development-inputs #:cargo-development-inputs
@ -1740,7 +1740,7 @@ first-class Rust objects.")
("rust-wayland-client" ,rust-wayland-client-0.23) ("rust-wayland-client" ,rust-wayland-client-0.23)
("rust-wayland-protocols" ,rust-wayland-protocols-0.23)) ("rust-wayland-protocols" ,rust-wayland-protocols-0.23))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-image" ,rust-image-0.21) ("rust-image" ,rust-image-0.21)
("rust-wayland-client" ,rust-wayland-client-0.23)))) ("rust-wayland-client" ,rust-wayland-client-0.23))))
(home-page "https://github.com/smithay/client-toolkit") (home-page "https://github.com/smithay/client-toolkit")
@ -1775,7 +1775,7 @@ first-class Rust objects.")
("rust-wayland-commons" ,rust-wayland-commons-0.21) ("rust-wayland-commons" ,rust-wayland-commons-0.21)
("rust-wayland-protocols" ,rust-wayland-protocols-0.21)) ("rust-wayland-protocols" ,rust-wayland-protocols-0.21))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-image" ,rust-image-0.20) ("rust-image" ,rust-image-0.20)
("rust-wayland-client" ,rust-wayland-client-0.21)))))) ("rust-wayland-client" ,rust-wayland-client-0.21))))))
@ -1825,7 +1825,7 @@ first-class Rust objects.")
(arguments (arguments
`(#:tests? #f ; not all test files included `(#:tests? #f ; not all test files included
#:cargo-inputs #:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-lzw" ,rust-lzw-0.10) ("rust-lzw" ,rust-lzw-0.10)
("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) ("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))
(home-page "https://github.com/image-rs/image-tiff") (home-page "https://github.com/image-rs/image-tiff")
@ -1852,7 +1852,7 @@ first-class Rust objects.")
(arguments (arguments
`(#:tests? #f ; Tests images not included with release. `(#:tests? #f ; Tests images not included with release.
#:cargo-inputs #:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-lzw" ,rust-lzw-0.10) ("rust-lzw" ,rust-lzw-0.10)
("rust-num-derive" ,rust-num-derive-0.2) ("rust-num-derive" ,rust-num-derive-0.2)
("rust-num-traits" ,rust-num-traits-0.2)) ("rust-num-traits" ,rust-num-traits-0.2))
@ -1875,7 +1875,7 @@ first-class Rust objects.")
"1kn7psgpacns337vvqh272rkqwnakmjd51rc7ygwnc03ibr38j0y")))) "1kn7psgpacns337vvqh272rkqwnakmjd51rc7ygwnc03ibr38j0y"))))
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-lzw" ,rust-lzw-0.10) ("rust-lzw" ,rust-lzw-0.10)
("rust-num-derive" ,rust-num-derive-0.2) ("rust-num-derive" ,rust-num-derive-0.2)
("rust-num-traits" ,rust-num-traits-0.2)))))) ("rust-num-traits" ,rust-num-traits-0.2))))))
@ -1906,7 +1906,7 @@ first-class Rust objects.")
("rust-wayland-sys" ,rust-wayland-sys-0.23) ("rust-wayland-sys" ,rust-wayland-sys-0.23)
("rust-wayland-scanner" ,rust-wayland-scanner-0.23)) ("rust-wayland-scanner" ,rust-wayland-scanner-0.23))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-tempfile" ,rust-tempfile-3)))) ("rust-tempfile" ,rust-tempfile-3))))
(home-page "https://github.com/smithay/wayland-rs") (home-page "https://github.com/smithay/wayland-rs")
(synopsis (synopsis
@ -1942,7 +1942,7 @@ the wayland protocol, client side.")
("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-sys" ,rust-wayland-sys-0.21)
("rust-wayland-scanner" ,rust-wayland-scanner-0.21)) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-byteorder" ,rust-byteorder-1.3) (("rust-byteorder" ,rust-byteorder-1)
("rust-tempfile" ,rust-tempfile-3)))))) ("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-wayland-commons-0.23 (define-public rust-wayland-commons-0.23
@ -2223,7 +2223,7 @@ protocol extensions. Look at the crate wayland-client for usable bindings.")
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-objc" ,rust-objc-0.2) ("rust-objc" ,rust-objc-0.2)
("rust-parking-lot" ,rust-parking-lot-0.10) ("rust-parking-lot" ,rust-parking-lot-0.10)
("rust-percent-encoding" ,rust-percent-encoding-2.1) ("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-raw-window-handle" ,rust-raw-window-handle-0.3) ("rust-raw-window-handle" ,rust-raw-window-handle-0.3)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6)
@ -2272,7 +2272,7 @@ protocol extensions. Look at the crate wayland-client for usable bindings.")
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-objc" ,rust-objc-0.2) ("rust-objc" ,rust-objc-0.2)
("rust-parking-lot" ,rust-parking-lot-0.9) ("rust-parking-lot" ,rust-parking-lot-0.9)
("rust-percent-encoding" ,rust-percent-encoding-2.1) ("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-raw-window-handle" ,rust-raw-window-handle-0.3) ("rust-raw-window-handle" ,rust-raw-window-handle-0.3)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4) ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4)

File diff suppressed because it is too large Load diff

View file

@ -1041,3 +1041,47 @@ of choice for all light thinking Unix addicts!")
temperature of your hard drive by reading S.M.A.R.T. information (for drives temperature of your hard drive by reading S.M.A.R.T. information (for drives
that support this feature).") that support this feature).")
(license license:gpl2+))) (license license:gpl2+)))
(define-public memkind
(package
(name "memkind")
(version "1.10.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/memkind/memkind.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11iz887f3cp5pzf1bzm644wzab8gkbhz3b7x1w6pcps71yd94ylj"))))
(build-system gnu-build-system)
(inputs
`(;; memkind patched jemalloc to add je_arenalookupx,
;; je_check_reallocatex--i.e. they forked jemalloc.
;("jemalloc" ,jemalloc)
("ndctl" ,ndctl)
("numactl" ,numactl)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(arguments
`(#:tests? #f ; Tests require a NUMA-enabled system.
#:phases
(modify-phases %standard-phases
(add-before 'build 'autogen-jemalloc
(lambda _
(with-directory-excursion "jemalloc"
(substitute* "Makefile.in"
(("/bin/sh") (which "sh")))
(invoke "autoconf")
(substitute* "configure"
(("/bin/sh") (which "sh"))))
#t)))))
(home-page "https://github.com/memkind/memkind")
(synopsis "Heap manager with memory kinds (for NUMA)")
(description "This package provides a user-extensible heap manager
built on top of jemalloc which enables control of memory characteristics
and a partitioning of the heap between kinds of memory (for NUMA).")
(license license:bsd-3)))

View file

@ -17,6 +17,7 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -45,6 +46,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
#:use-module (gnu packages elf)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
@ -65,9 +67,11 @@
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages ragel)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -529,14 +533,14 @@ asynchronous fashion.")
(define-public nsd (define-public nsd
(package (package
(name "nsd") (name "nsd")
(version "4.3.2") (version "4.3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v")))) (base32 "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -803,32 +807,57 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "3.0.0") (version "3.0.1")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (git-reference
"knot-" version ".tar.xz")) (url "https://gitlab.nic.cz/knot/knot-dns")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1i76zflc49jbsaj3idxx7a6x87c0lzal294c3fdjyfl7dvznmjgi")))) (base32 "10mlzldxqvbaw78nghkr0s73rlbpz9wg16z14321xw2l9xfibkad"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove Ragel-generated C files. We'll recreate them below.
(for-each delete-file (find-files "." "\\.c\\.[gt]."))
(delete-file "src/libknot/yparser/ypbody.c")
;; Remove bundled library to ensure we always use the system's.
(delete-file-recursively "src/contrib/libbpf")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--sysconfdir=/etc" (list "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--enable-dnstap" ; let tools read/write capture files "--enable-dnstap" ; let tools read/write capture files
"--with-module-dnstap=yes" ; detailed query capturing & logging "--enable-fastparser" ; disabled by default when .git/ exists
(string-append "--with-bash-completions=" "--enable-xdp=auto" ; XXX [=yes] currently means =embedded
(assoc-ref %outputs "out") "--with-module-dnstap=yes") ; detailed query capturing & logging
"/etc/bash_completion.d"))
#:phases #:phases
(modify-phases %standard-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\"")))
#t))
(add-before 'bootstrap 'update-parser
(lambda _
(with-directory-excursion "src"
(invoke "sh" "../scripts/update-parser.sh"))))
(add-before 'configure 'disable-directory-pre-creation (add-before 'configure 'disable-directory-pre-creation
(lambda _ (lambda _
;; Don't install empty directories like /etc outside the store. ;; Don't install empty directories like /etc outside the store.
;; This is needed even when using make config_dir=... install. ;; This is needed even when using make config_dir=... install.
(substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true")) (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))
#t)) #t))
(add-after 'build 'build-info
(lambda _
(invoke "make" "info")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -836,16 +865,28 @@ Extensions} (DNSSEC).")
(etc (string-append doc "/examples/etc"))) (etc (string-append doc "/examples/etc")))
(invoke "make" (invoke "make"
(string-append "config_dir=" etc) (string-append "config_dir=" etc)
"install"))))))) "install"))))
(add-after 'install 'install-info
(lambda _
(invoke "make" "install-info"))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx)
("ragel" ,ragel)
("texinfo" ,texinfo)))
(inputs (inputs
`(("fstrm" ,fstrm) `(("fstrm" ,fstrm)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("jansson" ,jansson) ("jansson" ,jansson)
("libbpf" ,libbpf)
("libcap-ng" ,libcap-ng) ("libcap-ng" ,libcap-ng)
("libedit" ,libedit) ("libedit" ,libedit)
("libelf" ,libelf)
("libidn" ,libidn) ("libidn" ,libidn)
("libnghttp2" ,nghttp2 "lib")
("liburcu" ,liburcu) ("liburcu" ,liburcu)
("lmdb" ,lmdb) ("lmdb" ,lmdb)
("ncurses" ,ncurses) ("ncurses" ,ncurses)

View file

@ -76,7 +76,7 @@ It can read and write LCF and XML files.")
(define-public easyrpg-player (define-public easyrpg-player
(package (package
(name "easyrpg-player") (name "easyrpg-player")
(version "0.6.2.2") (version "0.6.2.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -84,7 +84,7 @@ It can read and write LCF and XML files.")
"/easyrpg-player-" version ".tar.gz")) "/easyrpg-player-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02nrqrb6klynwrq6z0639qnlhr2z900b0y94xr96i12icr7ihm5m")))) "1lahbhgyhky0hgd3xwhgg2nm8mfa9p2i1fzxi00561hnk2ya86pm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

View file

@ -80,6 +80,7 @@
;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com> ;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com>
;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net> ;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2020 Marco Grassi <marco.au.grassi98@protonmail.com> ;;; Copyright © 2020 Marco Grassi <marco.au.grassi98@protonmail.com>
;;; Copyright © 2020 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -197,16 +198,16 @@
(define-public emacs-geiser (define-public emacs-geiser
(package (package
(name "emacs-geiser") (name "emacs-geiser")
(version "0.11.2") (version "0.12")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://gitlab.com/jaor/geiser/") (uri (git-reference
(commit version))) (url "https://gitlab.com/jaor/geiser/")
(file-name (git-file-name name version)) (commit version)))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv")))) (base32 "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -218,7 +219,8 @@
"/share/emacs/site-lisp/" "/share/emacs/site-lisp/"
"geiser-autoloads.el")) "geiser-autoloads.el"))
#t))))) #t)))))
(inputs `(("guile" ,guile-2.2))) (inputs
`(("guile" ,guile-2.2)))
(native-inputs (native-inputs
`(("emacs" ,emacs-minimal) `(("emacs" ,emacs-minimal)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
@ -5646,6 +5648,59 @@ This provides a basic API and common UI widgets such as popup tooltips
and popup menus.") and popup menus.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-python-black
(package
(name "emacs-python-black")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wbolster/emacs-python-black")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-reformatter" ,emacs-reformatter)
("python-black-macchiato" ,python-black-macchiato)))
(arguments `(#:tests? #f))
(home-page "https://github.com/wbolster/emacs-python-black")
(synopsis "Reformat Python code via @code{python-black}")
(description
"This package makes it easy to reformat Python code using
@code{python-black} and @code{python-black-macchiato} for entire and partial
buffers, respectively.")
(license license:bsd-3)))
(define-public emacs-py-isort
(package
(name "emacs-py-isort")
(version "2016.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/paetzke/py-isort.el")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f)) ;tests fail with "emacs: standard input is not a tty"
(propagated-inputs
`(("python-isort" ,python-isort)))
(home-page "https://github.com/paetzke/py-isort.el")
(synopsis "Sort the imports in Python buffers")
(description
"This package provides commands and a minor mode to sort Python imports
using @code{python-isort}.")
(license license:gpl3+)))
(define-public emacs-python-environment (define-public emacs-python-environment
(package (package
(name "emacs-python-environment") (name "emacs-python-environment")
@ -7180,6 +7235,31 @@ called. If there are more, each window will have its first character
highlighted. Pressing that character will switch to that window.") highlighted. Pressing that character will switch to that window.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-windsize
;; There is no proper release. The base version is extracted from the
;; "Version" keyword in the main file.
(let ((revision "1")
(commit "62c2846bbe95b0a73e996c75e4a644d05f57aaaa"))
(package
(name "emacs-windsize")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/grammati/windsize")
(commit commit)))
(sha256
(base32 "13kfrmv3vmkfanxv9nym5v43hx5p7xkgqmx65zcxh4gcbaham1mi"))))
(build-system emacs-build-system)
(home-page "https://github.com/grammati/windsize")
(synopsis "Easy resizing of Emacs windows")
(description
"This package allows moving the borders of the active window
with the arrow keys. It prefers to move the right or bottom border when
possible, and falls back to moving the left or top border otherwise.")
(license license:gpl3+))))
(define-public emacs-iedit (define-public emacs-iedit
;; Last release version was in 2016. ;; Last release version was in 2016.
(let ((commit "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f") (let ((commit "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f")
@ -9175,33 +9255,31 @@ using package inferred style.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-lua-mode (define-public emacs-lua-mode
(let ((commit "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c") (package
(revision "0")) (name "emacs-lua-mode")
(package (version "20201010")
(name "emacs-lua-mode") (home-page "https://github.com/immerrr/lua-mode/")
(version (git-version "20200508" revision commit)) (source
(home-page "https://github.com/immerrr/lua-mode/") (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url home-page)
(url home-page) (commit (string-append "v" version))))
(commit commit))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32 "0zf43f7fkrgki6pbc09zak975p4jx1yf3ipfs38hypfl9s5d6xrf"))))
(base32 (build-system emacs-build-system)
"1hai6rqjm5py0bp57nhggmj9qigwdj3a46ngacpnjc1qmy9kkgfk")))) (arguments
(build-system emacs-build-system) `(#:tests? #t
(arguments #:test-command '("buttercup" "-l" "lua-mode.el")))
`(#:tests? #t (native-inputs
#:test-command '("buttercup" "-l" "lua-mode.el"))) `(("emacs-buttercup" ,emacs-buttercup)
(native-inputs ("lua" ,lua)))
`(("emacs-buttercup" ,emacs-buttercup) (synopsis "Major mode for lua")
("lua" ,lua))) (description
(synopsis "Major mode for lua") "This Emacs package provides a mode for @uref{https://www.lua.org/,
(description
"This Emacs package provides a mode for @uref{https://www.lua.org/,
Lua programming language}.") Lua programming language}.")
(license license:gpl2+)))) (license license:gpl2+)))
(define-public emacs-ebuild-mode (define-public emacs-ebuild-mode
(package (package
@ -9828,7 +9906,11 @@ programming and reproducible research.")
(uri (string-append "https://orgmode.org/elpa/" (uri (string-append "https://orgmode.org/elpa/"
"org-plus-contrib-" version ".tar")) "org-plus-contrib-" version ".tar"))
(sha256 (sha256
(base32 "1naq25g4d95cx29axx428rnpc4m9hd0j7w1l0vqwkdjyr5qfj0ab")))) (base32 "1naq25g4d95cx29axx428rnpc4m9hd0j7w1l0vqwkdjyr5qfj0ab"))
;; ob-sclang.el is packaged separately to avoid the dependency on
;; SuperCollider and qtwebengine.
(modules '((guix build utils)))
(snippet '(begin (delete-file "ob-sclang.el") #t))))
(arguments (arguments
`(#:modules ((guix build emacs-build-system) `(#:modules ((guix build emacs-build-system)
(guix build utils) (guix build utils)
@ -9855,8 +9937,7 @@ programming and reproducible research.")
(propagated-inputs (propagated-inputs
`(("arduino-mode" ,emacs-arduino-mode) `(("arduino-mode" ,emacs-arduino-mode)
("cider" ,emacs-cider) ("cider" ,emacs-cider)
("org" ,emacs-org) ("org" ,emacs-org)))
("scel" ,emacs-scel)))
(synopsis "Contributed packages to Org mode") (synopsis "Contributed packages to Org mode")
(description "Org is an Emacs mode for keeping notes, maintaining TODO (description "Org is an Emacs mode for keeping notes, maintaining TODO
lists, and project planning with a fast and effective plain-text system. lists, and project planning with a fast and effective plain-text system.
@ -9864,6 +9945,28 @@ lists, and project planning with a fast and effective plain-text system.
This package is equivalent to org-plus-contrib, but only includes additional This package is equivalent to org-plus-contrib, but only includes additional
files that you would find in @file{contrib/} from the git repository."))) files that you would find in @file{contrib/} from the git repository.")))
(define-public emacs-ob-sclang
(package
(inherit emacs-org-contrib)
(name "emacs-ob-sclang")
(source
(origin (inherit (package-source emacs-org-contrib))
(modules '((guix build utils)))
(snippet
'(begin
(for-each (lambda (file)
(unless (equal? file "./ob-sclang.el")
(delete-file file)))
(find-files "." "\\.el"))
#t))))
(propagated-inputs
`(("org" ,emacs-org)
("scel" ,emacs-scel)))
(synopsis "Org Babel support for SuperCollider")
(description "This package adds support for evaluating @code{sclang}
Org mode source blocks. It is extracted from the @code{emacs-org-contrib}
package.")))
(define-public emacs-org-edna (define-public emacs-org-edna
(package (package
(name "emacs-org-edna") (name "emacs-org-edna")
@ -11208,14 +11311,14 @@ and cangjie.")
(define-public emacs-posframe (define-public emacs-posframe
(package (package
(name "emacs-posframe") (name "emacs-posframe")
(version "0.8.0") (version "0.8.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"posframe-" version ".el")) "posframe-" version ".el"))
(sha256 (sha256
(base32 "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp")))) (base32 "01s9lc1liaxfpnfw183a320blp7cv6qg8gh2r22w4wkzi1yrcbb7"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; emacs-minimal does not include the function font-info. ;; emacs-minimal does not include the function font-info.
(arguments (arguments
@ -11413,6 +11516,25 @@ It should enable you to implement low-level X11 applications.")
of XELB.") of XELB.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-xelb-no-x-toolkit
(package
(inherit emacs-xelb)
(name "emacs-xelb-no-x-toolkit")
(arguments
(substitute-keyword-arguments (package-arguments emacs-xelb)
((#:emacs emacs) `,emacs-no-x-toolkit)))))
(define-public emacs-exwm-no-x-toolkit
(package
(inherit emacs-exwm)
(name "emacs-exwm-no-x-toolkit")
(synopsis "Emacs X window manager (without an X toolkit)")
(propagated-inputs
`(("emacs-xelb-no-x-toolkit" ,emacs-xelb-no-x-toolkit)))
(arguments
(substitute-keyword-arguments (package-arguments emacs-exwm)
((#:emacs emacs) `,emacs-no-x-toolkit)))))
(define-public emacs-switch-window (define-public emacs-switch-window
(package (package
(name "emacs-switch-window") (name "emacs-switch-window")
@ -15850,37 +15972,34 @@ downloading manager for Emacs.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-helpful (define-public emacs-helpful
(let ((version "0.17") (package
(commit "b0e937fff71dc0a5d34066bfd25310e76f284621") (name "emacs-helpful")
(revision "1")) (version "0.18")
(package (source
(name "emacs-helpful") (origin
(version (git-version version revision commit)) (method git-fetch)
(source (uri (git-reference
(origin (url "https://github.com/Wilfred/helpful")
(method git-fetch) (commit version)))
(uri (git-reference (file-name (git-file-name name version))
(url "https://github.com/Wilfred/helpful") (sha256
(commit commit))) (base32 "0gdjxykqkal2x765mi51m99i5ql23i1fy909wy4mzj5ajhjfgqcc"))))
(file-name (git-file-name name version)) (build-system emacs-build-system)
(sha256 (propagated-inputs
(base32 "048qvlyj2vkgi872z8l07diwqnq21ziycv8slxzzy7rflw3wx0b2")))) `(("emacs-elisp-refs" ,emacs-elisp-refs)
(build-system emacs-build-system) ("emacs-dash" ,emacs-dash)
(propagated-inputs ("emacs-s" ,emacs-s)
`(("emacs-elisp-refs" ,emacs-elisp-refs) ("emacs-f" ,emacs-f)
("emacs-dash" ,emacs-dash) ("emacs-shut-up" ,emacs-shut-up)))
("emacs-s" ,emacs-s) (native-inputs
("emacs-f" ,emacs-f) `(("emacs-ert-runner" ,emacs-ert-runner)
("emacs-shut-up" ,emacs-shut-up))) ("emacs-undercover" ,emacs-undercover)))
(native-inputs (arguments
`(("emacs-ert-runner" ,emacs-ert-runner) `(#:tests? #t
("emacs-undercover" ,emacs-undercover))) #:test-command '("ert-runner")))
(arguments (home-page "https://github.com/Wilfred/helpful")
`(#:tests? #t (synopsis "More contextual information in Emacs help")
#:test-command '("ert-runner"))) (description "@code{helpful} is an alternative to the built-in Emacs help
(home-page "https://github.com/Wilfred/helpful")
(synopsis "More contextual information in Emacs help")
(description "@code{helpful} is an alternative to the built-in Emacs help
that provides much more contextual information. that provides much more contextual information.
@itemize @itemize
@ -15899,7 +16018,7 @@ functions.
@item Trace, disassemble functions from inside Helpful. This is discoverable @item Trace, disassemble functions from inside Helpful. This is discoverable
and doesn't require memorisation of commands. and doesn't require memorisation of commands.
@end itemize\n") @end itemize\n")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-logview (define-public emacs-logview
(package (package
@ -19768,7 +19887,7 @@ according to their use.")
(define-public emacs-dtrt-indent (define-public emacs-dtrt-indent
(package (package
(name "emacs-dtrt-indent") (name "emacs-dtrt-indent")
(version "0.8") (version "1.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -19777,7 +19896,7 @@ according to their use.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pgf0pvqd8k4yzhdn2df9lp0y8hmlm2ccrh07jivwlccs95pcz7z")))) "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/jscheid/dtrt-indent") (home-page "https://github.com/jscheid/dtrt-indent")
(synopsis "Minor mode that guesses the indentation offset") (synopsis "Minor mode that guesses the indentation offset")
@ -23321,14 +23440,14 @@ interface.")
(define-public emacs-ivy-posframe (define-public emacs-ivy-posframe
(package (package
(name "emacs-ivy-posframe") (name "emacs-ivy-posframe")
(version "0.2.0") (version "0.5.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"ivy-posframe-" version ".el")) "ivy-posframe-" version ".el"))
(sha256 (sha256
(base32 "0hr6bjlgflvz9rk5rnr55fcrd4873jxmksdr7r1zl1zcb8vdx7ks")))) (base32 "1yi5avbgk143xs82yqiia7yhh6jjjm22lpmwaq0ysw5mdpazjxfa"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-ivy" ,emacs-ivy) `(("emacs-ivy" ,emacs-ivy)

View file

@ -68,7 +68,7 @@
(define-public efl (define-public efl
(package (package
(name "efl") (name "efl")
(version "1.25.0") (version "1.25.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -76,7 +76,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k")))) "0svybbrvpf6q955y6fclxh3md64z0dgmh0x54x2j60503hhs071m"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("check" ,check-0.14) `(("check" ,check-0.14)
@ -179,6 +179,8 @@
"install_dir: join_paths(dir_data, 'dbus-1', 'services'))\n")) "install_dir: join_paths(dir_data, 'dbus-1', 'services'))\n"))
(substitute* "src/tests/elementary/meson.build" (substitute* "src/tests/elementary/meson.build"
(("dir_data") "meson.source_root(), 'test-output'")) (("dir_data") "meson.source_root(), 'test-output'"))
(substitute* "data/eo/meson.build"
(("'usr', 'lib'") "'./' + dir_lib"))
#t)) #t))
(add-after 'unpack 'set-home-directory (add-after 'unpack 'set-home-directory
;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2 ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
@ -383,7 +385,7 @@ embedded systems.")
(define-public python-efl (define-public python-efl
(package (package
(name "python-efl") (name "python-efl")
(version "1.24.0") (version "1.25.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -391,7 +393,7 @@ embedded systems.")
"python/python-efl-" version ".tar.xz")) "python/python-efl-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy")) "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove files generated by Cython ;; Remove files generated by Cython
(snippet (snippet

View file

@ -2,7 +2,7 @@
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -21,23 +21,26 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages entr) (define-module (gnu packages entr)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu)
#:use-module (guix utils))
(define-public entr (define-public entr
(package (package
(name "entr") (name "entr")
(version "4.2") (version "4.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://entrproject.org/code/entr-" (uri (string-append "http://entrproject.org/code/entr-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17")))) "0vcflgagna2gdlpjsd6748c73j2829xlhm276mi838zl1n121phn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -47,20 +50,24 @@
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(setenv "CC" (which "gcc")) (setenv "CC" ,(cc-for-target))
(setenv "DESTDIR" (string-append out "/")) (setenv "PREFIX" out)
(setenv "PREFIX" "") (setenv "MANPREFIX" (string-append out "/man"))
(setenv "MANPREFIX" "man")
(invoke "./configure")))) (invoke "./configure"))))
(add-before 'build 'remove-fhs-file-names (add-before 'build 'remove-fhs-file-names
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "entr.c" (substitute* "entr.c"
(("/bin/sh") (which "sh")) (("/bin/sh" command)
(("/bin/cat") (which "cat")) (string-append (assoc-ref inputs "bash") command))
(("/usr/bin/clear") (which "clear"))) (("/bin/cat" command)
(string-append (assoc-ref inputs "coreutils") command))
(("/usr(/bin/clear)" _ command)
(string-append (assoc-ref inputs "ncurses") command)))
#t))))) #t)))))
;; ncurses provides the `clear' binary (inputs
(inputs `(("ncurses" ,ncurses))) `(("bash" ,bash)
("coreutils" ,coreutils)
("ncurses" ,ncurses)))
(home-page "http://entrproject.org/") (home-page "http://entrproject.org/")
(synopsis "Run arbitrary commands when files change") (synopsis "Run arbitrary commands when files change")
(description (description

View file

@ -5,6 +5,7 @@
;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -141,6 +142,46 @@ large and/or frequently changing (network) environment.")
(license (list license:bsd-3 ; modules/cyrus-sasl.c (license (list license:bsd-3 ; modules/cyrus-sasl.c
license:gpl2+)))) ; the rest license:gpl2+)))) ; the rest
(define-public bindfs
(package
(name "bindfs")
(version "1.14.8")
(source (origin
(method url-fetch)
(uri (string-append "https://bindfs.org/downloads/bindfs-"
version ".tar.gz"))
(sha256
(base32
"15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"))))
(build-system gnu-build-system)
(arguments
;; XXX: The tests have no hope of passing until there is a "nogroup"
;; entry (or at least some group to which the guix builder does
;; not belong) in the /etc/group file of the build environment.
;; Currently we do not have such a group. Disable tests for now.
'(#:tests? #f))
(native-inputs
;; Native inputs to run the tests
;; ("ruby" ,ruby)
;; ("valgrind" ,valgrind)
;; ("which" ,which)
`(("pkg-config" ,pkg-config)))
(inputs
`(("fuse" ,fuse)))
(home-page "https://bindfs.org")
(synopsis "Bind mount a directory and alter permission bits")
(description
"@command{bindfs} is a FUSE filesystem for mounting a directory to
another location, similar to @command{mount --bind}. It can be used for:
@itemize
@item Making a directory read-only.
@item Making all executables non-executable.
@item Sharing a directory with a list of users (or groups).
@item Modifying permission bits using rules with chmod-like syntax.
@item Changing the permissions with which files are created.
@end itemize ")
(license license:gpl2+)))
(define-public fsarchiver (define-public fsarchiver
(package (package
(name "fsarchiver") (name "fsarchiver")

View file

@ -340,7 +340,7 @@ FOSS FPGA place and route tool.")
(define-public gtkwave (define-public gtkwave
(package (package
(name "gtkwave") (name "gtkwave")
(version "3.3.106") (version "3.3.107")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -350,7 +350,7 @@ FOSS FPGA place and route tool.")
(string-append "http://gtkwave.sourceforge.net/" (string-append "http://gtkwave.sourceforge.net/"
"gtkwave-" version ".tar.gz"))) "gtkwave-" version ".tar.gz")))
(sha256 (sha256
(base32 "1pyij6dlmapjyzrmn255fkf8gyhz8i4vaipd75a68i2bnq021nn8")))) (base32 "1ibnhn7w1awalsbndbb5nilbmih3i3dwfry95mq5sn221l5n7zj8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("gperf" ,gperf) `(("gperf" ,gperf)

View file

@ -170,20 +170,25 @@ as required.")
(define-public libfilezilla (define-public libfilezilla
(package (package
(name "libfilezilla") (name "libfilezilla")
(version "0.16.0") (version "0.24.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.filezilla-project.org/" (uri (string-append "https://download.filezilla-project.org/"
"libfilezilla/libfilezilla-" version ".tar.bz2")) "libfilezilla/libfilezilla-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v")))) (base32 "1zfnqbn14dx0fl45mfaznr5n5xsxy1kx8z9f80fppbqn37pb9mgx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--disable-static")))
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("nettle" ,nettle))) `(("gnutls" ,gnutls)
("nettle" ,nettle)))
(home-page "https://lib.filezilla-project.org") (home-page "https://lib.filezilla-project.org")
(synopsis "Cross-platform C++ library used by Filezilla client") (synopsis "Cross-platform C++ library used by Filezilla client")
(description (description
@ -208,20 +213,21 @@ output.
(define-public filezilla (define-public filezilla
(package (package
(name "filezilla") (name "filezilla")
(version "3.42.1") (version "3.50.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.filezilla-project.org/client/" (uri (string-append "https://download.filezilla-project.org/client/"
"FileZilla_" version "_src.tar.bz2")) "FileZilla_" version "_src.tar.bz2"))
(sha256 (sha256
(base32 "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg")))) (base32 "042w2f5cf8g9cr7d3m6294ygx7jggcria9502jnql855khk8gnz0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Don't let filezilla phone home to check for updates. ;; Don't let filezilla phone home to check for updates.
'(#:configure-flags '("--disable-autoupdatecheck"))) '(#:configure-flags '("--disable-autoupdatecheck")))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("cppunit" ,cppunit)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("xdg-utils" ,xdg-utils))) ("xdg-utils" ,xdg-utils)))
(inputs (inputs

View file

@ -11409,7 +11409,7 @@ etc. You can also play games on FICS or against an engine.")
(define-public stockfish (define-public stockfish
(package (package
(name "stockfish") (name "stockfish")
(version "11") (version "12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11418,8 +11418,15 @@ etc. You can also play games on FICS or against an engine.")
(commit (string-append "sf_" version)))) (commit (string-append "sf_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "12mppipinymj8s1ipq9a7is453vncly49c32ym9wvyklsgyxfzlk")))) (base32 "0vcymbwp5nf114pp3ax40s21ki5dckda15vmhr77d1mnq3fn0l32"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs
`(("neural-network"
,(origin
(method url-fetch)
(uri "https://tests.stockfishchess.org/api/nn/nn-82215d0fd0df.nnue")
(sha256
(base32 "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"))))))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:make-flags (list "-C" "src" #:make-flags (list "-C" "src"
@ -11435,10 +11442,17 @@ etc. You can also play games on FICS or against an engine.")
("mips64el-linux" "general-64") ("mips64el-linux" "general-64")
(_ "general-32")))) (_ "general-32"))))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure)
;; The official neural network file is needed for building
;; and is embedded in the resulting binary.
(add-after 'unpack 'copy-net
(lambda* (#:key inputs #:allow-other-keys)
(copy-file (assoc-ref inputs "neural-network")
"src/nn-82215d0fd0df.nnue")
#t)))))
(synopsis "Strong chess engine") (synopsis "Strong chess engine")
(description (description
"Stockfish is a very strong chess engines. It is much stronger than the "Stockfish is a very strong chess engine. It is much stronger than the
best human chess grandmasters. It can be used with UCI-compatible GUIs like best human chess grandmasters. It can be used with UCI-compatible GUIs like
ChessX.") ChessX.")
(home-page "https://stockfishchess.org/") (home-page "https://stockfishchess.org/")

View file

@ -111,7 +111,13 @@
`(("texinfo" ,texinfo) `(("texinfo" ,texinfo)
("dejagnu" ,dejagnu) ("dejagnu" ,dejagnu)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
,@(if (hurd-target?) `(("mig" ,mig)) '()))) ,@(if (hurd-target?)
;; When cross-compiling from x86_64-linux, make sure to use a
;; 32-bit MiG because we assume target i586-pc-gnu.
`(("mig" ,(if (%current-target-system)
mig/32-bit
mig)))
'())))
(home-page "https://www.gnu.org/software/gdb/") (home-page "https://www.gnu.org/software/gdb/")
(synopsis "The GNU debugger") (synopsis "The GNU debugger")
(description (description

View file

@ -3261,7 +3261,7 @@ library.")
("rust-selectors" ,rust-selectors-0.22) ("rust-selectors" ,rust-selectors-0.22)
("rust-string-cache" ,rust-string-cache-0.8) ("rust-string-cache" ,rust-string-cache-0.8)
("rust-tinyvec" ,rust-tinyvec-0.3) ("rust-tinyvec" ,rust-tinyvec-0.3)
("rust-url" ,rust-url-2.1) ("rust-url" ,rust-url-2)
("rust-xml5ever" ,rust-xml5ever-0.16)) ("rust-xml5ever" ,rust-xml5ever-0.16))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-assert-cmd" ,rust-assert-cmd-1) (("rust-assert-cmd" ,rust-assert-cmd-1)
@ -3969,14 +3969,14 @@ Hints specification (EWMH).")
(define-public goffice (define-public goffice
(package (package
(name "goffice") (name "goffice")
(version "0.10.47") (version "0.10.48")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/goffice/" (uri (string-append "mirror://gnome/sources/goffice/"
(version-major+minor version) "/" (version-major+minor version) "/"
"goffice-" version ".tar.xz")) "goffice-" version ".tar.xz"))
(sha256 (sha256
(base32 "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215")))) (base32 "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 4.0 MiB of gtk-doc "doc")) ; 4.0 MiB of gtk-doc
@ -4033,7 +4033,7 @@ Hints specification (EWMH).")
(define-public gnumeric (define-public gnumeric
(package (package
(name "gnumeric") (name "gnumeric")
(version "1.12.46") (version "1.12.48")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/gnumeric/" (uri (string-append "mirror://gnome/sources/gnumeric/"
@ -4041,7 +4041,7 @@ Hints specification (EWMH).")
"gnumeric-" version ".tar.xz")) "gnumeric-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1qdmw2dp7rmq8fmjapgwaks7ajh270wm6kyvlxlzwbgmg8vngp4z")))) "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(;; The gnumeric developers don't worry much about failing tests. `(;; The gnumeric developers don't worry much about failing tests.
@ -4069,8 +4069,8 @@ Hints specification (EWMH).")
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("python" ,python-2) ("python" ,python)
("python2-pygobject" ,python2-pygobject) ("python-pygobject" ,python-pygobject)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -4130,7 +4130,7 @@ engineering.")
(define-public seahorse (define-public seahorse
(package (package
(name "seahorse") (name "seahorse")
(version "3.36") (version "3.36.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4138,8 +4138,7 @@ engineering.")
(version-major+minor version) "/" name "-" (version-major+minor version) "/" name "-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5"))))
"1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t '(#:glib-or-gtk? #t
@ -4742,7 +4741,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(define-public libsecret (define-public libsecret
(package (package
(name "libsecret") (name "libsecret")
(version "0.20.3") (version "0.20.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -4751,7 +4750,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
"libsecret-" version ".tar.xz")) "libsecret-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg")))) "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -4777,6 +4776,8 @@ and the GLib main loop, to integrate well with GNOME applications.")
(propagated-inputs (propagated-inputs
`(("glib" ,glib))) ; required by libsecret-1.pc `(("glib" ,glib))) ; required by libsecret-1.pc
(inputs (inputs
;; The build phase complains about missing docbook-xml-4.2 but adding it
;; doesn't seem to affect the build result.
`(("docbook-xsl" ,docbook-xsl) `(("docbook-xsl" ,docbook-xsl)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libxml2" ,libxml2))) ; for XML_CATALOG_FILES ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES
@ -6421,14 +6422,14 @@ almost all of them.")
(define-public eolie (define-public eolie
(package (package
(name "eolie") (name "eolie")
(version "0.9.98.1") (version "0.9.99")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://adishatz.org/eolie/eolie-" (uri (string-append "https://adishatz.org/eolie/eolie-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1d844zva5w4p9pnp9c2g7zyb4vayr2g2drf78spxsdlc5lbd7lqr")))) "0zj5v7wxqj7c20bmil127ah0vnjfzvvf6kzz82b9ip3846h43j02"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t

View file

@ -12,13 +12,14 @@
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright @ 2018, 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2018, 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu> ;;; Copyright © 2019 Giovanni Biscuolo <g@xelera.eu>
;;; Copyright @ 2019, 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.com> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3349,6 +3350,32 @@ format in Go.")
(home-page "https://github.com/kr/pretty") (home-page "https://github.com/kr/pretty")
(license license:expat))) (license license:expat)))
(define-public go-github-com-kylelemons-godebug
(package
(name "go-github-com-kylelemons-godebug")
(version "1.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kylelemons/godebug")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/kylelemons/godebug/diff"
#:unpack-path "github.com/kylelemons/godebug"))
(home-page "https://github.com/kylelemons/godebug")
(synopsis "Pretty printer for Go values.")
(description
"This package will pretty print a compact representation of a Go data
structure. It can also produce a much more verbose, one-item-per-line
representation suitable for computing diffs.")
(license license:asl2.0)))
(define-public go-github-com-kr-text (define-public go-github-com-kr-text
(package (package
(name "go-github-com-kr-text") (name "go-github-com-kr-text")

View file

@ -723,6 +723,8 @@ model to base your own plug-in on, here it is.")
;("qtdeclarative" ,qtdeclarative) ;("qtdeclarative" ,qtdeclarative)
;("qtx11extras" ,qtx11extras) ;("qtx11extras" ,qtx11extras)
("soundtouch" ,soundtouch) ("soundtouch" ,soundtouch)
;; GStreamer is not yet compatible with srt > 1.4.1.
("srt" ,srt-1.4.1)
("x265" ,x265) ("x265" ,x265)
("wayland" ,wayland))) ("wayland" ,wayland)))
(home-page "https://gstreamer.freedesktop.org/") (home-page "https://gstreamer.freedesktop.org/")
@ -919,18 +921,7 @@ non-linear editors.")
(description (description
"This package contains GObject Introspection overrides for Python that can "This package contains GObject Introspection overrides for Python that can
be used by Python applications using GStreamer.") be used by Python applications using GStreamer.")
(license license:lgpl2.1+) (license license:lgpl2.1+)))
(properties `((python2-variant . ,(delay python2-gst))))))
(define-public python2-gst
(package (inherit python-gst)
(name "python2-gst")
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-2)))
(propagated-inputs
`(("gst-plugins-base" ,gst-plugins-base)
("python-pygobject" ,python2-pygobject)))))
(define-public gst123 (define-public gst123
(package (package

View file

@ -701,8 +701,8 @@ It has a nice, simple s-expression based syntax.")
(inputs `(("guile" ,guile-2.2))))) (inputs `(("guile" ,guile-2.2)))))
(define-public guile-squee (define-public guile-squee
(let ((commit "a85902a92bf6f58a1d35fd974a01ade163deda8d") (let ((commit "7dcd22b54fd56c9e629489191bb27ac80ecea9db")
(revision "0")) (revision "1"))
(package (package
(name "guile-squee") (name "guile-squee")
(version (string-append "0-" revision "." (string-take commit 7))) (version (string-append "0-" revision "." (string-take commit 7)))
@ -714,7 +714,7 @@ It has a nice, simple s-expression based syntax.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0p1lpsp4kx57j3ai1dkxilm4ziavzzx8wbbc42m3hpziq0a7qz5z")))) "1568sk6ada7x9qpfhax0qq1bq93qll1q7nyjrb7h3c1c3lc9sc15"))))
(build-system guile-build-system) (build-system guile-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -845,8 +845,8 @@ Vicare Scheme and IronScheme. Right now it contains:
(license license:bsd-3))) (license license:bsd-3)))
(define-public guile-prometheus (define-public guile-prometheus
(let ((commit "cbc6e1b03512443a03d66414c426adb8470b5f2b") (let ((commit "8980f39bafb3e59d6de17e7b311df4932e5b5182")
(revision "0")) (revision "1"))
(package (package
(name "guile-prometheus") (name "guile-prometheus")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -857,13 +857,14 @@ Vicare Scheme and IronScheme. Right now it contains:
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1k1qg4ia87w2ipnf8cpikdc67lxi5bmahkhgk2x0i9ibdyvqb7np")) "04vwza78b5nq0szzxzvpnfjyfkb4pqf2w4dx3kz1f082n01xnwss"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)
("guile" ,guile-3.0)))
(inputs (inputs
`(("guile" ,guile-3.0))) `(("guile" ,guile-3.0)))
(home-page "https://git.cbaines.net/guile/prometheus") (home-page "https://git.cbaines.net/guile/prometheus")

View file

@ -52,14 +52,14 @@
(define-public ddcutil (define-public ddcutil
(package (package
(name "ddcutil") (name "ddcutil")
(version "0.9.8") (version "0.9.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.ddcutil.com/tarballs/" (uri (string-append "https://www.ddcutil.com/tarballs/"
"ddcutil-" version ".tar.gz")) "ddcutil-" version ".tar.gz"))
(sha256 (sha256
(base32 "13ccxbqgyz4ah9jwbcylnfkgl8j3ida8xd00xkcq4xnfyyv5mg6v")))) (base32 "0anyxy53k2613hq9glaad16llqlv6iim5p8gz0rs5pnpp8p00dg1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View file

@ -339,14 +339,14 @@ to @code{cabal repl}).")
(define-public git-annex (define-public git-annex
(package (package
(name "git-annex") (name "git-annex")
(version "8.20200908") (version "8.20201007")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz")) "git-annex/git-annex-" version ".tar.gz"))
(sha256 (sha256
(base32 "1113inl10f4m0699ba2zglaqlfqvwhqjkqg6r6m1d5rqv5brswb1")))) (base32 "0v11yc4kkxnzvwqry277dpjwlavinrjiagfw0ayhrfwd703j1y8a"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

View file

@ -157,6 +157,17 @@ for other software in the GNU system that uses Mach-based inter-process
communication.") communication.")
(license gpl2+))) (license gpl2+)))
(define-public mig/32-bit
;; When cross-compiling from x86_64-linux to i586-gnu, we need this 32-bit
;; native MIG.
(package
(inherit mig)
(arguments
(substitute-keyword-arguments (package-arguments mig)
((#:system _ #f)
"i686-linux")))
(properties `((hidden? . #t)))))
(define-public hurd-headers (define-public hurd-headers
;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and ;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and
;; 'file_exec_paths' RPCs that glibc 2.28 expects. ;; 'file_exec_paths' RPCs that glibc 2.28 expects.
@ -536,9 +547,7 @@ exec ${system}/rc \"$@\"
("mig" ,(if (%current-target-system) ("mig" ,(if (%current-target-system)
;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
;; hence this hack. ;; hence this hack.
(package mig/32-bit
(inherit mig)
(arguments `(#:system "i686-linux")))
mig)) mig))
("perl" ,perl) ("perl" ,perl)
("texinfo" ,texinfo-4) ("texinfo" ,texinfo-4)

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 208 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

View file

@ -135,7 +135,7 @@ This package contains GUI widgets for baloo.")
(list license:lgpl2.1+ license:fdl1.2+)))) (list license:lgpl2.1+ license:fdl1.2+))))
(define-public kdenlive (define-public kdenlive
(let ((version "20.08.1")) (let ((version "20.08.2"))
(package (package
(name "kdenlive") (name "kdenlive")
(version version) (version version)
@ -147,8 +147,7 @@ This package contains GUI widgets for baloo.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32 "1zcckv4wj12pvxjg85c8l67vi3amz79yv8mf7m4fbxnam3yxhy90"))))
"15mpw1sysy7mky8fcj0x4zbspz0na7q76xdfj0j8hsggg9d3yq8l"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
@ -628,7 +627,10 @@ different notification systems.")
("qca" ,qca) ("qca" ,qca)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtmultimedia" ,qtmultimedia) ("qtmultimedia" ,qtmultimedia)
("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2" ,qtquickcontrols2)
("qtx11extras" ,qtx11extras))) ("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/KDEConnect") (home-page "https://community.kde.org/KDEConnect")
(synopsis "Enable your devices to communicate with each other") (synopsis "Enable your devices to communicate with each other")

View file

@ -1053,7 +1053,7 @@ noun phrases, verb phrases, etc.).")
(define-public praat (define-public praat
(package (package
(name "praat") (name "praat")
(version "6.1.16") (version "6.1.26")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1062,10 +1062,10 @@ noun phrases, verb phrases, etc.).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1rx4qvl0dd85x0r6pl0zk4bysx9ykxl05kywjr4pyvv6dvpswkrm")))) "12y4x7c34ddlg22kc82n17if1dqm8lyap9jg0kh1vagkdm9dy02w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f; no test target `(#:tests? #f ; no test target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure

View file

@ -69,7 +69,8 @@
;; his pleasure. ;; his pleasure.
(patch-flags '("-p0")) (patch-flags '("-p0"))
(patches (patches
(search-patches "libcanberra-sound-theme-freedesktop.patch")))) (search-patches "libcanberra-sound-theme-freedesktop.patch"
"libcanberra-wayland-crash.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)

View file

@ -6,7 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
@ -492,14 +492,14 @@ over USB.")
(define-public libmtp (define-public libmtp
(package (package
(name "libmtp") (name "libmtp")
(version "1.1.17") (version "1.1.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/libmtp/libmtp/" version (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version
"/libmtp-" version ".tar.gz")) "/libmtp-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq")))) "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View file

@ -49,6 +49,8 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com> ;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -349,7 +351,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernel. That is, the most recently released major ;; The current "stable" kernel. That is, the most recently released major
;; version. ;; version.
(define-public linux-libre-5.8-version "5.8.13") (define-public linux-libre-5.8-version "5.8.14")
(define deblob-scripts-5.8 (define deblob-scripts-5.8
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.8-version linux-libre-5.8-version
@ -357,7 +359,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0j6jba5fcddqlb42f95gjl78jisfla4nswqila074gglcrbnl9q7"))) (base32 "0j6jba5fcddqlb42f95gjl78jisfla4nswqila074gglcrbnl9q7")))
(define-public linux-libre-5.8-pristine-source (define-public linux-libre-5.8-pristine-source
(let ((version linux-libre-5.8-version) (let ((version linux-libre-5.8-version)
(hash (base32 "039j4ckx2p6rfpgqc5gzn6xc1krvhy0ivkjxck83s66xgqbkcngj"))) (hash (base32 "1bzh82jpwcxsdzp6p1r8qlq9v5x79flhnzyimkcll8wdh28pjxpf")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.8))) deblob-scripts-5.8)))
@ -365,7 +367,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support. ;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines: ;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html> ;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.4-version "5.4.69") (define-public linux-libre-5.4-version "5.4.70")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.4-version linux-libre-5.4-version
@ -373,12 +375,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1b3q88i2qfdxyvpi9f7jds0qlb8hfpw87mgia096ax6822c2cmyb"))) (base32 "1b3q88i2qfdxyvpi9f7jds0qlb8hfpw87mgia096ax6822c2cmyb")))
(define-public linux-libre-5.4-pristine-source (define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version) (let ((version linux-libre-5.4-version)
(hash (base32 "19vxsbwvfwyz1w6m7sp38d504w98zwjxaap4hfhh6wrrddqivcx8"))) (hash (base32 "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.149") (define-public linux-libre-4.19-version "4.19.150")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.19-version linux-libre-4.19-version
@ -386,7 +388,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "001alvxgyb1n0fgbfi5dkzjviid32lyjfjwd3jwmcallcsdcpkfr"))) (hash (base32 "1kmsrinhy67vh34m6z3xinwg3v6z8jm7v1asq6rqqkba13phkxzj")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
@ -1109,8 +1111,8 @@ RTL8812AU, RTL8821AU, and RTL8814AU chips.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public rtl8821ce-linux-module (define-public rtl8821ce-linux-module
(let ((commit "69765eb288a8dfad3b055b906760b53e02ab1dea") (let ((commit "fe97b5003f2f3dd070f76ec38c00b83798c1cdea")
(revision "0")) (revision "1"))
(package (package
(name "rtl8821ce-linux-module") (name "rtl8821ce-linux-module")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -1123,7 +1125,7 @@ RTL8812AU, RTL8821AU, and RTL8814AU chips.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s")))) "10mrp63npbqb39c442vx8mra278hw7sczb3b6bjrpr3gan6ljshn"))))
(build-system linux-module-build-system) (build-system linux-module-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -7002,19 +7004,25 @@ the superuser to make device nodes.")
(define-public fakeroot (define-public fakeroot
(package (package
(name "fakeroot") (name "fakeroot")
(version "1.24") (version "1.25.1")
(source (origin (source (origin
;; There are no tags in the repository, so take this snapshot.
(method url-fetch) (method url-fetch)
(uri (string-append "https://deb.debian.org/debian/pool/main/f/" (uri (string-append "https://deb.debian.org/debian/pool/main/f/"
"fakeroot/fakeroot_" version ".orig.tar.gz")) "fakeroot/fakeroot_" version ".orig.tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vb6f93hjyqnwx8dc8mm3dgma7axgqk8s7sdsjs8l2rpc0qmn11f")))) "1ianaacwpjcw02shfiyybkqh5r6il4lvxin10n4y66kw0p7i3kcm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'bootstrap
(lambda _
;; The "preroll" script takes care of Autoconf and also
;; prepares the translated manuals.
(invoke "sh" "./preroll")))
(add-after 'configure 'patch-Makefile (add-after 'configure 'patch-Makefile
(lambda _ (lambda _
;; Note: The root of the problem is already in "Makefile.am". ;; Note: The root of the problem is already in "Makefile.am".
@ -7054,21 +7062,21 @@ the superuser to make device nodes.")
;; We don't have an /etc/passwd entry for "root" - use numeric IDs. ;; We don't have an /etc/passwd entry for "root" - use numeric IDs.
(substitute* "test/compare-tar" (substitute* "test/compare-tar"
(("tar -tvf") "tar --numeric-owner -tvf")) (("tar -tvf") "tar --numeric-owner -tvf"))
;; coreutils 8.32 changed 'ls' to use the statx() syscall instead
;; of lstat(). fakeroot 1.24 does not support the former, so
;; adjust these tests to use 'test -b' instead of 'ls' to test for
;; block device. See <https://bugs.gnu.org/41090>.
(substitute* '("test/t.mknod" "test/t.chmod_dev")
(("ls -ld? \\$tmp/hda3")
"test -b $tmp/hda3 && echo block || echo fail"))
#t))))) #t)))))
(native-inputs (native-inputs
`(("acl" ,acl) `(;; For bootstrapping the package.
("sharutils" ,sharutils) ; for the tests ("autoconf" ,autoconf)
("xz" ,xz))) ; for the tests ("automake" ,automake)
("libtool" ,libtool)
("gettext" ,gettext-minimal)
("po4a" ,po4a)
;; For tests.
("sharutils" ,sharutils)
("xz" ,xz)))
(inputs (inputs
`(("libcap" ,libcap/next) `(("acl" ,acl)
("libcap" ,libcap/next)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("sed" ,sed) ("sed" ,sed)
("coreutils" ,coreutils))) ("coreutils" ,coreutils)))
@ -7200,7 +7208,7 @@ of Linux application development.")
(package (package
(inherit pipewire) (inherit pipewire)
(name "pipewire") (name "pipewire")
(version "0.3.10") (version "0.3.13")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -7209,7 +7217,7 @@ of Linux application development.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y293sfhhmzbgnlvs46bpiyimlii5nk71f8115qxs8sviwlsdr3w")))) "19j5kmb7iaivkq2agfzncfm2qms41ckqi0ddxvhpc91ihwprdc5w"))))
(arguments (arguments
'(#:configure-flags '(#:configure-flags
(list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out") (list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out")
@ -7373,9 +7381,8 @@ persistent over reboots.")
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags #:make-flags
(list (list
(string-append "PREFIX=''") (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "DESTDIR=" (assoc-ref %outputs "out")) (string-append "LIBDIR=$(PREFIX)/lib")
(string-append "LIBDIR=/lib")
(string-append (string-append
"CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc")) "CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc"))
#:phases #:phases
@ -7586,3 +7593,38 @@ iptables rule and benefit from the speed of IP sets.
@end itemize\n @end itemize\n
then IP sets may be the proper tool for you.") then IP sets may be the proper tool for you.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public liburing
(package
(name "liburing")
(version "0.7")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.kernel.dk/liburing")
(commit (string-append "liburing-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3"))))
(build-system gnu-build-system)
(arguments
`(;; Tests are dependent on kernel version and features
#:tests? #f
#:phases
(modify-phases %standard-phases
(replace 'configure
;; configure fails if it is followed by SHELL, CONFIG_SHELL,
;; --enable-fast-install, and --build
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
(invoke "./configure" (string-append "--prefix=" out))))))))
(home-page "https://github.com/axboe/liburing")
(synopsis "Interface to the Linux kernel @code{io_uring} interface")
(description "This is the io_uring library, liburing. liburing provides
helpers to setup and teardown io_uring instances, and also a simplified
interface for applications that don't need (or want) to deal with the full
kernel side implementation.")
(license license:expat)))

View file

@ -3096,6 +3096,7 @@ Rosenberg's Common Lisp packages.")
(uri (git-reference (uri (git-reference
(url "http://git.kpe.io/cl-base64.git/") (url "http://git.kpe.io/cl-base64.git/")
(commit commit))) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj")))) (base32 "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
@ -10946,3 +10947,88 @@ web applications. Caveman2 has three design goals:
(define-public ecl-caveman (define-public ecl-caveman
(sbcl-package->ecl-package sbcl-caveman)) (sbcl-package->ecl-package sbcl-caveman))
(define-public sbcl-lambda-fiddle
(let ((commit "d16bba55acf6065b412f64ab8fdff679a4a32b1e") ;; no tagged branch
(revision "1"))
(package
(name "sbcl-lambda-fiddle")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/lambda-fiddle")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1zarj1pqjqmk95kdx1axkgpwy2wq3canczk7f9z5hvaw5an6gand"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/Shinmera/lambda-fiddle")
(synopsis "Collection of utilities to process lambda-lists")
(description "This collection of utilities is useful in contexts where
you want a macro that uses lambda-lists in some fashion but need more precise
processing.")
(license license:zlib))))
(define-public cl-lambda-fiddle
(sbcl-package->cl-source-package sbcl-lambda-fiddle))
(define-public ecl-lambda-fiddle
(sbcl-package->ecl-package sbcl-lambda-fiddle))
(define-public sbcl-xmls
(let ((commit "18546f0850b1338e03997ffd1696add1cb1800d1") ;; no tagged branch
(revision "1"))
(package
(name "sbcl-xmls")
(version (git-version "3.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rpgoldman/xmls")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1lmvfml2ldbb1wkhm25jqqk2bhwsz52hhcgljbnzj1xr8xhc3anp"))))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/rpgoldman/xmls")
(synopsis "Non-validating XML parser for Common Lisp")
(description "Xmls is a self-contained, easily embedded parser that
recognizes a useful subset of the XML spec. It provides a simple mapping from
XML to Lisp structures or s-expressions and back.")
(license license:bsd-2))))
(define-public cl-xmls
(sbcl-package->cl-source-package sbcl-xmls))
(define-public ecl-xmls
(sbcl-package->ecl-package sbcl-xmls))
(define-public sbcl-geco
(package
(name "sbcl-geco")
(version "2.01a")
(source
(origin
(method url-fetch)
(uri (string-append "https://common-lisp.net/project/geco/download/"
"geco-" version ".tar.gz"))
(sha256
(base32 "0kk0bzr1019cfmf2b1jl1rk9shv3gx5z1znifxllg9mb98yqsgw0"))))
(build-system asdf-build-system/sbcl)
(home-page "https://common-lisp.net/project/geco/")
(synopsis "Genetic algorithm toolkit for Common Lisp")
(description
"GECO (Genetic Evolution through Combination of Objects) is an extensible,
object-oriented framework for prototyping genetic algorithms in Common Lisp.")
(license license:lgpl2.1+)))
(define-public cl-geco
(sbcl-package->cl-source-package sbcl-geco))
(define-public ecl-geco
(sbcl-package->ecl-package sbcl-geco))

View file

@ -51,10 +51,8 @@
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bdw-gc) #:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages ed) #:use-module (gnu packages ed)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -811,7 +809,7 @@ enough to play the original mainframe Zork all the way through.")
(define-public txr (define-public txr
(package (package
(name "txr") (name "txr")
(version "243") (version "244")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -820,7 +818,7 @@ enough to play the original mainframe Zork all the way through.")
(commit (string-append "txr-" version)))) (commit (string-append "txr-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08rrl7ac6jnx0zfchzbpvs3qidrbjrl9c7p8s1wms90lp10i18ak")))) (base32 "1bzhb1pms6gjzphbsimhwdyq46ik1m7sgldigg5l1q7bppg9r3i0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -842,9 +840,6 @@ enough to play the original mainframe Zork all the way through.")
"tests/017/realpath.expected") "tests/017/realpath.expected")
(("/usr/bin") "/")) (("/usr/bin") "/"))
#t))))) #t)))))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)))
(inputs (inputs
`(("libffi" ,libffi))) `(("libffi" ,libffi)))
(synopsis "General-purpose, multi-paradigm programming language") (synopsis "General-purpose, multi-paradigm programming language")

View file

@ -80,7 +80,7 @@ as \"x86_64-linux\"."
("i686" => "X86") ("i686" => "X86")
("i586" => "X86")))) ("i586" => "X86"))))
(define (llvm-download-uri component version) (define (llvm-uri component version)
(if (version>=? version "9.0.1") (if (version>=? version "9.0.1")
(string-append "https://github.com/llvm/llvm-project/releases/download" (string-append "https://github.com/llvm/llvm-project/releases/download"
"/llvmorg-" version "/" component "-" version ".src.tar.xz") "/llvmorg-" version "/" component "-" version ".src.tar.xz")
@ -94,7 +94,7 @@ as \"x86_64-linux\"."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz")))) "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz"))))
@ -157,7 +157,7 @@ of programming tools as well as libraries with equivalent functionality.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "compiler-rt" version)) (uri (llvm-uri "compiler-rt" version))
(sha256 (base32 hash)) (sha256 (base32 hash))
(patches (map search-patch patches)))) (patches (map search-patch patches))))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -213,7 +213,7 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri (if (version>=? version "9.0.1") (uri (llvm-uri (if (version>=? version "9.0.1")
"clang" "clang"
"cfe") "cfe")
version)) version))
@ -476,6 +476,12 @@ code analysis tools.")
(((names . directories) ...) (((names . directories) ...)
(union-build out directories))) (union-build out directories)))
;; Create 'cc' and 'c++' so that one can use it as a
;; drop-in replacement for the default tool chain and
;; have configure scripts find the compiler.
(symlink "clang" (string-append out "/bin/cc"))
(symlink "clang++" (string-append out "/bin/c++"))
(union-build (assoc-ref %outputs "debug") (union-build (assoc-ref %outputs "debug")
(list (assoc-ref %build-inputs (list (assoc-ref %build-inputs
"libc-debug"))) "libc-debug")))
@ -484,7 +490,11 @@ code analysis tools.")
"libc-static"))) "libc-static")))
#t)))) #t))))
(native-search-paths (package-native-search-paths clang)) (native-search-paths
(append (package-native-search-paths clang)
(list (search-path-specification ;copied from glibc
(variable "GUIX_LOCPATH")
(files '("lib/locale"))))))
(search-paths (package-search-paths clang)) (search-paths (package-search-paths clang))
(license (package-license clang)) (license (package-license clang))
@ -514,7 +524,7 @@ output), and Binutils.")
#:tools-extra #:tools-extra
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "clang-tools-extra" (uri (llvm-uri "clang-tools-extra"
(package-version llvm-10))) (package-version llvm-10)))
(sha256 (sha256
(base32 (base32
@ -530,7 +540,7 @@ output), and Binutils.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")) "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))
@ -566,7 +576,7 @@ output), and Binutils.")
(version (package-version llvm-10)) (version (package-version llvm-10))
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "lld" version)) (uri (llvm-uri "lld" version))
(sha256 (sha256
(base32 (base32
"026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r")))) "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r"))))
@ -590,7 +600,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(version "8.0.0") (version "8.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"))))
@ -616,7 +626,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(version "7.0.1") (version "7.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3")))))) "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"))))))
@ -641,7 +651,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(version "6.0.1") (version "6.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))))) "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"))))))
@ -667,7 +677,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z")))) "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"))))
@ -699,7 +709,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")))))) "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))))))
@ -723,7 +733,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))))) "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"))))))
@ -747,7 +757,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn")))))) "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn"))))))
@ -769,7 +779,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(patches (patches
(search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch")) (search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch"))
(sha256 (sha256
@ -832,7 +842,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "libcxx" version)) (uri (llvm-uri "libcxx" version))
(sha256 (sha256
(base32 (base32
"0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089"))))
@ -872,7 +882,7 @@ use with Clang, targeting C++11, C++14 and above.")
(source (source
(origin (origin
(inherit (package-source libcxx)) (inherit (package-source libcxx))
(uri (llvm-download-uri "libcxx" version)) (uri (llvm-uri "libcxx" version))
(sha256 (sha256
(base32 (base32
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
@ -925,7 +935,7 @@ requirements according to version 1.1 of the OpenCL specification.")
(version "9.0.1") (version "9.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (llvm-download-uri "openmp" version)) (uri (llvm-uri "openmp" version))
(sha256 (sha256
(base32 (base32
"1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w")) "1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w"))

View file

@ -1209,7 +1209,7 @@ and search library.")
(base32 "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb")))) (base32 "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ghc-pandoc" ,ghc-pandoc) `(("pandoc" ,pandoc)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("libcrypto" ,openssl) `(("libcrypto" ,openssl)
@ -3231,10 +3231,12 @@ on the fly. Both programs are written in C and are very fast.")
"12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp")))) "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp"))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs (inputs
`(("perl-net-dns" ,perl-net-dns) `(("perl-io-socket-inet6" ,perl-io-socket-inet6)
("perl-net-ssleay" ,perl-net-ssleay))) ("perl-net-dns" ,perl-net-dns)
("perl-net-ssleay" ,perl-net-ssleay)
("perl-socket6" ,perl-socket6))) ; used by perl-io-socket-inet6
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -3268,7 +3270,7 @@ operators and scripters.")
(define-public alpine (define-public alpine
(package (package
(name "alpine") (name "alpine")
(version "2.23.2") (version "2.24")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3281,7 +3283,7 @@ operators and scripters.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "16ldmmcymrnpnbfc1kb2rhac7nzlc87wjawic4wfinkphd124d1y")) (base32 "0d5ybnsv29gs8krl66db56avmssq28jlg0qj5i1wka05ncc3740d"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -30,9 +30,11 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix utils)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages web)) #:use-module (gnu packages web))
@ -112,7 +114,7 @@ convert it to structurally valid XHTML (or HTML).")
(define-public discount (define-public discount
(package (package
(name "discount") (name "discount")
(version "2.2.4") (version "2.2.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -120,10 +122,11 @@ convert it to structurally valid XHTML (or HTML).")
"discount/discount-" version ".tar.bz2")) "discount/discount-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl")))) "024mxv0gpvilyfczarcgy5m7h4lv6qvhjfpf5i73qkxhszjjn9mi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:parallel-build? #f ; libmarkdown won't be built in time
#:make-flags (list #:make-flags (list
(string-append "LFLAGS=-L. -Wl,-rpath=" (string-append "LFLAGS=-L. -Wl,-rpath="
(assoc-ref %outputs "out") "/lib")) (assoc-ref %outputs "out") "/lib"))
@ -138,10 +141,15 @@ convert it to structurally valid XHTML (or HTML).")
#t)) #t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "CC" "gcc") (let ((out (assoc-ref outputs "out")))
(invoke "./configure.sh" (setenv "CC" ,(cc-for-target))
(string-append "--prefix=" (assoc-ref outputs "out")) ;; The validate-runpath phase fails otherwise.
"--shared")))))) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
(invoke "./configure.sh"
(string-append "--prefix=" out)
"--shared")))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "Markdown processing library, written in C") (synopsis "Markdown processing library, written in C")
(description (description
"Discount is a markdown implementation, written in C. It provides a "Discount is a markdown implementation, written in C. It provides a

View file

@ -40,6 +40,7 @@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2156,7 +2157,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
(define-public gmsh (define-public gmsh
(package (package
(name "gmsh") (name "gmsh")
(version "2.16.0") (version "4.6.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2168,12 +2169,11 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
version))))) version)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162")) (base32 "0m0pjxcy1bnr7a20i11lh0ih159pphq9wsvfjr3sfx4y3lginz5y"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove non-free METIS code
'(begin '(begin
(delete-file-recursively "contrib/Metis") (delete-file-recursively "contrib/metis")
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(propagated-inputs (propagated-inputs
@ -2184,14 +2184,15 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
("lapack" ,lapack) ("lapack" ,lapack)
("mesa" ,mesa) ("mesa" ,mesa)
("glu" ,glu) ("glu" ,glu)
("opencascade-oce" ,opencascade-oce) ("metis" ,metis)
("opencascade-occt" ,opencascade-occt)
("libx11" ,libx11) ("libx11" ,libx11)
("libxext" ,libxext))) ("libxext" ,libxext)))
(inputs (inputs
`(("fontconfig" ,fontconfig) `(("fontconfig" ,fontconfig)
("libxft" ,libxft))) ("libxft" ,libxft)))
(arguments (arguments
`(#:configure-flags `("-DENABLE_METIS:BOOL=OFF" `(#:configure-flags `("-DENABLE_SYSTEM_CONTRIB:BOOL=ON"
"-DENABLE_BUILD_SHARED:BOOL=ON" "-DENABLE_BUILD_SHARED:BOOL=ON"
"-DENABLE_BUILD_DYNAMIC:BOOL=ON"))) "-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
(home-page "http://gmsh.info/") (home-page "http://gmsh.info/")

View file

@ -24,6 +24,7 @@
;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org> ;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net> ;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2319,7 +2320,7 @@ support for high performance Telegram Bot creation.")
(define-public chatty (define-public chatty
(package (package
(name "chatty") (name "chatty")
(version "0.1.10") (version "0.1.16")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2328,7 +2329,7 @@ support for high performance Telegram Bot creation.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0czvqwjzsb0rvmgrmbh97m1b35rnwl41j7q32z4fcqb7bschibql")))) "085hb3ii1cy0jb3f0mim25v5r5w3gpfsdpjid5dmrpw4gi88aa2x"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -2345,6 +2346,7 @@ support for high performance Telegram Bot creation.")
(inputs (inputs
`(("feedbackd" ,feedbackd) `(("feedbackd" ,feedbackd)
("folks" ,folks) ("folks" ,folks)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libgee" ,libgee) ("libgee" ,libgee)
("libhandy" ,libhandy-0.0) ("libhandy" ,libhandy-0.0)

View file

@ -184,7 +184,7 @@ player daemon.")
(define-public ncmpc (define-public ncmpc
(package (package
(name "ncmpc") (name "ncmpc")
(version "0.39") (version "0.40")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -193,7 +193,7 @@ player daemon.")
"/ncmpc-" version ".tar.xz")) "/ncmpc-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1a0i1wm9287kd4nqii28dp84260063kyl726yjzxzr7vq8hf7sv4")))) "1pfkf2zl55g7krrp4qi5m8j9h4m9vc3rnz65f7gb75pbmiy5iyh9"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

View file

@ -29,6 +29,7 @@
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3159,6 +3160,13 @@ websites such as Libre.fm.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Reported upstream: <https://github.com/beetbox/beets/issues/3771>.
;; Disable the faulty test as the fix is unclear.
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "test/test_mediafile.py"
(("def test_read_audio_properties") "def _test_read_audio_properties"))
#t))
(add-after 'unpack 'set-HOME (add-after 'unpack 'set-HOME
(lambda _ (lambda _
(setenv "HOME" (string-append (getcwd) "/tmp")) (setenv "HOME" (string-append (getcwd) "/tmp"))
@ -5538,7 +5546,7 @@ and as an LV2 plugin.")
;; distros to make necessary changes to integrate the software into the ;; distros to make necessary changes to integrate the software into the
;; distribution. ;; distribution.
(name "zrythm") (name "zrythm")
(version "0.8.911") (version "1.0.0-alpha.3.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5546,7 +5554,7 @@ and as an LV2 plugin.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1xyp70sjc2k5pfdqbwqa988v86da0rmmyl8ry86bqv4ja80sc6g9")))) "06025367x08y4g9grhcn35bk1dsrpgm04c8l8j50i3p49dl3s1n0"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -5558,15 +5566,8 @@ and as an LV2 plugin.")
"-Dgraphviz=enabled" ; for exporting routing graphs "-Dgraphviz=enabled" ; for exporting routing graphs
"-Dguile=enabled" ; for Guile scripting "-Dguile=enabled" ; for Guile scripting
"-Djack=enabled" ; for JACK audio/MIDI backend "-Djack=enabled" ; for JACK audio/MIDI backend
"-Dsdl=enabled") ; for SDL audio backend (which uses ALSA) "-Drtmidi=enabled" ; for RtMidi backend (ALSA sequencer)
#:phases "-Dsdl=enabled"))) ; for SDL audio backend (which uses ALSA)
(modify-phases %standard-phases
(add-after 'unpack 'patch-xdg-open
(lambda _
(substitute* "src/utils/io.c"
(("OPEN_DIR_CMD")
(string-append "\"" (which "xdg-open") "\"")))
#t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("jack" ,jack-1) ("jack" ,jack-1)

View file

@ -30,13 +30,13 @@
(define-public nano (define-public nano
(package (package
(name "nano") (name "nano")
(version "5.2") (version "5.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
(sha256 (sha256
(base32 "1qd7pn9g5dgzbfg4fb3nqxqgi2iqq0g6x33x8d1mx6mfw51xmhij")))) (base32 "0lj3fcfzprmv9raydx8yq25lw81bs6g40rhd0fv9d6idcb7wphf5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)

View file

@ -13,7 +13,7 @@
;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch> ;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch>
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com>
@ -346,6 +346,24 @@ performance across unpredictable networks, such as the Internet.")
(home-page "https://www.srtalliance.org/") (home-page "https://www.srtalliance.org/")
(license license:mpl2.0))) (license license:mpl2.0)))
;; FFmpeg, GStreamer, and VLC don't support SRT 1.4.2 yet.
(define-public srt-1.4.1
(package
(inherit srt)
(name "srt")
(version "1.4.1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Haivision/srt.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"01xaq44j95kbgqfl41pnybvqy0yq6wd4wdw88ckylzf0nzp977xz"))))))
(define-public lksctp-tools (define-public lksctp-tools
(package (package
(name "lksctp-tools") (name "lksctp-tools")

View file

@ -43,14 +43,14 @@
(define-public chrony (define-public chrony
(package (package
(name "chrony") (name "chrony")
(version "3.5.1") (version "4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.tuxfamily.org/chrony/" (uri (string-append "https://download.tuxfamily.org/chrony/"
"chrony-" version ".tar.gz")) "chrony-" version ".tar.gz"))
(sha256 (sha256
(base32 "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v")))) (base32 "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((srfi srfi-26) `(#:modules ((srfi srfi-26)
@ -80,7 +80,8 @@
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("libcap" ,libcap/next) `(("gnutls" ,gnutls)
("libcap" ,libcap/next)
("libseccomp" ,libseccomp) ("libseccomp" ,libseccomp)
("nettle" ,nettle))) ("nettle" ,nettle)))
(home-page "https://chrony.tuxfamily.org/") (home-page "https://chrony.tuxfamily.org/")

View file

@ -50,6 +50,7 @@
#:use-module (gnu packages cpio) #:use-module (gnu packages cpio)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages file) #:use-module (gnu packages file)
@ -130,8 +131,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "1.1.0") (let ((version "1.1.0")
(commit "d27dbeb9d8f6c3a4c1d2fdbeb432717c119b73d1") (commit "875c01f82dc5f2c4ca82952ea88b3240fbe8bede")
(revision 28)) (revision 30))
(package (package
(name "guix") (name "guix")
@ -147,7 +148,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0j60m9s47n23flfp2yn4ww4vsk8qvp500m2x1x0ib5bjywj1hiwl")) "0mh1hnrk84h5nzqp6aflh9ab3kxr5672c8bx44minzyd26177yik"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -988,6 +989,92 @@ environments.")
;; and the fonts included in this package are licensed OFL1.1. ;; and the fonts included in this package are licensed OFL1.1.
(license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
(let ((commit "e701d4d7f24a11d94cf504e7efbcee4e1091b092")
(revision "1"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.cbaines.net/git/guix/build-coordinator")
(commit commit)))
(sha256
(base32
"16f09sl527b6bgyxs2ybyjfncli60dwzg4v1c58h4hcl2zm8qx70"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE
(lambda _
;; To avoid warnings relating to 'guild'.
(setenv "GUILE_AUTO_COMPILE" "0")
#t))
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile"))
(version (target-guile-effective-version))
(scm (string-append out "/share/guile/site/" version))
(go (string-append out "/lib/guile/" version "/site-ccache")))
(for-each
(lambda (file)
(simple-format (current-error-port) "wrapping: ~A\n" file)
(wrap-program file
`("PATH" ":" prefix
(,bin
;; Support building without sqitch as an input, as it
;; can't be cross-compiled yet
,@(or (and=> (assoc-ref inputs "sqitch")
list)
'())))
`("GUILE_LOAD_PATH" ":" prefix
(,scm ,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
(find-files bin)))
#t))
(delete 'strip)))) ; As the .go files aren't compatible
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
;; Guile libraries are needed here for cross-compilation.
("guile-json" ,guile-json-3)
("guile-gcrypt" ,guile-gcrypt)
("guix" ,guix)
("guile-prometheus" ,guile-prometheus)
("guile-fibers" ,guile-fibers)
("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("guile-fibers" ,guile-fibers)
("guile-prometheus" ,guile-prometheus)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-3)
("guile-lzlib" ,guile-lzlib)
("guile-sqlite3" ,guile-sqlite3)
("guix" ,guix)
("sqlite" ,sqlite)
("sqitch" ,sqitch)))
(home-page "https://git.cbaines.net/guix/build-coordinator/")
(synopsis "Tool to help build derivations")
(description
"The Guix Build Coordinator helps with performing lots of builds across
potentially many machines, and with doing something with the results and
outputs of those builds.")
(license license:gpl3+))))
(define-public guix-jupyter (define-public guix-jupyter
(package (package
(name "guix-jupyter") (name "guix-jupyter")

View file

@ -0,0 +1,55 @@
# This patch comes from upstream commit c0620e432650e81062c1967cc669829dbd29b310.
# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland
--- src/canberra-gtk-module.c.orig
+++ src/canberra-gtk-module.c
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
gboolean ret = FALSE;
Atom xembed;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return FALSE;
+#endif
+
/* Gnome Panel applets are XEMBED windows. We need to make sure we
* ignore them */
--- src/canberra-gtk.c.orig
+++ src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,

View file

@ -0,0 +1,20 @@
--- a/src/server_x11.c 2016-08-01 11:58:54.714647794 +0200
+++ b/src/server_x11.c 2016-08-01 11:58:46.606563478 +0200
@@ -151,7 +151,7 @@ DEFINE_COMMAND(open_forwarded_x11)
#define X11_MIN_DISPLAY 10
#define X11_MAX_DISPLAY 1000
-/* FIXME: Create the /tmp/.X11-unix directory, if needed. Figure out
+/* FIXME: Figure out
* if and how we should use /tmp/.X17-lock. Consider using display
* "unix:17" instead of just ":17".
*/
@@ -253,6 +253,7 @@ open_x11_socket(struct ssh_channel *chan
old_umask = umask(0077);
+ mkdir(X11_SOCKET_DIR, S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX);
old_cd = lsh_pushd(X11_SOCKET_DIR, &dir, 0, 0);
if (old_cd < 0)
{

View file

@ -0,0 +1,15 @@
Fix test failure with Pytest 4.
Taken from upstream:
https://github.com/chardet/chardet/commit/440828f8faafdb58700c64a9ea8f6a30b154c08b
diff --git a/test.py b/test.py
--- a/test.py
+++ b/test.py
@@ -59,5 +59,5 @@ def gen_test_params():
full_path = join(path, file_name)
test_case = full_path, encoding
if full_path in EXPECTED_FAILURES:
- test_case = pytest.mark.xfail(test_case)
+ test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
yield test_case

View file

@ -0,0 +1,52 @@
From 783cbd59fcf086a9aaf603271823fb4ca71f0c55 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Thu, 8 Oct 2020 23:01:05 +0200
Subject: [PATCH] meminfo: Replace sys/io.h by direct register accesses.
See: https://github.com/linux-sunxi/sunxi-tools/pull/144
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
meminfo.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meminfo.c b/meminfo.c
index 0b0ff23..3b3a5df 100644
--- a/meminfo.c
+++ b/meminfo.c
@@ -22,7 +22,6 @@
#include <sys/mman.h>
#include <stdint.h>
#include <errno.h>
-#include <sys/io.h>
#include <stdbool.h>
#include "common.h"
@@ -74,24 +73,24 @@ static enum sunxi_soc_version soc_version;
unsigned int
sunxi_io_read(void *base, int offset)
{
- return inl((unsigned long) (base + offset));
+ return *(volatile unsigned int*) (base + offset);
}
void
sunxi_io_write(void *base, int offset, unsigned int value)
{
- outl(value, (unsigned long) (base + offset));
+ *(volatile unsigned int*) (base + offset) = value;
}
void
sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask)
{
- unsigned int tmp = inl((unsigned long) (base + offset));
+ unsigned int tmp = sunxi_io_read(base, offset);
tmp &= ~mask;
tmp |= value & mask;
- outl(tmp, (unsigned long) (base + offset));
+ sunxi_io_write(base, offset, tmp);
}

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2019, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
@ -27,6 +27,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -74,7 +75,8 @@
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web)) #:use-module (gnu packages web)
#:use-module (gnu packages xorg))
;;; ;;;
;;; Please: Try to add new module packages in alphabetic order. ;;; Please: Try to add new module packages in alphabetic order.
@ -3812,24 +3814,15 @@ of the input. MD4 is described in RFC 1320.")
(define-public perl-digest-md5 (define-public perl-digest-md5
(package (package
(name "perl-digest-md5") (name "perl-digest-md5")
(version "2.55") (version "2.58")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-" (uri (string-append "mirror://cpan/authors/id/T/TO/TODDR/Digest-MD5-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "057psy6k7im0pr3344ny6k5rsnbqj8aizkmwgw53kbbngabh20kx"))))
"0g0fklbrm2krswc1xhp4iwn1dhqq71fqh2p5wm8xj9a4s6i9ic83"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'build 'set-permissions
(lambda _
;; Make MD5.so read-write so it can be stripped.
(chmod "blib/arch/auto/Digest/MD5/MD5.so" #o755)
#t)))))
(home-page "https://metacpan.org/release/Digest-MD5") (home-page "https://metacpan.org/release/Digest-MD5")
(synopsis "Perl interface to the MD-5 algorithm") (synopsis "Perl interface to the MD-5 algorithm")
(description (description
@ -7870,6 +7863,64 @@ technology to store hierarchical information such as links to other
documents within a single file.") documents within a single file.")
(license (package-license perl)))) (license (package-license perl))))
(define-public perl-opengl
(package
(name "perl-opengl")
(version "0.70")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/C/CH/CHM/OpenGL-"
version
".tar.gz"))
(sha256
(base32
"1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"))))
(build-system perl-build-system)
(inputs `(("freeglut" ,freeglut)
("libxi" ,libxi)
("libxmu" ,libxmu)))
(arguments
'(#:tests? #f ; test.pl fails with our empty glversion.txt, while
; the package still seems to work on the examples
#:phases
(modify-phases %standard-phases
(add-before 'configure 'glversion
;; Building utils/glversion.txt fails, and is probably
;; dependent on the graphics card in the build system.
;; Replace it by a content-free file; while this breaks
;; the tests, the examples in the examples/ subdirectory
;; can be run.
(lambda _
(substitute* "Makefile.PL"
(("unlink") "# unlink") ; prevent utils/glversion.txt
; from being deleted once...
(("\\.\"\\$make_ver clean\"") "")) ; ...and twice...
(substitute* "utils/Makefile"
(("all: glversion.txt") "all: ")) ; ...and thrice.
(call-with-output-file "utils/glversion.txt"
(lambda (port)
(display (string-append "FREEGLUT=\nGLUT=\nVERSION=\n"
"VENDOR=\nRENDERER=\n"
"EXTENSIONS=\n")
port)))
#t))
(add-before 'configure 'fix-library-flags
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile.PL"
(("-L/usr/local/freeglut/lib")
(string-append "-L" (assoc-ref inputs "freeglut") "/lib\n"
"-L" (assoc-ref inputs "glu") "/lib\n"
"-L" (assoc-ref inputs "mesa") "/lib\n")))
#t)))))
(home-page "https://metacpan.org/release/OpenGL")
(synopsis
"Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT")
(description "The package provides Perl bindings to OpenGL, GLU
and FreeGLUT.")
(license (package-license perl))))
(define-public perl-package-anon (define-public perl-package-anon
(package (package
(name "perl-package-anon") (name "perl-package-anon")

View file

@ -2,7 +2,7 @@
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
@ -230,6 +230,18 @@ to @code{IOStreams}.")
#:parallel-tests? #f ;There appear to be race conditions #:parallel-tests? #f ;There appear to be race conditions
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (%current-target-system)
;; 'doc/Makefile.am' tries to run stuff even when
;; cross-compiling. Explicitly skip it.
;; XXX: Inline this on next rebuild cycle.
`((add-before 'build 'skip-doc-directory
(lambda _
(substitute* "Makefile"
(("^SUBDIRS = (.*) doc(.*)$" _ before after)
(string-append "SUBDIRS = " before
" " after "\n")))
#t)))
'())
(add-before 'check 'patch-test-files (add-before 'check 'patch-test-files
(lambda _ (lambda _
;; Unpatch shebangs in test input so that source-highlight ;; Unpatch shebangs in test input so that source-highlight

View file

@ -118,7 +118,7 @@ for reading and writing new sound file formats.")
"/libsndfile-" version ".tar.bz2")) "/libsndfile-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0gsbg8ni496h55mx2p9999fk0xvbsjyz6v678a0l75b5fqs8d2gc")) "06k1wj3lwm7vf21s8yqy51k6nrkn9z610bj1gxb618ag5hq77wlx"))
(modules '((ice-9 textual-ports) (guix build utils))) (modules '((ice-9 textual-ports) (guix build utils)))
(snippet (snippet
'(begin '(begin

View file

@ -872,14 +872,14 @@ is Pythons.")
(define-public python-openid (define-public python-openid
(package (package
(name "python-openid") (name "python-openid")
(version "3.1.0") (version "3.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "python3-openid" version)) (uri (pypi-uri "python3-openid" version))
(sha256 (sha256
(base32 (base32
"00l5hrjh19740w00b3fnsqldnla41wbr2rics09dl4kyd1fkd3b2")))) "1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2164,13 +2164,13 @@ adapter for use with the Requests library.")
(define-public python-oauthlib (define-public python-oauthlib
(package (package
(name "python-oauthlib") (name "python-oauthlib")
(version "3.0.1") (version "3.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "oauthlib" version)) (uri (pypi-uri "oauthlib" version))
(sha256 (sha256
(base32 (base32
"163jg4a8f7c5ki655grrr47kgljy12wri3qly7ijf64sk1fjrqqc")))) "12gqnabwck30gdlpwm6af3s28qm9p2yc7b1w8s4fk9ncbz1irr5y"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

View file

@ -84,6 +84,8 @@
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com> ;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com>
;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -507,14 +509,20 @@ pidof, tty, taskset, pmap.")
(define-public python-shapely (define-public python-shapely
(package (package
(name "python-shapely") (name "python-shapely")
(version "1.6.4.post2") (version "1.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Shapely" version)) (uri (pypi-uri "Shapely" version))
(sha256 (sha256
(base32 (base32
"03r42fmd9alp6r3q95ad6rldq2f7n1wimrw53zy5kpn33yv7pf64")))) "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file "shapely/speedups/_speedups.c")
(delete-file "shapely/vectorized/_vectorized.c")
#t))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-cython" ,python-cython) `(("python-cython" ,python-cython)
@ -533,11 +541,14 @@ pidof, tty, taskset, pmap.")
(let ((geos (assoc-ref inputs "geos")) (let ((geos (assoc-ref inputs "geos"))
(glibc (assoc-ref inputs ,(if (%current-target-system) (glibc (assoc-ref inputs ,(if (%current-target-system)
"cross-libc" "libc")))) "cross-libc" "libc"))))
(substitute* "shapely/geos.py" (substitute* '("shapely/geos.py" "shapely/_buildcfg.py")
(("_lgeos = load_dll\\('geos_c', fallbacks=.*\\)") (("_lgeos = load_dll\\('geos_c', fallbacks=.*\\)")
(string-append "_lgeos = load_dll('geos_c', fallbacks=['" (string-append "_lgeos = load_dll('geos_c', fallbacks=['"
geos "/lib/libgeos_c.so'])")) geos "/lib/libgeos_c.so'])"))
(("free = load_dll\\('c'\\)\\.free") (("free = load_dll\\('c'\\)\\.free")
(string-append "free = load_dll('c', fallbacks=['"
glibc "/lib/libc.so.6']).free"))
(("free = load_dll\\('c', fallbacks=.*\\)\\.free")
(string-append "free = load_dll('c', fallbacks=['" (string-append "free = load_dll('c', fallbacks=['"
glibc "/lib/libc.so.6']).free")))) glibc "/lib/libc.so.6']).free"))))
#t))))) #t)))))
@ -4088,6 +4099,27 @@ matching of file paths.")
(description "Black is the uncompromising Python code formatter.") (description "Black is the uncompromising Python code formatter.")
(license license:expat))) (license license:expat)))
(define-public python-black-macchiato
(package
(name "python-black-macchiato")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "black-macchiato" version))
(sha256
(base32
"1drp5p697ni1xn5y2lbjpalgpkzy2i4cyxjj5pk4dxr0vk97dd7i"))))
(build-system python-build-system)
(propagated-inputs
`(("python-black" ,python-black)))
(home-page "https://github.com/wbolster/black-macchiato")
(synopsis "Partial @code{python-black} formatting")
(description
"This package is built on top the @{python-black} code formatter to
enable formatting of partial files.")
(license license:bsd-3)))
(define-public python-blinker (define-public python-blinker
(package (package
(name "python-blinker") (name "python-blinker")
@ -8048,13 +8080,13 @@ complexity of Python source code.")
(define-public python-flake8 (define-public python-flake8
(package (package
(name "python-flake8") (name "python-flake8")
(version "3.8.3") (version "3.8.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "flake8" version)) (uri (pypi-uri "flake8" version))
(sha256 (sha256
(base32 (base32
"02527892hh0qjivxaiphzalj7q32qkna1cqaikjs7c03mk5ryjzh")))) "0fvcrsbyzjpcli8ldbpsdbpmf238nkvwc1dy4hy82lf63rvfinma"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -10039,14 +10071,13 @@ simulation, statistical modeling, machine learning and much more.")
(uri (pypi-uri "chardet" version)) (uri (pypi-uri "chardet" version))
(sha256 (sha256
(base32 (base32
"1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4")))) "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"))
(patches (search-patches "python-chardet-3.0.4-pytest.patch"))))
(native-inputs (native-inputs
`(("python-hypothesis" ,python-hypothesis) `(("python-hypothesis" ,python-hypothesis)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner))) ("python-pytest-runner" ,python-pytest-runner)))
(build-system python-build-system) (build-system python-build-system)
;; XXX: Incompatible with Pytest 4: <https://github.com/chardet/chardet/issues/173>.
(arguments `(#:tests? #f))
(home-page "https://github.com/chardet/chardet") (home-page "https://github.com/chardet/chardet")
(synopsis "Universal encoding detector for Python 2 and 3") (synopsis "Universal encoding detector for Python 2 and 3")
(description (description
@ -10811,36 +10842,40 @@ Pytest but stripped of Pytest specific details.")
(define-public python-tox (define-public python-tox
(package (package
(name "python-tox") (name "python-tox")
(version "2.8.1") (version "3.20.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "tox" version)) (uri (pypi-uri "tox" version))
(sha256 (sha256
(base32 (base32
"1drp6mwm8wdypjym15ia8lwjxbhcksb9vzxg4ay5dh4ji57by2ny")))) "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; FIXME: Tests require pytest-timeout, which itself requires ;; FIXME: Tests require pytest-timeout, which itself requires
;; pytest>=2.8.0 for installation. ;; pytest>=2.8.0 for installation.
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs (propagated-inputs
`(("python-pluggy" ,python-pluggy) ; >=0.3.0,<0.4.0 `(("python-filelock" ,python-filelock)
("python-py" ,python-py) ("python-packaging" ,python-packaging)
("python-virtualenv" ,python-virtualenv))) ("python-pluggy" ,python-pluggy)
(native-inputs ("python-py" ,python-py)
`(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout) ("python-six" ,python-six)
("python-pytest" ,python-pytest) ; >= 2.3.5 ("python-toml" ,python-toml)
("python-setuptools-scm" ,python-setuptools-scm))) ("python-virtualenv" ,python-virtualenv)))
(home-page "https://tox.readthedocs.io") (native-inputs
(synopsis "Virtualenv-based automation of test activities") `(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
(description "Tox is a generic virtualenv management and test command line ("python-pytest" ,python-pytest) ; >= 2.3.5
("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://tox.readthedocs.io")
(synopsis "Virtualenv-based automation of test activities")
(description "Tox is a generic virtualenv management and test command line
tool. It can be used to check that a package installs correctly with tool. It can be used to check that a package installs correctly with
different Python versions and interpreters, or run tests in each type of different Python versions and interpreters, or run tests in each type of
supported environment, or act as a frontend to continuous integration supported environment, or act as a frontend to continuous integration
servers.") servers.")
(license license:expat))) (license license:expat)))
(define-public python2-tox (define-public python2-tox
(package-with-python2 python-tox)) (package-with-python2 python-tox))
@ -15380,18 +15415,18 @@ perform the operations required for synchronizing plain text.")
(define-public python-dirsync (define-public python-dirsync
(package (package
(name "python-dirsync") (name "python-dirsync")
(version "2.2.3") (version "2.2.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "dirsync" version)) (uri (pypi-uri "dirsync" version))
(sha256 (sha256
(base32 (base32
"1r40fkanksagcszf1ag85mdr8w7rgc7196n6s1qlsk2abw6i7v0z")))) "1gm82jddm1lkazdi8lfsl1b3vi1z0252ng60mzjym8irnv94qfhy"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("six" ,python-six))) `(("six" ,python-six)))
(home-page "https://bitbucket.org/tkhyn/dirsync") (home-page "https://github.com/tkhyn/dirsync")
(synopsis "Advanced directory tree synchronisation tool") (synopsis "Advanced directory tree synchronisation tool")
(description "Advanced directory tree synchronisation tool.") (description "Advanced directory tree synchronisation tool.")
(license license:expat))) (license license:expat)))
@ -21449,6 +21484,37 @@ randomness (including real life dice) and different wordlists (including
cryptographically signed ones).") cryptographically signed ones).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public python-dictdiffer
(package
(name "python-dictdiffer")
(version "0.8.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "dictdiffer" version))
(sha256
(base32
"1lk3qmy1hkaphk4n7ayfk0wl6m2yvd6r7qkam6yncqfzgkbc1phs"))))
(build-system python-build-system)
(native-inputs
`(("python-check-manifest" ,python-check-manifest)
("python-coverage" ,python-coverage)
("python-isort" ,python-isort)
("python-mock" ,python-mock)
("python-pydoctstyle" ,python-pydocstyle)
("python-pytest-cache" ,python-pytest-cache)
("python-pytest-cov" ,python-pytest-cov)
("python-pytest-pep8" ,python-pytest-pep8)
("python-pytest-runner" ,python-pytest-runner)
("python-pytest" ,python-pytest)
("python-setuptools-scm" ,python-setuptools-scm)
("python-tox" ,python-tox)))
(home-page "https://github.com/inveniosoftware/dictdiffer")
(synopsis "Diff and patch Python dictionary objects")
(description
"Dictdiffer is a Python module that helps you to diff and patch
dictionaries.")
(license license:expat)))
(define-public pyzo (define-public pyzo
(package (package
(name "pyzo") (name "pyzo")
@ -22012,6 +22078,42 @@ dates in almost any string formats commonly found on web pages.")
(description "This package provides a parser for Python dependency files.") (description "This package provides a parser for Python dependency files.")
(license license:expat))) (license license:expat)))
(define-public python-dpath
(package
(name "python-dpath")
(version "2.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dpath" version))
(sha256
(base32
"1ymi9ssk7i0mx3mviplf4csfvzibdd6wyj4qzj6s487n9xgnp85y"))))
(build-system python-build-system)
(native-inputs
`(("python-hypothesis" ,python-hypothesis)
("python-mock" ,python-mock)
("python-nose" ,python-nose)))
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
;; This invokation is taken from tox.ini.
(invoke "nosetests" "-d" "-v" "tests/"))))))
(home-page "https://github.com/akesterson/dpath-python")
(synopsis "Filesystem-like pathing and searching for dictionaries")
(description
"@code{python-dpath} is a library for accessing and searching
dictionaries via /slashed/paths ala xpath.
Basically it lets you glob over a dictionary as if it were a filesystem. It
allows you to specify globs (ala the bash eglob syntax, through some advanced
fnmatch.fnmatch magic) to access dictionary elements, and provides some
facility for filtering those results.")
(license license:expat)))
(define-public python-safety (define-public python-safety
(package (package
(name "python-safety") (name "python-safety")
@ -22137,3 +22239,60 @@ CSL 1.0.1 specification. citeproc-py can output styled citations and
bibliographies in a number of different output formats. Currently supported bibliographies in a number of different output formats. Currently supported
are plain text, reStructuredText and HTML.") are plain text, reStructuredText and HTML.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python-inform
(package
(name "python-inform")
(version "1.23.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "inform" version))
(sha256
(base32
"0dvc5klbnbryrvspp45nmlg02g40j7xspcz7lqsm0c0dj0z29zdz"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; PyPI tarball lacks tests
(native-inputs
`(("python-hypothesis" ,python-hypothesis)
("python-pytest-cov" ,python-pytest-cov)
("python-pytest-runner" ,python-pytest-runner)))
(propagated-inputs
`(("python-arrow" ,python-arrow)
("python-six" ,python-six)))
(home-page "https://inform.readthedocs.io")
(synopsis "Print & logging utilities for communicating with user")
(description
"Inform is designed to display messages from programs that are typically run from
a console. It provides a collection of print functions that allow you to simply and
cleanly print different types of messages.")
(license license:gpl3+)))
(define-public python-nestedtext
(package
(name "python-nestedtext")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nestedtext" version))
(sha256
(base32
"0xjx863n7yd1xmkwhy48lhmqrmlzgbx3civhk386hvrzyq4sx148"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; PyPI tarball lacks tests
(propagated-inputs
`(("python-inform" ,python-inform)))
(home-page "https://nestedtext.org")
(synopsis "Human readable and writable data interchange format")
(description
"NestedText is a file format for holding data that is to be entered, edited, or
viewed by people. It allows data to be organized into a nested collection of
dictionaries, lists, and strings. In this way it is similar to JSON and YAML, but
without the complexity and risk of YAML and without the syntatic clutter of JSON.
NestedText is both simple and natural. Only a small number of concepts and rules must
be kept in mind when creating it. It is easily created, modified, or viewed with
a text editor and easily understood and used by both programmers and non-programmers.")
(license license:expat))) ; MIT license

View file

@ -83,7 +83,7 @@
("rust-dirs" ,rust-dirs-2.0) ("rust-dirs" ,rust-dirs-2.0)
;;("rust-failure" included ;;("rust-failure" included
("rust-filetime" ,rust-filetime-0.2) ("rust-filetime" ,rust-filetime-0.2)
("rust-flate2" ,rust-flate2-1.0) ("rust-flate2" ,rust-flate2-1)
("rust-fs2" ,rust-fs2-0.4) ("rust-fs2" ,rust-fs2-0.4)
("rust-futures" ,rust-futures-0.1) ("rust-futures" ,rust-futures-0.1)
("rust-http" ,rust-http-0.1) ("rust-http" ,rust-http-0.1)
@ -98,7 +98,7 @@
("rust-native-tls" ,rust-native-tls-0.2) ("rust-native-tls" ,rust-native-tls-0.2)
("rust-nettle" ,rust-nettle-7) ("rust-nettle" ,rust-nettle-7)
("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4) ("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4)
("rust-percent-encoding" ,rust-percent-encoding-2.1) ("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-prettytable-rs" ,rust-prettytable-rs-0.8) ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quickcheck" ,rust-quickcheck-0.9) ("rust-quickcheck" ,rust-quickcheck-0.9)
@ -107,11 +107,11 @@
("rust-rusqlite" ,rust-rusqlite-0.19) ("rust-rusqlite" ,rust-rusqlite-0.19)
("rust-structopt" ,rust-structopt-0.3) ("rust-structopt" ,rust-structopt-0.3)
("rust-tempfile" ,rust-tempfile-3) ("rust-tempfile" ,rust-tempfile-3)
("rust-thiserror" ,rust-thiserror-1.0) ("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-0.1) ("rust-tokio" ,rust-tokio-0.1)
("rust-tokio-core" ,rust-tokio-core-0.1) ("rust-tokio-core" ,rust-tokio-core-0.1)
("rust-unicode-normalization" ,rust-unicode-normalization-0.1) ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
("rust-url" ,rust-url-2.1) ("rust-url" ,rust-url-2)
("rust-zbase32" ,rust-zbase32-0.1)) ("rust-zbase32" ,rust-zbase32-0.1))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite (("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite

View file

@ -513,13 +513,13 @@ ksh, and tcsh.")
(define-public xonsh (define-public xonsh
(package (package
(name "xonsh") (name "xonsh")
(version "0.9.22") (version "0.9.23")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "xonsh" version)) (uri (pypi-uri "xonsh" version))
(sha256 (sha256
(base32 "1jnj063i2123d8yhqxwyx496b3npfyhszavg36748ysi0py5j8yd")) (base32 "165lx37kibsm56srg9rj7s950b0p7g4g8qhs2iikbcyinp303g35"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin

View file

@ -30,14 +30,14 @@
(define-public skalibs (define-public skalibs
(package (package
(name "skalibs") (name "skalibs")
(version "2.9.2.1") (version "2.9.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://skarnet.org/software/skalibs/skalibs-" (uri (string-append "https://skarnet.org/software/skalibs/skalibs-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5")))) (base32 "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests exist '(#:tests? #f ; no tests exist
@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.")
(define-public execline (define-public execline
(package (package
(name "execline") (name "execline")
(version "2.6.1.0") (version "2.6.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://skarnet.org/software/execline/execline-" (uri (string-append "https://skarnet.org/software/execline/execline-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0mj565xml3hvw27finydms0s9abbbpgbr29vnr8gwi7zjzq7ck52")))) (base32 "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs))) (inputs `(("skalibs" ,skalibs)))
(arguments (arguments
@ -150,14 +150,14 @@ functionality with a very small amount of code.")))
(define-public s6-dns (define-public s6-dns
(package (package
(name "s6-dns") (name "s6-dns")
(version "2.3.2.0") (version "2.3.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-" (uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7")))) (base32 "05l74ciflaahlgjpvy1g0slydwqclxgybxrkpvdddd2yzwc5kira"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs))) (inputs `(("skalibs" ,skalibs)))
(arguments (arguments
@ -179,14 +179,14 @@ as an alternative to the BIND, djbdns or other DNS clients.")))
(define-public s6-networking (define-public s6-networking
(package (package
(name "s6-networking") (name "s6-networking")
(version "2.3.1.2") (version "2.3.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-" (uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr")))) (base32 "04kxj579pm4n5ifc3gfmrqj74vqqfqc82d69avzkn3yrc226mqxv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs) (inputs `(("skalibs" ,skalibs)
("execline" ,execline) ("execline" ,execline)
@ -263,7 +263,7 @@ environment.")))
(define-public s6-portable-utils (define-public s6-portable-utils
(package (package
(name "s6-portable-utils") (name "s6-portable-utils")
(version "2.2.2.4") (version "2.2.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -271,7 +271,7 @@ environment.")))
"https://skarnet.org/software/s6-portable-utils/s6-portable-utils-" "https://skarnet.org/software/s6-portable-utils/s6-portable-utils-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0494saavpqfa4v5kib69p186858yjy87hm5qm804a4xvq51wqbwm")))) (base32 "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs))) (inputs `(("skalibs" ,skalibs)))
(arguments (arguments
@ -340,7 +340,7 @@ all the details.")))
(define-public s6-linux-utils (define-public s6-linux-utils
(package (package
(name "s6-linux-utils") (name "s6-linux-utils")
(version "2.5.1.2") (version "2.5.1.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -348,7 +348,7 @@ all the details.")))
"https://skarnet.org/software/s6-linux-utils/s6-linux-utils-" "https://skarnet.org/software/s6-linux-utils/s6-linux-utils-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86")))) (base32 "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs))) (inputs `(("skalibs" ,skalibs)))
(arguments (arguments

View file

@ -102,7 +102,7 @@ system to use the host GPU to accelerate 3D rendering.")
(define-public spice-protocol (define-public spice-protocol
(package (package
(name "spice-protocol") (name "spice-protocol")
(version "0.14.2") (version "0.14.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -110,7 +110,7 @@ system to use the host GPU to accelerate 3D rendering.")
"spice-protocol-" version ".tar.xz")) "spice-protocol-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sgi9ksb781qs47pdbw0bmnyg8dgayn5xrzj6vzdy043nv466flg")))) "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:phases `(#:phases

View file

@ -594,10 +594,13 @@ basis for almost any application.")
(substitute* "src/testsuite/login-auth-test" (substitute* "src/testsuite/login-auth-test"
(("/bin/cat") "cat")) (("/bin/cat") "cat"))
#t)))) #t))
(patches (search-patches "lsh-fix-x11-forwarding.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("m4" ,m4) `(("autoconf" ,autoconf)
("automake" ,automake)
("m4" ,m4)
("guile" ,guile-2.0) ("guile" ,guile-2.0)
("gperf" ,gperf) ("gperf" ,gperf)
("psmisc" ,psmisc))) ; for `killall' ("psmisc" ,psmisc))) ; for `killall'
@ -615,7 +618,8 @@ basis for almost any application.")
;; The server (lshd) invokes xauth when X11 forwarding is requested. ;; The server (lshd) invokes xauth when X11 forwarding is requested.
;; This adds 24 MiB (or 27%) to the closure of lsh. ;; This adds 24 MiB (or 27%) to the closure of lsh.
("xauth" ,xauth))) ("xauth" ,xauth)
("libxau" ,libxau))) ;also required for x11-forwarding
(arguments (arguments
'(;; Skip the `configure' test that checks whether /dev/ptmx & '(;; Skip the `configure' test that checks whether /dev/ptmx &
;; co. work as expected, because it relies on impurities (for ;; co. work as expected, because it relies on impurities (for
@ -628,14 +632,20 @@ basis for almost any application.")
;; 'lsh_argp.h' checks HAVE_ARGP_PARSE but nothing ;; 'lsh_argp.h' checks HAVE_ARGP_PARSE but nothing
;; defines it. ;; defines it.
"CPPFLAGS=-DHAVE_ARGP_PARSE") "CPPFLAGS=-DHAVE_ARGP_PARSE")
;; FIXME: Tests won't run in a chroot, presumably because
;; /etc/profile is missing, and thus clients get an empty $PATH
;; and nothing works.
#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
;; FIXME: Most tests won't run in a chroot, presumably because
;; /etc/profile is missing, and thus clients get an empty $PATH
;; and nothing works. Run only the subset that passes.
(delete-file "configure") ;force rebootstrap
(substitute* "src/testsuite/Makefile.am"
(("seed-test \\\\") ;prevent trailing slash
"seed-test")
(("^\t(lsh|daemon|tcpip|socks|lshg|lcp|rapid7|lshd).*test.*")
""))
#t))
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((nettle (assoc-ref inputs "nettle")) (let* ((nettle (assoc-ref inputs "nettle"))

View file

@ -702,14 +702,14 @@ analysis.")
(define-public r-survival (define-public r-survival
(package (package
(name "r-survival") (name "r-survival")
(version "3.2-3") (version "3.2-7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "survival" version)) (uri (cran-uri "survival" version))
(sha256 (sha256
(base32 (base32
"07h76r2y23w889257krlijcw4n4d7ssx92x7i5qb1xyv5gyvl3rx")))) "0ila864g5b9yhjhk3jirgdpi06sksc0axa78890dmkvyv9rwsmjk"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-matrix" ,r-matrix))) `(("r-matrix" ,r-matrix)))
@ -1415,13 +1415,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.")
(define-public r-knitr (define-public r-knitr
(package (package
(name "r-knitr") (name "r-knitr")
(version "1.29") (version "1.30")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "knitr" version)) (uri (cran-uri "knitr" version))
(sha256 (sha256
(base32 (base32
"00rcwiq8znmk5h4qgrwd0639xyb38iwbjykqjk3disz3kvrcvbn1")))) "0gn9qwc5762a6j0iywfwhalni52g228dcy4bl4di6d52cqsv3ars"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-evaluate" ,r-evaluate) `(("r-evaluate" ,r-evaluate)
@ -1965,13 +1965,13 @@ inference for statistical models.")
(define-public r-coda (define-public r-coda
(package (package
(name "r-coda") (name "r-coda")
(version "0.19-3") (version "0.19-4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "coda" version)) (uri (cran-uri "coda" version))
(sha256 (sha256
(base32 (base32
"1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk")))) "13z5dwfpnyyhpsbpg4xr9g5c1685jhqj90f4x4qkcykr6kykqba2"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-lattice" ,r-lattice))) `(("r-lattice" ,r-lattice)))
@ -2034,14 +2034,14 @@ files in R. It is built on top of the libxml2 C library.")
(define-public r-multitaper (define-public r-multitaper
(package (package
(name "r-multitaper") (name "r-multitaper")
(version "1.0-14") (version "1.0-15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "multitaper" version)) (uri (cran-uri "multitaper" version))
(sha256 (sha256
(base32 (base32
"04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68")))) "1gm3wr8xqpqiby7q1dr3zxim77v0bvvrqi0hlazf5g3gnkrp2zc3"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("gfortran" ,gfortran))) `(("gfortran" ,gfortran)))
@ -2100,14 +2100,14 @@ limited to R.")
(define-public r-backports (define-public r-backports
(package (package
(name "r-backports") (name "r-backports")
(version "1.1.9") (version "1.1.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "backports" version)) (uri (cran-uri "backports" version))
(sha256 (sha256
(base32 (base32
"1mz3r6ad484xmx0i89gvmak4wzl4cp59gxdzirrci9znw1axrrvx")))) "1pq16bf40zx441ylmqqqilj3xp39r707h56kwqp5yqklq9yln2z1"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/backports") (home-page "https://cran.r-project.org/web/packages/backports")
(synopsis "Reimplementations of functions introduced since R 3.0.0") (synopsis "Reimplementations of functions introduced since R 3.0.0")
@ -2322,14 +2322,14 @@ collation, and NAMESPACE files.")
(define-public r-openssl (define-public r-openssl
(package (package
(name "r-openssl") (name "r-openssl")
(version "1.4.2") (version "1.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "openssl" version)) (uri (cran-uri "openssl" version))
(sha256 (sha256
(base32 (base32
"17fkc6pr8w5z3rpadg692a689p1v4j7xl5ak0y64is7c74cxgljx")))) "0sc2skh1nz7jj65p0pq4a6bl8jza6lyi4zvmvwndzxfgivgh281l"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("libressl" ,libressl))) `(("libressl" ,libressl)))
@ -2426,13 +2426,13 @@ informative error messages when it's not available.")
(define-public r-devtools (define-public r-devtools
(package (package
(name "r-devtools") (name "r-devtools")
(version "2.3.1") (version "2.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "devtools" version)) (uri (cran-uri "devtools" version))
(sha256 (sha256
(base32 (base32
"100mgighf6vqsfwv2qw5rlnd5sfvcji9l9jrmx9ii28r9fd2gyas")))) "0vcqs4c5dfjs2ddkclv3z7zzix2zrnrxvzax8hjvjszgp8362275"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-callr" ,r-callr) `(("r-callr" ,r-callr)
@ -2467,13 +2467,13 @@ tools to simplify the devolpment of R packages.")
(define-public r-withr (define-public r-withr
(package (package
(name "r-withr") (name "r-withr")
(version "2.2.0") (version "2.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "withr" version)) (uri (cran-uri "withr" version))
(sha256 (sha256
(base32 (base32
"10mmfffjbnb2zq5x0kqhhb4z6va4micc6pjzvlfji34gyhffa8ac")))) "1837vjp35npjrnis1im5xrwj1swpgnms00gkjiz7296l8yckrh1c"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr))) `(("r-knitr" ,r-knitr)))
@ -2511,22 +2511,27 @@ time-of-day values, based on the @code{difftime} class.")
(define-public r-readr (define-public r-readr
(package (package
(name "r-readr") (name "r-readr")
(version "1.3.1") (version "1.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "readr" version)) (uri (cran-uri "readr" version))
(sha256 (sha256
(base32 (base32
"1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k")))) "1fa67h4l9d30ig460xizgzl115i9pm3bk9dvsbrw6awbmf51ic82"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-clipr" ,r-clipr) `(("r-cli" ,r-cli)
("r-clipr" ,r-clipr)
("r-cpp11" ,r-cpp11)
("r-crayon" ,r-crayon) ("r-crayon" ,r-crayon)
("r-rcpp" ,r-rcpp)
("r-hms" ,r-hms) ("r-hms" ,r-hms)
("r-lifecycle" ,r-lifecycle)
("r-tibble" ,r-tibble) ("r-tibble" ,r-tibble)
("r-r6" ,r-r6) ("r-r6" ,r-r6)
("r-rlang" ,r-rlang)
("r-bh" ,r-bh))) ("r-bh" ,r-bh)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/hadley/readr") (home-page "https://github.com/hadley/readr")
(synopsis "Read tabular data") (synopsis "Read tabular data")
(description (description
@ -2690,18 +2695,17 @@ certain criterion, e.g., it contains a certain regular file.")
(define-public r-rmarkdown (define-public r-rmarkdown
(package (package
(name "r-rmarkdown") (name "r-rmarkdown")
(version "2.3") (version "2.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rmarkdown" version)) (uri (cran-uri "rmarkdown" version))
(sha256 (sha256
(base32 "0vdjq4kcyxkr2m27588kk6yi5g53symjshj4jz4n0j18wz53shji")))) (base32 "1y2156w1abik8df8vl376ilv8s1jg8i0x2w4n4dwrnm3xxgp5kf0"))))
(properties `((upstream-name . "rmarkdown"))) (properties `((upstream-name . "rmarkdown")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-base64enc" ,r-base64enc) `(("r-evaluate" ,r-evaluate)
("r-evaluate" ,r-evaluate)
("r-htmltools" ,r-htmltools) ("r-htmltools" ,r-htmltools)
("r-jsonlite" ,r-jsonlite) ("r-jsonlite" ,r-jsonlite)
("r-knitr" ,r-knitr) ("r-knitr" ,r-knitr)
@ -2806,13 +2810,13 @@ a column in data frame.")
(define-public r-rsqlite (define-public r-rsqlite
(package (package
(name "r-rsqlite") (name "r-rsqlite")
(version "2.2.0") (version "2.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "RSQLite" version)) (uri (cran-uri "RSQLite" version))
(sha256 (sha256
(base32 (base32
"1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380")))) "0lynli9144dzb9vhxssba20v7z5h2nirawpvvy8ykv4n3ir7qlsl"))))
(properties `((upstream-name . "RSQLite"))) (properties `((upstream-name . "RSQLite")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -2824,6 +2828,8 @@ a column in data frame.")
("r-bit64" ,r-bit64) ("r-bit64" ,r-bit64)
("r-blob" ,r-blob) ("r-blob" ,r-blob)
("r-pkgconfig" ,r-pkgconfig))) ("r-pkgconfig" ,r-pkgconfig)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/rstats-db/RSQLite") (home-page "https://github.com/rstats-db/RSQLite")
(synopsis "SQLite interface for R") (synopsis "SQLite interface for R")
(description (description
@ -3604,13 +3610,13 @@ t-probabilities, quantiles, random deviates and densities.")
(define-public r-matrixstats (define-public r-matrixstats
(package (package
(name "r-matrixstats") (name "r-matrixstats")
(version "0.56.0") (version "0.57.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "matrixStats" version)) (uri (cran-uri "matrixStats" version))
(sha256 (sha256
(base32 (base32
"09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr")))) "0hzkx7yi9ira476izsgw7r2bhv72ra4z2m9zr1i1f4ivrn3ihs7r"))))
(properties `((upstream-name . "matrixStats"))) (properties `((upstream-name . "matrixStats")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
@ -4196,18 +4202,17 @@ including:
(define-public r-gplots (define-public r-gplots
(package (package
(name "r-gplots") (name "r-gplots")
(version "3.0.4") (version "3.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gplots" version)) (uri (cran-uri "gplots" version))
(sha256 (sha256
(base32 (base32
"15ip3v4xiqzbanf8bc5fj90cbwdgixr72aj5jrp34jfdzdx0gxwg")))) "05rislwgaw6v5dmhcwyvc04hi1fgaxrpb61f66kx483px45w6f24"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-catools" ,r-catools) `(("r-catools" ,r-catools)
("r-gdata" ,r-gdata)
("r-gtools" ,r-gtools) ("r-gtools" ,r-gtools)
("r-kernsmooth" ,r-kernsmooth))) ("r-kernsmooth" ,r-kernsmooth)))
(native-inputs (native-inputs
@ -4906,14 +4911,14 @@ of the points.")
(define-public r-fpc (define-public r-fpc
(package (package
(name "r-fpc") (name "r-fpc")
(version "2.2-7") (version "2.2-8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "fpc" version)) (uri (cran-uri "fpc" version))
(sha256 (sha256
(base32 (base32
"1xnp3j36hggfg675v39mnr6rgvp7i11pfng7nmyy3k2ldgklz0j9")))) "07a125pji1flmybn6iidcnizwnqyl6chnrckxa5jp4qxxfdqx658"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-class" ,r-class) `(("r-class" ,r-class)
@ -5075,13 +5080,13 @@ using modular prediction and response module classes.")
(define-public r-quantreg (define-public r-quantreg
(package (package
(name "r-quantreg") (name "r-quantreg")
(version "5.67") (version "5.73")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "quantreg" version)) (uri (cran-uri "quantreg" version))
(sha256 (sha256
(base32 "09hgch8x6x2k7wm17c0njp7l0r6rrrlcji60afrv19dm9r4596wr")))) (base32 "0mjwwj3c7cfnprlh90ld0f1lll0mrqbx8mpnbfr7bvzg8h6072y4"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("gfortran" ,gfortran))) `(("gfortran" ,gfortran)))
@ -5209,13 +5214,13 @@ Companion to Applied Regression, Third Edition, Sage.")
(define-public r-car (define-public r-car
(package (package
(name "r-car") (name "r-car")
(version "3.0-9") (version "3.0-10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "car" version)) (uri (cran-uri "car" version))
(sha256 (sha256
(base32 "1clh8c7mj87i4hz27l16w76dpw7k4mlnjbgm9mbrhrfkv0lpb63c")))) (base32 "1w95b7xm0bna3qm637pwyv4s7294ffz9dl153naprd79zv91dqqw"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-abind" ,r-abind) `(("r-abind" ,r-abind)
@ -5362,14 +5367,14 @@ multivariate case.")
(define-public r-tclust (define-public r-tclust
(package (package
(name "r-tclust") (name "r-tclust")
(version "1.4-1") (version "1.4-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "tclust" version)) (uri (cran-uri "tclust" version))
(sha256 (sha256
(base32 (base32
"17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb")))) "1nb5iky4kc832627jf28lzj19wrvgwg5da6fyl3kyf0npmyx1p4m"))))
(build-system r-build-system) (build-system r-build-system)
;; These are all suggested packages, not build dependencies. ;; These are all suggested packages, not build dependencies.
(propagated-inputs (propagated-inputs

View file

@ -53,7 +53,7 @@
(define-public newsboat (define-public newsboat
(package (package
(name "newsboat") (name "newsboat")
(version "2.20.1") (version "2.21")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -61,13 +61,7 @@
"/newsboat-" version ".tar.xz")) "/newsboat-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0rimjikni96m52vhymgsg1b9g99af6ggyzd1lpvhgqsznxwj0y42")) "0ccwbb3maini18453wjqn8m3bd7zzm6dn5a9vpb8smxv8vfv6ihc"))))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "rust/libnewsboat/Cargo.toml"
(("= 1.0.17") "1.0.17"))
#t))))
(build-system cargo-build-system) (build-system cargo-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -77,7 +71,7 @@
("asciidoctor" ,ruby-asciidoctor))) ("asciidoctor" ,ruby-asciidoctor)))
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
("json-c" ,json-c-0.13) ("json-c" ,json-c)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("stfl" ,stfl) ("stfl" ,stfl)
@ -93,18 +87,15 @@
("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2) ("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4)
("rust-dirs" ,rust-dirs-2.0) ("rust-gettext-rs" ,rust-gettext-rs-0.5)
("rust-gettext-rs" ,rust-gettext-rs-0.4)
("rust-gettext-sys" ,rust-gettext-sys-0.19) ("rust-gettext-sys" ,rust-gettext-sys-0.19)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-libz-sys" ,rust-libz-sys-1)
("rust-natord" ,rust-natord-1.0) ("rust-natord" ,rust-natord-1.0)
("rust-nom" ,rust-nom-5) ("rust-nom" ,rust-nom-5)
("rust-once-cell" ,rust-once-cell-1) ("rust-once-cell" ,rust-once-cell-1)
("rust-percent-encoding" ,rust-percent-encoding-2.1) ("rust-rand" ,rust-rand-0.7)
("rust-rand" ,rust-rand-0.6) ("rust-url" ,rust-url-2)
("rust-smallvec" ,rust-smallvec-0.6)
("rust-url" ,rust-url-2.1)
("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-xdg" ,rust-xdg-2.2)) ("rust-xdg" ,rust-xdg-2.2))
#:cargo-development-inputs #:cargo-development-inputs
@ -119,6 +110,11 @@
(delete-file-recursively (delete-file-recursively
(string-append vendor-dir "/" ,name "-" ,version ".tar.xz")) (string-append vendor-dir "/" ,name "-" ,version ".tar.xz"))
#t)) #t))
(add-after 'unpack 'patch-source
(lambda _
(substitute* "Makefile"
(("Cargo.lock") ""))
#t))
(replace 'build (replace 'build
(lambda* args (lambda* args
((assoc-ref gnu:%standard-phases 'build) ((assoc-ref gnu:%standard-phases 'build)

View file

@ -221,24 +221,29 @@ text-based approach to terminal recording.")
(package (package
(name "libtsm") (name "libtsm")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
(source (origin (source
(method git-fetch) (origin
;; The freedesktop repository is no longer maintained. (method git-fetch)
(uri (git-reference ;; The freedesktop repository is no longer maintained.
(url (string-append "https://github.com/Aetf/" name)) (uri (git-reference
(commit commit))) (url (string-append "https://github.com/Aetf/" name))
(file-name (git-file-name name version)) (commit commit)))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx")))) (base32 "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove a bundled copy of libxkbcommon's xkbcommon-keysyms.h.
(delete-file-recursively "external/xkbcommon")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_TESTING=ON"))) `(#:configure-flags '("-DBUILD_TESTING=ON")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("check" ,check)
(inputs ("libxkbcommon" ,libxkbcommon) ; for xkbcommon-keysyms.h
`(("libxkbcommon" ,libxkbcommon) ("pkg-config" ,pkg-config)))
("check" ,check)))
(synopsis "Xterm state machine library") (synopsis "Xterm state machine library")
(description "TSM is a state machine for DEC VT100-VT520 compatible (description "TSM is a state machine for DEC VT100-VT520 compatible
terminal emulators. It tries to support all common standards while keeping terminal emulators. It tries to support all common standards while keeping
@ -1178,7 +1183,7 @@ made by suckless.")
("rust-mio" ,rust-mio-0.6) ("rust-mio" ,rust-mio-0.6)
("rust-mio-extras" ,rust-mio-extras-2) ("rust-mio-extras" ,rust-mio-extras-2)
("rust-terminfo" ,rust-terminfo-0.6) ("rust-terminfo" ,rust-terminfo-0.6)
("rust-url" ,rust-url-2.1) ("rust-url" ,rust-url-2)
("rust-vte" ,rust-vte-0.3) ("rust-vte" ,rust-vte-0.3)
("rust-nix" ,rust-nix-0.15) ("rust-nix" ,rust-nix-0.15)
("rust-miow" ,rust-miow-0.3) ("rust-miow" ,rust-miow-0.3)

View file

@ -7489,3 +7489,49 @@ Packages @code{bicaption}, @code{ltcaption}, @code{newfloat},
(description "This package provides a drop-in replacement for the (description "This package provides a drop-in replacement for the
Symbol font from Adobe's basic set.") Symbol font from Adobe's basic set.")
(license license:gpl2))) (license license:gpl2)))
(define-public texlive-mathpazo
(package
(inherit (simple-texlive-package
"texlive-mathpazo"
(list "/doc/latex/mathpazo/"
"/fonts/afm/public/mathpazo/"
"/fonts/tfm/public/mathpazo/"
"/fonts/type1/public/mathpazo/"
"/fonts/vf/public/mathpazo/")
(base32
"02in6hdnbnkz216mpy8g6fk3wmlls8nh5982vmg37vhbj77lk0rh")
#:trivial? #t))
(home-page "http://www.ctan.org/pkg/mathpazo")
(synopsis "Fonts to typeset mathematics to match Palatino")
(description "The Pazo Math fonts are a family of PostScript fonts
suitable for typesetting mathematics in combination with the Palatino
family of text fonts. The Pazo Math family is made up of five fonts
provided in Adobe Type 1 format. These contain glyphs that are
usually not available in Palatino and for which Computer Modern looks
odd when combined with Palatino. These glyphs include the uppercase
Greek alphabet in upright and slanted shapes, the lowercase Greek
alphabet in slanted shape, several mathematical glyphs and the
uppercase letters commonly used to represent various number sets.
LaTeX macro support is provided in package @code{psnfss}.")
(license license:gpl3+)))
(define-public texlive-fpl
(package
(inherit (simple-texlive-package
"texlive-fpl"
(list "/doc/fonts/fpl/"
"/source/fonts/fpl/"
"/fonts/afm/public/fpl/"
"/fonts/type1/public/fpl/")
(base32
"02gkl516z9kn8xqs269pdkqn37sxm8ib0pcs43s4rs2rhyyl5z68")
#:trivial? #t))
(home-page "https://www.ctan.org/pkg/fpl")
(synopsis "SC and OsF fonts for URW Palladio L")
(description "The FPL Fonts provide a set of SC/OsF fonts for URW
Palladio L which are compatible with the Palatino SC/OsF fonts from
Adobe. LaTeX use is enabled by the mathpazo package, which is part of
the @code{psnfss} distribution.")
;; Either LPPL version 1.0 or later, or GPL version 2
(license (list license:lppl1.0+ license:gpl2))))

View file

@ -67,18 +67,19 @@
(define-public dos2unix (define-public dos2unix
(package (package
(name "dos2unix") (name "dos2unix")
(version "7.4.1") (version "7.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://waterlan.home.xs4all.nl/dos2unix/" (uri (string-append "https://waterlan.home.xs4all.nl/dos2unix/"
"dos2unix-" version ".tar.gz")) "dos2unix-" version ".tar.gz"))
(sha256 (sha256
(base32 "08w6yywzirsxq8bh87jycvvw922ybhc2l426j2iqzliyn1h8mm8w")))) (base32 "00dfsf4rfyjb5j12gan8xjiirm0asshdz6dmd3l34a7ays6wadb0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list "CC=gcc" `(#:make-flags
(string-append "prefix=" (assoc-ref %outputs "out"))) (list (string-append "CC=" ,(cc-for-target))
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016, 2017, 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 208 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

View file

@ -526,7 +526,7 @@ applications by providing high-level classes for commonly required tasks.")
(define-public libde265 (define-public libde265
(package (package
(name "libde265") (name "libde265")
(version "1.0.6") (version "1.0.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -536,7 +536,7 @@ applications by providing high-level classes for commonly required tasks.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0ipccyavlgf7hfzx1g8bvzg62xq10vcxvwgq70r3z3j6mdvmrzjp")))) (base32 "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1455,6 +1455,8 @@ operate properly.")
("sdl" ,sdl2) ("sdl" ,sdl2)
("soxr" ,soxr) ("soxr" ,soxr)
("speex" ,speex) ("speex" ,speex)
;; FFmpeg is not yet compatible with SRT > 1.4.1.
("srt" ,srt-1.4.1)
("twolame" ,twolame) ("twolame" ,twolame)
("vidstab" ,vidstab) ("vidstab" ,vidstab)
("x265" ,x265) ("x265" ,x265)
@ -1539,6 +1541,7 @@ operate properly.")
'()) '())
"--enable-libsoxr" "--enable-libsoxr"
"--enable-libspeex" "--enable-libspeex"
"--enable-libsrt"
"--enable-libtheora" "--enable-libtheora"
"--enable-libtwolame" "--enable-libtwolame"
"--enable-libvidstab" "--enable-libvidstab"
@ -1830,6 +1833,8 @@ videoformats depend on the configuration flags of ffmpeg.")
("sdl-image" ,sdl-image) ("sdl-image" ,sdl-image)
("speex" ,speex) ("speex" ,speex)
("speexdsp" ,speexdsp) ("speexdsp" ,speexdsp)
;; VLC is not yet compatible with SRT > 1.4.1.
("srt" ,srt-1.4.1)
("taglib" ,taglib) ("taglib" ,taglib)
("twolame" ,twolame) ("twolame" ,twolame)
("unzip" ,unzip) ("unzip" ,unzip)
@ -2129,9 +2134,8 @@ To load this plugin, specify the following option when starting mpv:
(define-public libvpx (define-public libvpx
(package (package
(name "libvpx") (name "libvpx")
(version "1.8.2") (version "1.9.0")
(source (origin (source (origin
;; XXX: Upstream does not provide tarballs for > 1.6.1.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://chromium.googlesource.com/webm/libvpx") (url "https://chromium.googlesource.com/webm/libvpx")
@ -2139,7 +2143,7 @@ To load this plugin, specify the following option when starting mpv:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr")) "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry"))
(patches (search-patches "libvpx-CVE-2016-2818.patch")))) (patches (search-patches "libvpx-CVE-2016-2818.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -2157,7 +2161,11 @@ To load this plugin, specify the following option when starting mpv:
;; The configure script does not understand some of the GNU ;; The configure script does not understand some of the GNU
;; options, so we only add the flags specified above. ;; options, so we only add the flags specified above.
(apply invoke "./configure" configure-flags)))) (apply invoke "./configure" configure-flags))))
#:tests? #f)) ; no check target
;; XXX: The test suite wants to download 871 files from a cloud storage
;; service (see test/test-data.sha1). It is possible to specify a
;; custom directory, but there seems to be no tarball with all files.
#:tests? #f))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("yasm" ,yasm))) ("yasm" ,yasm)))
@ -2368,7 +2376,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(define-public youtube-viewer (define-public youtube-viewer
(package (package
(name "youtube-viewer") (name "youtube-viewer")
(version "3.7.8") (version "3.7.9")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2377,7 +2385,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ckzzf35nbwlx5prvzjr52n28chyd479vhdk5w7vb2343az80mzi")))) "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-module-build" ,perl-module-build))) `(("perl-module-build" ,perl-module-build)))
@ -2390,6 +2398,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
("perl-libwww" ,perl-libwww) ("perl-libwww" ,perl-libwww)
("perl-lwp-protocol-https" ,perl-lwp-protocol-https) ("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
("perl-lwp-useragent-cached" ,perl-lwp-useragent-cached) ("perl-lwp-useragent-cached" ,perl-lwp-useragent-cached)
("perl-memoize" ,perl-memoize)
("perl-mozilla-ca" ,perl-mozilla-ca) ("perl-mozilla-ca" ,perl-mozilla-ca)
("perl-term-readline-gnu" ,perl-term-readline-gnu) ("perl-term-readline-gnu" ,perl-term-readline-gnu)
("perl-unicode-linebreak" ,perl-unicode-linebreak) ("perl-unicode-linebreak" ,perl-unicode-linebreak)
@ -2996,7 +3005,7 @@ be used for realtime video capture via Linux-specific APIs.")
(define-public obs (define-public obs
(package (package
(name "obs") (name "obs")
(version "26.0.0") (version "26.0.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3005,12 +3014,21 @@ be used for realtime video capture via Linux-specific APIs.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09y57b3c88szl3wyx3cxq8jrm3pfnyg2n25hxl1ynkq3rgaavdq2")))) "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "-DOBS_VERSION_OVERRIDE=" ,version) (list (string-append "-DOBS_VERSION_OVERRIDE=" ,version)
"-DENABLE_UNIT_TESTS=TRUE"))) "-DENABLE_UNIT_TESTS=TRUE")
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-executable
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(plugin-path (getenv "QT_PLUGIN_PATH")))
(wrap-program (string-append out "/bin/obs")
`("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))
#t)))))
(native-inputs (native-inputs
`(("cmocka" ,cmocka) `(("cmocka" ,cmocka)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -3601,7 +3619,7 @@ practically any type of media.")
(define-public libmediainfo (define-public libmediainfo
(package (package
(name "libmediainfo") (name "libmediainfo")
(version "20.08") (version "20.09")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://mediaarea.net/download/source/" (uri (string-append "https://mediaarea.net/download/source/"
@ -3609,7 +3627,7 @@ practically any type of media.")
name "_" version ".tar.xz")) name "_" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"19n8h9jq42b6r3dbag77fzwfksfywszmzpi636w87fvc1nqldlqj")))) "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"))))
;; TODO add a Big Buck Bunny webm for tests. ;; TODO add a Big Buck Bunny webm for tests.
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -3659,7 +3677,7 @@ MPEG-2, MPEG-4, DVD (VOB)...
(define-public mediainfo (define-public mediainfo
(package (package
(name "mediainfo") (name "mediainfo")
(version "20.08") (version "20.09")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Warning: This source has proved unreliable 1 time at least. ;; Warning: This source has proved unreliable 1 time at least.
@ -3670,7 +3688,7 @@ MPEG-2, MPEG-4, DVD (VOB)...
name "_" version ".tar.xz")) name "_" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l")))) "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -4540,7 +4558,7 @@ result in several formats:
("rust-arrayvec" ,rust-arrayvec-0.5) ("rust-arrayvec" ,rust-arrayvec-0.5)
("rust-backtrace" ,rust-backtrace-0.3) ("rust-backtrace" ,rust-backtrace-0.3)
("rust-bitstream-io" ,rust-bitstream-io-0.8) ("rust-bitstream-io" ,rust-bitstream-io-0.8)
("rust-byteorder" ,rust-byteorder-1.3) ("rust-byteorder" ,rust-byteorder-1)
("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-clap" ,rust-clap-2) ("rust-clap" ,rust-clap-2)
("rust-console" ,rust-console-0.11) ("rust-console" ,rust-console-0.11)
@ -4564,7 +4582,7 @@ result in several formats:
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-signal-hook" ,rust-signal-hook-0.1) ("rust-signal-hook" ,rust-signal-hook-0.1)
("rust-simd-helpers" ,rust-simd-helpers-0.1) ("rust-simd-helpers" ,rust-simd-helpers-0.1)
("rust-thiserror" ,rust-thiserror-1.0) ("rust-thiserror" ,rust-thiserror-1)
("rust-toml" ,rust-toml-0.5) ("rust-toml" ,rust-toml-0.5)
("rust-y4m" ,rust-y4m-0.5) ("rust-y4m" ,rust-y4m-0.5)
("rust-cc" ,rust-cc-1) ("rust-cc" ,rust-cc-1)

View file

@ -70,7 +70,7 @@
(define-public vim (define-public vim
(package (package
(name "vim") (name "vim")
(version "8.2.1770") (version "8.2.1840")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -79,7 +79,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14mbrbnjwb8r4pl06vafd56x0pmbcgqvr57s2ns2arh7xcy9bri7")))) "0ly2kv1x3jqi363wjk694s8bi9q0xvw7yizf8pzanan8h2wy1r28"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"

View file

@ -1,5 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -18,15 +20,20 @@
(define-module (gnu packages vlang) (define-module (gnu packages vlang)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages node)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages xorg)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)) #:use-module (guix packages))
(define-public vlang (define-public vlang
(package (package
(name "vlang") (name "vlang")
(version "0.1.27") (version "0.1.29")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -35,20 +42,18 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1d9qhacllvkqif42jaayixhjyhx7pzslh8p1yr5p19447q763fq1")))) (base32 "1rqi7cah5nq8aggrib9xvdpfjxq20li91svv0w9yny6nn1ag7snx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; tests are broken in v 0.1.27 `(#:make-flags
#:make-flags (list (string-append "CC=" ,(cc-for-target))
`("CC=gcc" "TMPTCC=tcc"
"GITCLEANPULL=true" (string-append "VC=" (assoc-ref %build-inputs "vc"))
"GITFASTCLONE=mkdir -p" "GITCLEANPULL=true"
"TCCREPO=" "GITFASTCLONE=mkdir -p"
"TMPTCC=tcc" "TCCREPO="
,(string-append "TMPVC=" (assoc-ref %build-inputs "vc")) "VCREPO="
"VCREPO=" "VERBOSE=1")
"VERBOSE=1"
"V_ALWAYS_CLEAN_TMP=false")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -56,22 +61,32 @@
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("rm -rf") "true") (("rm -rf") "true")
(("v self") "v -cc gcc cmd/v")) (("v self") (string-append "v -cc " ,(cc-for-target) " cmd/v")))
#t)) #t))
;; A few tests are broken in v 0.1.27. This function should be (add-before 'check 'delete-failing-tests
;; enabled to run tests in the next release. ;; XXX As always, these should eventually be fixed and run.
;; (replace 'check
;; (lambda _
;; (let* ((tmpbin "tmp/bin")
;; (gcc (which "gcc")))
;; (mkdir-p tmpbin)
;; (symlink gcc (string-append tmpbin "/cc"))
;; (setenv "PATH" (string-append tmpbin ":" (getenv "PATH")))
;; (invoke "./v" "test-fixed"))
;; #t))
(replace 'install
(lambda _ (lambda _
(let* ((bin (string-append (assoc-ref %outputs "out") "/bin")) (for-each delete-file
'("vlib/v/gen/x64/tests/x64_test.v"
"vlib/v/tests/repl/repl_test.v"
"vlib/v/tests/valgrind/valgrind_test.v"
"vlib/v/tests/valgrind/strings_and_arrays.vv"
"vlib/v/tests/live_test.v"
"vlib/net/websocket/ws_test.v"))
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(let* ((bin "tmp/bin")
(gcc (which "gcc")))
(when tests?
(mkdir-p bin)
(symlink gcc (string-append bin "/cc"))
(setenv "PATH" (string-append bin ":" (getenv "PATH")))
(invoke "./v" "test-fixed")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
(tools (string-append bin "/cmd/tools")) (tools (string-append bin "/cmd/tools"))
(thirdparty (string-append bin "/thirdparty")) (thirdparty (string-append bin "/thirdparty"))
(vlib (string-append bin "/vlib")) (vlib (string-append bin "/vlib"))
@ -90,7 +105,9 @@
`(("glib" ,glib))) `(("glib" ,glib)))
(native-inputs (native-inputs
`(("vc" `(("vc"
,(let ((vc-version "0884d7092f4c2a4f8ca16da6f1792efa235247be")) ;; Versions are not consistently tagged, but the matching commit will
;; probably have v0.x.y in the commit message.
,(let ((vc-version "b01d0fcda4b55861baa4be82e307cca4834b1641"))
;; v bootstraps from generated c source code from a dedicated ;; v bootstraps from generated c source code from a dedicated
;; repository. It's readable, as generated source goes, and not at all ;; repository. It's readable, as generated source goes, and not at all
;; obfuscated, and it's about 15kb. The original source written in ;; obfuscated, and it's about 15kb. The original source written in
@ -104,7 +121,13 @@
(commit vc-version))) (commit vc-version)))
(file-name (git-file-name "vc" vc-version)) (file-name (git-file-name "vc" vc-version))
(sha256 (sha256
(base32 "17bs09iwxfd0si70j48n9nd16gfgcj8imd0azypk3xzzbz4wybnz"))))))) (base32 "052gp5q2k31r3lci3rx4k0vy0vjdjva64xvrbbihn8lgmw63lc9f")))))
;; For the tests.
("libx11" ,libx11)
("node" ,node)
("openssl" ,openssl)
("sqlite" ,sqlite)))
(home-page "https://vlang.io/") (home-page "https://vlang.io/")
(synopsis "Compiler for the V programming language") (synopsis "Compiler for the V programming language")
(description (description

View file

@ -45,6 +45,7 @@
;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -67,39 +68,39 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix cvs-download) #:use-module (guix cvs-download)
#:use-module (guix hg-download) #:use-module (guix hg-download)
#:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system perl)
#:use-module (guix build-system cmake)
#:use-module (guix build-system trivial)
#:use-module (guix build-system python)
#:use-module (guix build-system ant) #:use-module (guix build-system ant)
#:use-module (guix build-system scons) #:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system scons)
#:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages adns) #:use-module (gnu packages adns)
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages bison) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -113,11 +114,12 @@
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz) #:use-module (gnu packages guile-xyz)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages image)
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages kde) #:use-module (gnu packages kde)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
#:use-module (gnu packages libunistring) #:use-module (gnu packages libunistring)
@ -132,19 +134,18 @@
#:use-module (gnu packages nss) #:use-module (gnu packages nss)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages openstack) #:use-module (gnu packages openstack)
#:use-module (gnu packages base)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages re2c) #:use-module (gnu packages re2c)
#:use-module (gnu packages readline)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
@ -254,31 +255,32 @@ Interface} specification.")
#t)) #t))
(replace 'configure (replace 'configure
;; The configure script is hand-written, not from GNU autotools. ;; The configure script is hand-written, not from GNU autotools.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key configure-flags outputs #:allow-other-keys)
(let ((flags (let ((flags
(list (string-append "--prefix=" (assoc-ref outputs "out")) (append (list (string-append "--prefix=" (assoc-ref outputs "out"))
"--with-http_ssl_module" "--with-http_ssl_module"
"--with-http_v2_module" "--with-http_v2_module"
"--with-pcre-jit" "--with-pcre-jit"
"--with-debug" "--with-debug"
;; Even when not cross-building, we pass the ;; Even when not cross-building, we pass the
;; --crossbuild option to avoid customizing for the ;; --crossbuild option to avoid customizing for the
;; kernel version on the build machine. ;; kernel version on the build machine.
,(let ((system "Linux") ; uname -s ,(let ((system "Linux") ; uname -s
(release "3.2.0") ; uname -r (release "3.2.0") ; uname -r
;; uname -m ;; uname -m
(machine (match (or (%current-target-system) (machine (match (or (%current-target-system)
(%current-system)) (%current-system))
("x86_64-linux" "x86_64") ("x86_64-linux" "x86_64")
("i686-linux" "i686") ("i686-linux" "i686")
("mips64el-linux" "mips64") ("mips64el-linux" "mips64")
;; Prevent errors when querying ;; Prevent errors when querying
;; this package on unsupported ;; this package on unsupported
;; platforms, e.g. when running ;; platforms, e.g. when running
;; "guix package --search=" ;; "guix package --search="
(_ "UNSUPPORTED")))) (_ "UNSUPPORTED"))))
(string-append "--crossbuild=" (string-append "--crossbuild="
system ":" release ":" machine))))) system ":" release ":" machine)))
configure-flags)))
(setenv "CC" "gcc") (setenv "CC" "gcc")
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
(apply invoke "./configure" flags) (apply invoke "./configure" flags)
@ -1345,6 +1347,50 @@ used to validate and fix HTML data.")
(home-page "http://tidy.sourceforge.net/") (home-page "http://tidy.sourceforge.net/")
(license (license:x11-style "file:///include/tidy.h")))) (license (license:x11-style "file:///include/tidy.h"))))
(define-public esbuild
(package
(name "esbuild")
(version "0.7.14")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/evanw/esbuild")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1y5hqymv2r8r29f8vh8kgncj3wlkg4fzi0zlc7mgyss872ajkc7i"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove prebuilt binaries
(delete-file-recursively "npm")
#t))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/evanw/esbuild/cmd/esbuild"
#:unpack-path "github.com/evanw/esbuild"
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? unpack-path #:allow-other-keys)
(if tests?
(with-directory-excursion (string-append "src/" unpack-path)
(invoke "make" "test-go")))
#t)))))
(inputs
`(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(native-inputs
`(("go-github-com-kylelemons-godebug" ,go-github-com-kylelemons-godebug)))
(home-page "https://github.com/evanw/esbuild")
(synopsis "Bundler and minifier tool for JavaScript and TypeScript")
(description
"The esbuild tool provides a unified bundler, transpiler and
minifier. It packages up JavaScript and TypeScript code, along with JSON
and other data, for distribution on the web.")
(license license:expat)))
(define-public tinyproxy (define-public tinyproxy
(package (package
(name "tinyproxy") (name "tinyproxy")
@ -2632,15 +2678,14 @@ development server with Starman.")
(define-public perl-cgi (define-public perl-cgi
(package (package
(name "perl-cgi") (name "perl-cgi")
(version "4.47") (version "4.51")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/L/LE/LEEJO/" (uri (string-append "mirror://cpan/authors/id/L/LE/LEEJO/"
"CGI-" version ".tar.gz")) "CGI-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "02k0p8zwbn0fz9r39rg8jvbmky8fwdg6kznklzk557rg07kiblhb"))))
"1a9cylhqsm5icvbg09m21nj0xx4zy5gbk4p74npm1ch3qlryzyyr"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-test-deep" ,perl-test-deep) `(("perl-test-deep" ,perl-test-deep)
@ -2858,15 +2903,15 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom.")
(define-public perl-file-listing (define-public perl-file-listing
(package (package
(name "perl-file-listing") (name "perl-file-listing")
(version "6.04") (version "6.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://cpan/authors/id/G/GA/GAAS/File-Listing-" "mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y")))) "0vmzw1mhv580flzkla80gvwfpficnhlbqr1dnlf9x50bw7n18k62"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
`(("perl-http-date" ,perl-http-date))) `(("perl-http-date" ,perl-http-date)))
@ -5606,14 +5651,14 @@ tools like SSH (Secure Shell) to reach the outside world.")
(define-public stunnel (define-public stunnel
(package (package
(name "stunnel") (name "stunnel")
(version "5.56") (version "5.57")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.stunnel.org/downloads/stunnel-" (uri (string-append "https://www.stunnel.org/downloads/stunnel-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k")))) (base32 "1q8gc05fiz7w55ws0whwzb94ffjnhzfppf1mhz1hf671vmrvjnmg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
;; For tests. ;; For tests.
@ -7425,6 +7470,37 @@ update an existing mirrored site, and resume interrupted downloads.
HTTrack is fully configurable, and has an integrated help system.") HTTrack is fully configurable, and has an integrated help system.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public buku
(package
(name "buku")
(version "4.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "buku" version))
(file-name (git-file-name name version))
(sha256
(base32
"1g1xhdskfn72xaraqzz2v8dl2iza7bzfpn17z2wdrzkq3ih7yvgg"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;FIXME: many tests need network access
(inputs
`(("python-beautifulsoup4" ,python-beautifulsoup4)
("python-certifi" ,python-certifi)
("python-cryptography" ,python-cryptography)
("python-html5lib" ,python-html5lib)
("python-urllib3" ,python-urllib3)))
(home-page "https://github.com/jarun/buku")
(synopsis "Bookmark manager")
(description
"buku is a powerful bookmark manager written in Python3 and SQLite3.
@command{buku} can auto-import bookmarks from your browser and present them
in an interactive command-line interface that lets you compose and update
bookmarks directly. It can also present them in a web interface with
@command{bukuserver}.")
(license license:gpl3+)))
(define-public anonip (define-public anonip
(package (package
(name "anonip") (name "anonip")

View file

@ -1597,7 +1597,11 @@ compositors that support the layer-shell protocol.")
(base32 "1ha8803ll7472kqxsy2xz0v5d4sv8apmc9z631d67m31q0z1m9rz")))) (base32 "1ha8803ll7472kqxsy2xz0v5d4sv8apmc9z631d67m31q0z1m9rz"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs `(("fiasco" ,sbcl-fiasco) (native-inputs `(("fiasco" ,sbcl-fiasco)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)
;; To build the manual.
("autoconf" ,autoconf)
("automake" ,automake)))
(inputs `(("cl-ppcre" ,sbcl-cl-ppcre) (inputs `(("cl-ppcre" ,sbcl-cl-ppcre)
("clx" ,sbcl-clx) ("clx" ,sbcl-clx)
("alexandria" ,sbcl-alexandria))) ("alexandria" ,sbcl-alexandria)))
@ -1631,13 +1635,12 @@ compositors that support the layer-shell protocol.")
out))) out)))
#t))) #t)))
(add-after 'install 'install-manual (add-after 'install 'install-manual
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key (make-flags '()) outputs #:allow-other-keys)
;; The proper way to the manual is bootstrapping a full autotools
;; build system and running ./configure && make stumpwm.info to
;; do some macro substitution. We can get away with much less.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(info (string-append out "/share/info"))) (info (string-append out "/share/info")))
(invoke "makeinfo" "stumpwm.texi.in") (invoke "./autogen.sh")
(invoke "sh" "./configure" "SHELL=sh")
(apply invoke "make" "stumpwm.info" make-flags)
(install-file "stumpwm.info" info) (install-file "stumpwm.info" info)
#t)))))) #t))))))
(synopsis "Window manager written in Common Lisp") (synopsis "Window manager written in Common Lisp")
@ -2039,3 +2042,39 @@ execute a shell command on a configurable action. The icons can be moved on
the desktop by dragging them, and the icons will remember their positions on the desktop by dragging them, and the icons will remember their positions on
start-up.") start-up.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public xnotify
(package
(name "xnotify")
(version "0.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/phillbush/xnotify")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ris7jhi7hgw7nxkwkn3zk7n3y4nvnnm6dbz0qs0g2srp2k67v7v"))))
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
("libxft" ,libxft)
("libxinerama" ,libxinerama)
("imlib2" ,imlib2)))
(arguments
`(#:make-flags
(list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" %output)
(string-append "CFLAGS="
"-I" (assoc-ref %build-inputs "freetype")
"/include/freetype2"))
#:tests? #f ;no test suite
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(home-page "https://github.com/phillbush/xnotify")
(synopsis "Displays a notification on the screen")
(description "XNotify receives a notification specification in stdin and
shows a notification for the user on the screen.")
(license license:expat)))

View file

@ -40,6 +40,7 @@
;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru> ;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com> ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -104,6 +105,7 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages sphinx)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
;; packages outside the x.org system proper ;; packages outside the x.org system proper
@ -2515,3 +2517,34 @@ using @command{dmenu}.")
such as sway, similar to @command{rofi}.") such as sway, similar to @command{rofi}.")
(home-page "https://hg.sr.ht/~scoopta/wofi") (home-page "https://hg.sr.ht/~scoopta/wofi")
(license license:gpl3+))) (license license:gpl3+)))
(define-public dex
(package
(name "dex")
(version "0.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/jceb/dex"))
(commit (string-append "v" version))))
(sha256
(base32
"03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))
#:tests? #f))
(inputs
`(("python", python)))
(native-inputs
`(("python-sphinx" ,python-sphinx)))
(home-page "https://github.com/jceb/dex")
(synopsis "Execute DesktopEntry files")
(description
"@command{dex}, @dfn{DesktopEntry Execution}, is a program to generate
and execute @file{.desktop} files of the Application type.")
(license license:gpl3+)))

View file

@ -494,7 +494,7 @@ things in between.")
(define-public libshout (define-public libshout
(package (package
(name "libshout") (name "libshout")
(version "2.4.3") (version "2.4.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -502,7 +502,7 @@ things in between.")
"libshout-" version ".tar.gz")) "libshout-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd")))) "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View file

@ -2528,7 +2528,7 @@ including most mice, keyboards, tablets and touchscreens.")
(define-public xf86-input-libinput (define-public xf86-input-libinput
(package (package
(name "xf86-input-libinput") (name "xf86-input-libinput")
(version "0.28.2") (version "0.30.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2536,7 +2536,7 @@ including most mice, keyboards, tablets and touchscreens.")
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq")))) "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

View file

@ -757,7 +757,29 @@ cache.size = 100 * MB
(cache-size dnsmasq-configuration-cache-size (cache-size dnsmasq-configuration-cache-size
(default 150)) ;integer (default 150)) ;integer
(negative-cache? dnsmasq-configuration-negative-cache? (negative-cache? dnsmasq-configuration-negative-cache?
(default #t))) ;boolean (default #t)) ;boolean
(tftp-enable? dnsmasq-configuration-tftp-enable?
(default #f)) ;boolean
(tftp-no-fail? dnsmasq-configuration-tftp-no-fail?
(default #f)) ;boolean
(tftp-single-port? dnsmasq-configuration-tftp-single-port?
(default #f)) ;boolean
(tftp-secure? dnsmasq-tftp-secure?
(default #f)) ;boolean
(tftp-max dnsmasq-tftp-max
(default #f)) ;integer
(tftp-mtu dnsmasq-tftp-mtu
(default #f)) ;integer
(tftp-no-blocksize? dnsmasq-tftp-no-blocksize?
(default #f)) ;boolean
(tftp-lowercase? dnsmasq-tftp-lowercase?
(default #f)) ;boolean
(tftp-port-range dnsmasq-tftp-port-range
(default #f)) ;string
(tftp-root dnsmasq-tftp-root
(default "/var/empty,lo")) ;string
(tftp-unique-root dnsmasq-tftp-unique-root
(default #f))) ;"" or "ip" or "mac"
(define dnsmasq-shepherd-service (define dnsmasq-shepherd-service
(match-lambda (match-lambda
@ -765,7 +787,12 @@ cache.size = 100 * MB
no-hosts? no-hosts?
port local-service? listen-addresses port local-service? listen-addresses
resolv-file no-resolv? servers resolv-file no-resolv? servers
addresses cache-size negative-cache?) addresses cache-size negative-cache?
tftp-enable? tftp-no-fail?
tftp-single-port? tftp-secure?
tftp-max tftp-mtu tftp-no-blocksize?
tftp-lowercase? tftp-port-range
tftp-root tftp-unique-root)
(shepherd-service (shepherd-service
(provision '(dnsmasq)) (provision '(dnsmasq))
(requirement '(networking)) (requirement '(networking))
@ -794,7 +821,44 @@ cache.size = 100 * MB
#$(format #f "--cache-size=~a" cache-size) #$(format #f "--cache-size=~a" cache-size)
#$@(if negative-cache? #$@(if negative-cache?
'() '()
'("--no-negcache"))) '("--no-negcache"))
#$@(if tftp-enable?
'("--enable-tftp")
'())
#$@(if tftp-no-fail?
'("--tftp-no-fail")
'())
#$@(if tftp-single-port?
'("--tftp-single-port")
'())
#$@(if tftp-secure?
'("--tftp-secure?")
'())
#$@(if tftp-max
(list (format #f "--tftp-max=~a" tftp-max))
'())
#$@(if tftp-mtu
(list (format #f "--tftp-mtu=~a" tftp-mtu))
'())
#$@(if tftp-no-blocksize?
'("--tftp-no-blocksize")
'())
#$@(if tftp-lowercase?
'("--tftp-lowercase")
'())
#$@(if tftp-port-range
(list (format #f "--tftp-port-range=~a"
tftp-port-range))
'())
#$@(if tftp-root
(list (format #f "--tftp-root=~a" tftp-root))
'())
#$@(if tftp-unique-root
(list
(if (> (length tftp-unique-root) 0)
(format #f "--tftp-unique-root=~a" tftp-unique-root)
(format #f "--tftp-unique-root")))
'()))
#:pid-file "/run/dnsmasq.pid")) #:pid-file "/run/dnsmasq.pid"))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))

View file

@ -430,7 +430,7 @@ appropriate requests to this daemon.")))
(description (description
"@command{ganeti-luxid} is a daemon used to answer queries "@command{ganeti-luxid} is a daemon used to answer queries
related to the configuration and the current live state of a Ganeti cluster. related to the configuration and the current live state of a Ganeti cluster.
Additionally, it is the autorative daemon for the Ganeti job queue. Jobs can Additionally, it is the authorative daemon for the Ganeti job queue. Jobs can
be submitted via this daemon and it schedules and starts them."))) be submitted via this daemon and it schedules and starts them.")))
(define-record-type* <ganeti-rapi-configuration> (define-record-type* <ganeti-rapi-configuration>

View file

@ -17,20 +17,67 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu services guix) (define-module (gnu services guix)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix packages)
#:use-module ((gnu packages base) #:use-module ((gnu packages base)
#:select (glibc-utf8-locales)) #:select (glibc-utf8-locales))
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages databases)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages package-management)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services base) #:use-module (gnu services base)
#:use-module (gnu services admin) #:use-module (gnu services admin)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services getmail) #:use-module (gnu services getmail)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:export (<guix-data-service-configuration> #:export (guix-build-coordinator-configuration
guix-build-coordinator-configuration?
guix-build-coordinator-configuration-package
guix-build-coordinator-configuration-user
guix-build-coordinator-configuration-group
guix-build-coordinator-configuration-datastore-uri-string
guix-build-coordinator-configuration-agent-communication-uri-string
guix-build-coordinator-configuration-client-communication-uri-string
guix-build-coordinator-configuration-allocation-strategy
guix-build-coordinator-configuration-hooks
guix-build-coordinator-configuration-guile
guix-build-coordinator-service-type
guix-build-coordinator-agent-configuration
guix-build-coordinator-agent-configuration?
guix-build-coordinator-agent-configuration-package
guix-build-coordinator-agent-configuration-user
guix-build-coordinator-agent-configuration-coordinator
guix-build-coordinator-agent-configuration-uuid
guix-build-coordinator-agent-configuration-password
guix-build-coordinator-agent-configuration-password-file
guix-build-coordinator-agent-configuration-systems
guix-build-coordinator-agent-configuration-max-parallel-builds
guix-build-coordinator-agent-configuration-derivation-substitute-urls
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls
guix-build-coordinator-agent-service-type
guix-build-coordinator-queue-builds-configuration
guix-build-coordinator-queue-builds-configuration?
guix-build-coordinator-queue-builds-configuration-package
guix-build-coordinator-queue-builds-configuration-user
guix-build-coordinator-queue-builds-coordinator
guix-build-coordinator-queue-builds-configuration-systems
guix-build-coordinator-queue-builds-configuration-system-and-targets
guix-build-coordinator-queue-builds-configuration-guix-data-service
guix-build-coordinator-queue-builds-configuration-processed-commits-file
guix-build-coordinator-queue-builds-service-type
<guix-data-service-configuration>
guix-data-service-configuration guix-data-service-configuration
guix-data-service-configuration? guix-data-service-configuration?
guix-data-service-package guix-data-service-package
@ -45,11 +92,391 @@
;;;; Commentary: ;;;; Commentary:
;;; ;;;
;;; This module implements a service that to run instances of the Guix Data ;;; Services specifically related to GNU Guix.
;;; Service, which provides data about Guix over time.
;;; ;;;
;;;; Code: ;;;; Code:
(define-record-type* <guix-build-coordinator-configuration>
guix-build-coordinator-configuration make-guix-build-coordinator-configuration
guix-build-coordinator-configuration?
(package guix-build-coordinator-configuration-package
(default guix-build-coordinator))
(user guix-build-coordinator-configuration-user
(default "guix-build-coordinator"))
(group guix-build-coordinator-configuration-group
(default "guix-build-coordinator"))
(database-uri-string
guix-build-coordinator-configuration-datastore-uri-string
(default "sqlite:///var/lib/guix-build-coordinator/guix_build_coordinator.db"))
(agent-communication-uri-string
guix-build-coordinator-configuration-agent-communication-uri-string
(default "http://0.0.0.0:8745"))
(client-communication-uri-string
guix-build-coordinator-configuration-client-communication-uri-string
(default "http://127.0.0.1:8746"))
(allocation-strategy
guix-build-coordinator-configuration-allocation-strategy
(default #~basic-build-allocation-strategy))
(hooks guix-build-coordinator-configuration-hooks
(default '()))
(guile guix-build-coordinator-configuration-guile
(default guile-3.0-latest)))
(define-record-type* <guix-build-coordinator-agent-configuration>
guix-build-coordinator-agent-configuration
make-guix-build-coordinator-agent-configuration
guix-build-coordinator-agent-configuration?
(package guix-build-coordinator-agent-configuration-package
(default guix-build-coordinator))
(user guix-build-coordinator-agent-configuration-user
(default "guix-build-coordinator-agent"))
(coordinator guix-build-coordinator-agent-configuration-coordinator
(default "http://localhost:8745"))
(uuid guix-build-coordinator-agent-configuration-uuid)
(password guix-build-coordinator-agent-configuration-password
(default #f))
(password-file guix-build-coordinator-agent-configuration-password-file
(default #f))
(systems guix-build-coordinator-agent-configuration-systems
(default #f))
(max-parallel-builds
guix-build-coordinator-agent-configuration-max-parallel-builds
(default 1))
(derivation-substitute-urls
guix-build-coordinator-agent-configuration-derivation-substitute-urls
(default #f))
(non-derivation-substitute-urls
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls
(default #f)))
(define-record-type* <guix-build-coordinator-queue-builds-configuration>
guix-build-coordinator-queue-builds-configuration
make-guix-build-coordinator-queue-builds-configuration
guix-build-coordinator-queue-builds-configuration?
(package guix-build-coordinator-queue-builds-configuration-package
(default guix-build-coordinator))
(user guix-build-coordinator-queue-builds-configuration-user
(default "guix-build-coordinator-queue-builds"))
(coordinator guix-build-coordinator-queue-builds-coordinator
(default "http://localhost:8745"))
(systems guix-build-coordinator-queue-builds-configuration-systems
(default #f))
(systems-and-targets
guix-build-coordinator-queue-builds-configuration-system-and-targets
(default #f))
(guix-data-service
guix-build-coordinator-queue-builds-configuration-guix-data-service
(default "https://data.guix.gnu.org"))
(processed-commits-file
guix-build-coordinator-queue-builds-configuration-processed-commits-file
(default "/var/cache/guix-build-coordinator-queue-builds/processed-commits")))
(define* (make-guix-build-coordinator-start-script database-uri-string
allocation-strategy
pid-file
guix-build-coordinator-package
#:key
agent-communication-uri-string
client-communication-uri-string
(hooks '())
(guile guile-3.0))
(program-file
"start-guix-build-coordinator"
(with-extensions (cons guix-build-coordinator-package
;; This is a poorly constructed Guile load path,
;; since it contains things that aren't Guile
;; libraries, but it means that the Guile libraries
;; needed for the Guix Build Coordinator don't need
;; to be individually specified here.
(map second (package-inputs
guix-build-coordinator-package)))
#~(begin
(use-modules (srfi srfi-1)
(ice-9 match)
(web uri)
(prometheus)
(guix-build-coordinator hooks)
(guix-build-coordinator datastore)
(guix-build-coordinator build-allocator)
(guix-build-coordinator coordinator))
(let* ((metrics-registry (make-metrics-registry
#:namespace
"guixbuildcoordinator_"))
(datastore (database-uri->datastore
#$database-uri-string
#:metrics-registry metrics-registry))
(hooks
(list #$@(map (match-lambda
((name . hook-gexp)
#~(cons name #$hook-gexp)))
hooks)))
(hooks-with-defaults
`(,@hooks
,@(remove (match-lambda
((name . _) (assq-ref hooks name)))
%default-hooks)))
(build-coordinator (make-build-coordinator
#:datastore datastore
#:hooks hooks-with-defaults
#:metrics-registry metrics-registry
#:allocation-strategy #$allocation-strategy)))
(run-coordinator-service
build-coordinator
#:update-datastore? #t
#:pid-file #$pid-file
#:agent-communication-uri (string->uri
#$agent-communication-uri-string)
#:client-communication-uri (string->uri
#$client-communication-uri-string)))))
#:guile guile))
(define (guix-build-coordinator-shepherd-services config)
(match-record config <guix-build-coordinator-configuration>
(package user group database-uri-string
agent-communication-uri-string
client-communication-uri-string
allocation-strategy
hooks
guile)
(list
(shepherd-service
(documentation "Guix Build Coordinator")
(provision '(guix-build-coordinator))
(requirement '(networking))
(start #~(make-forkexec-constructor
(list #$(make-guix-build-coordinator-start-script
database-uri-string
allocation-strategy
"/var/run/guix-build-coordinator/pid"
package
#:agent-communication-uri-string
agent-communication-uri-string
#:client-communication-uri-string
client-communication-uri-string
#:hooks hooks
#:guile guile))
#:user #$user
#:group #$group
#:pid-file "/var/run/guix-build-coordinator/pid"
;; Allow time for migrations to run
#:pid-file-timeout 60
#:environment-variables
`(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/coordinator.log"))
(stop #~(make-kill-destructor))))))
(define (guix-build-coordinator-activation config)
#~(begin
(use-modules (guix build utils))
(define %user (getpw "guix-build-coordinator"))
(chmod "/var/lib/guix-build-coordinator" #o755)
(mkdir-p "/var/log/guix-build-coordinator")
;; Allow writing the PID file
(mkdir-p "/var/run/guix-build-coordinator")
(chown "/var/run/guix-build-coordinator"
(passwd:uid %user)
(passwd:gid %user))))
(define (guix-build-coordinator-account config)
(match-record config <guix-build-coordinator-configuration>
(user group)
(list (user-group
(name group)
(system? #t))
(user-account
(name user)
(group group)
(system? #t)
(comment "Guix Build Coordinator user")
(home-directory "/var/lib/guix-build-coordinator")
(shell (file-append shadow "/sbin/nologin"))))))
(define guix-build-coordinator-service-type
(service-type
(name 'guix-build-coordinator)
(extensions
(list
(service-extension shepherd-root-service-type
guix-build-coordinator-shepherd-services)
(service-extension activation-service-type
guix-build-coordinator-activation)
(service-extension account-service-type
guix-build-coordinator-account)))
(default-value
(guix-build-coordinator-configuration))
(description
"Run an instance of the Guix Build Coordinator.")))
(define (guix-build-coordinator-agent-shepherd-services config)
(match-record config <guix-build-coordinator-agent-configuration>
(package user coordinator uuid password password-file max-parallel-builds
derivation-substitute-urls non-derivation-substitute-urls
systems)
(list
(shepherd-service
(documentation "Guix Build Coordinator Agent")
(provision '(guix-build-coordinator-agent))
(requirement '(networking))
(start #~(make-forkexec-constructor
(list #$(file-append package "/bin/guix-build-coordinator-agent")
#$(string-append "--coordinator=" coordinator)
#$(string-append "--uuid=" uuid)
#$@(if password
#~(#$(string-append "--password=" password))
#~())
#$@(if password-file
#~(#$(string-append "--password-file=" password-file))
#~())
#$(simple-format #f "--max-parallel-builds=~A"
max-parallel-builds)
#$@(if derivation-substitute-urls
#~(#$(string-append
"--derivation-substitute-urls="
(string-join derivation-substitute-urls " ")))
#~())
#$@(if non-derivation-substitute-urls
#~(#$(string-append
"--non-derivation-substitute-urls="
(string-join derivation-substitute-urls " ")))
#~())
#$@(map (lambda (system)
(string-append "--system=" system))
(or systems '())))
#:user #$user
#:pid-file "/var/run/guix-build-coordinator-agent/pid"
#:environment-variables
`(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/agent.log"))
(stop #~(make-kill-destructor))))))
(define (guix-build-coordinator-agent-activation config)
#~(begin
(use-modules (guix build utils))
(mkdir-p "/var/log/guix-build-coordinator")
;; Allow writing the PID file
(mkdir-p "/var/run/guix-build-coordinator-agent")
(chown "/var/run/guix-build-coordinator-agent"
(passwd:uid %user)
(passwd:gid %user))))
(define (guix-build-coordinator-agent-account config)
(list (user-account
(name (guix-build-coordinator-agent-configuration-user config))
(group "nogroup")
(system? #t)
(comment "Guix Build Coordinator agent user")
(home-directory "/var/empty")
(shell (file-append shadow "/sbin/nologin")))))
(define guix-build-coordinator-agent-service-type
(service-type
(name 'guix-build-coordinator-agent)
(extensions
(list
(service-extension shepherd-root-service-type
guix-build-coordinator-agent-shepherd-services)
(service-extension activation-service-type
guix-build-coordinator-agent-activation)
(service-extension account-service-type
guix-build-coordinator-agent-account)))
(description
"Run a Guix Build Coordinator agent.")))
(define (guix-build-coordinator-queue-builds-shepherd-services config)
(match-record config <guix-build-coordinator-queue-builds-configuration>
(package user coordinator systems systems-and-targets
guix-data-service processed-commits-file)
(list
(shepherd-service
(documentation "Guix Build Coordinator queue builds from Guix Data Service")
(provision '(guix-build-coordinator-queue-builds))
(requirement '(networking))
(start
#~(make-forkexec-constructor
(list
#$(file-append
package
"/bin/guix-build-coordinator-queue-builds-from-guix-data-service")
#$(string-append "--coordinator=" coordinator)
#$@(map (lambda (system)
(string-append "--system=" system))
(or systems '()))
#$@(map (match-lambda
((system . target)
(string-append "--system-and-target=" system "=" target)))
(or systems-and-targets '()))
#$@(if guix-data-service
#~(#$(string-append "--guix-data-service=" guix-data-service))
#~())
#$@(if processed-commits-file
#~(#$(string-append "--processed-commits-file="
processed-commits-file))
#~()))
#:user #$user
#:pid-file "/var/run/guix-build-coordinator-queue-builds/pid"
#:environment-variables
`(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/queue-builds.log"))
(stop #~(make-kill-destructor))))))
(define (guix-build-coordinator-queue-builds-activation config)
#~(begin
(use-modules (guix build utils))
(mkdir-p "/var/log/guix-build-coordinator")
;; Allow writing the PID file
(mkdir-p "/var/run/guix-build-coordinator-queue-builds")
(chown "/var/run/guix-build-coordinator-queue-builds"
(passwd:uid %user)
(passwd:gid %user))))
(define (guix-build-coordinator-queue-builds-account config)
(list (user-account
(name (guix-build-coordinator-queue-builds-configuration-user config))
(group "nogroup")
(system? #t)
(comment "Guix Build Coordinator queue-builds user")
(home-directory "/var/empty")
(shell (file-append shadow "/sbin/nologin")))))
(define guix-build-coordinator-queue-builds-service-type
(service-type
(name 'guix-build-coordinator-queue-builds)
(extensions
(list
(service-extension shepherd-root-service-type
guix-build-coordinator-queue-builds-shepherd-services)
(service-extension activation-service-type
guix-build-coordinator-queue-builds-activation)
(service-extension account-service-type
guix-build-coordinator-queue-builds-account)))
(description
"Run the guix-build-coordinator-queue-builds-from-guix-data-service
script.
This is a script to assist in having the Guix Build Coordinator build
derivations stored in an instance of the Guix Data Service.")))
;;;
;;; Guix Data Service
;;;
(define-record-type* <guix-data-service-configuration> (define-record-type* <guix-data-service-configuration>
guix-data-service-configuration make-guix-data-service-configuration guix-data-service-configuration make-guix-data-service-configuration
guix-data-service-configuration? guix-data-service-configuration?
@ -108,7 +535,7 @@ ca-certificates.crt file in the system profile."
#:environment-variables #:environment-variables
`(,(string-append `(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8") "LC_ALL=en_US.UTF-8")
#:log-file "/var/log/guix-data-service/web.log")) #:log-file "/var/log/guix-data-service/web.log"))
(stop #~(make-kill-destructor))) (stop #~(make-kill-destructor)))
@ -132,7 +559,7 @@ ca-certificates.crt file in the system profile."
"GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
,(string-append ,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8") "LC_ALL=en_US.UTF-8")
#:log-file "/var/log/guix-data-service/process-jobs.log")) #:log-file "/var/log/guix-data-service/process-jobs.log"))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))

View file

@ -307,10 +307,15 @@ access to exported repositories under @file{/srv/git}."
(pubkey-file (string-append (pubkey-file (string-append
#$home "/" #$home "/"
(basename (basename
(strip-store-file-name admin-pubkey))))) (strip-store-file-name admin-pubkey))))
(rc-file #$(string-append home "/.gitolite.rc")))
(simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file)
(copy-file #$rc-file #$(string-append home "/.gitolite.rc")) (copy-file #$rc-file rc-file)
;; ensure gitolite's user can read the configuration
(chown rc-file
(passwd:uid user-info)
(passwd:gid user-info))
;; The key must be writable, so copy it from the store ;; The key must be writable, so copy it from the store
(copy-file admin-pubkey pubkey-file) (copy-file admin-pubkey pubkey-file)

View file

@ -23,6 +23,7 @@
#:use-module (gnu bootloader grub) #:use-module (gnu bootloader grub)
#:use-module (gnu image) #:use-module (gnu image)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages gdb)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
@ -862,6 +863,9 @@ that will be listening to receive secret keys on port 1004, TCP."
(bootloader grub-minimal-bootloader) (bootloader grub-minimal-bootloader)
(target "/dev/vda") (target "/dev/vda")
(timeout 0))) (timeout 0)))
(packages (cons* gdb-minimal
(operating-system-packages
%hurd-default-operating-system)))
(services (cons* (services (cons*
(service openssh-service-type (service openssh-service-type
(openssh-configuration (openssh-configuration

View file

@ -7,6 +7,7 @@
;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2020 shtwzrd <shtwzrd@protonmail.com> ;;; Copyright © 2020 shtwzrd <shtwzrd@protonmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -925,7 +926,7 @@ the GNOME desktop environment.")
(inherit (unix-pam-service "gdm-autologin" (inherit (unix-pam-service "gdm-autologin"
#:login-uid? #t)) #:login-uid? #t))
(auth (list (pam-entry (auth (list (pam-entry
(control "[success=ok default=1]") (control "optional")
(module (file-append (gdm-configuration-gdm config) (module (file-append (gdm-configuration-gdm config)
"/lib/security/pam_gdm.so"))) "/lib/security/pam_gdm.so")))
(pam-entry (pam-entry

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