Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke 2019-03-23 23:16:55 +01:00
commit 8c14f7f8a7
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
219 changed files with 9962 additions and 3896 deletions

View File

@ -43,20 +43,20 @@ Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
Mathieu Othacehe <m.othacehe@gmail.com> Mathieu Othacehe <m.othacehe@gmail.com>
Mathieu Othacehe <mathieu.othacehe@parrot.com> Mathieu Othacehe <mathieu.othacehe@parrot.com>
Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
Nils Gillmann <ng0@n0.is> ng0 <ng0@n0.is> ng0 <ng0@n0.is> Nils Gillmann <ng0@n0.is>
Nils Gillmann <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org> ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org>
Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx> ng0 <ng0@n0.is> ng0 <ng0@crash.cx>
Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx> ng0 <ng0@n0.is> ng0 <ng0@crash.cx>
Nils Gillmann <ng0@n0.is> <ng0@infotropique.org> ng0 <ng0@n0.is> <ng0@infotropique.org>
Nils Gillmann <ng0@n0.is> <ng0@no-reply.infotropique.org> ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org>
Nils Gillmann <ng0@n0.is> <ng0@no-reply.pragmatique.xyz> ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz>
Nils Gillmann <ng0@n0.is> <ng0@pragmatique.xyz> ng0 <ng0@n0.is> <ng0@pragmatique.xyz>
Nils Gillmann <ng0@n0.is> <contact.ng0@cryptolab.net> ng0 <ng0@n0.is> <contact.ng0@cryptolab.net>
Nils Gillmann <ng0@n0.is> <ng0@we.make.ritual.n0.is> ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is>
Nils Gillmann <ng0@n0.is> <ngillmann@runbox.com> ng0 <ng0@n0.is> <ngillmann@runbox.com>
Nils Gillmann <ng0@n0.is> <niasterisk@grrlz.net> ng0 <ng0@n0.is> <niasterisk@grrlz.net>
Nils Gillmann <ng0@n0.is> <ng@niasterisk.space> ng0 <ng0@n0.is> <ng@niasterisk.space>
Nils Gillmann <ng0@n0.is> <ng0@libertad.pw> ng0 <ng0@n0.is> <ng0@libertad.pw>
Pierre Neidhardt <mail@ambrevar.xyz> Pierre Neidhardt <mail@ambrevar.xyz>
Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl>

View File

@ -9,10 +9,11 @@
# Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
# Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> # Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> # Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
# Copyright © 2018 Nils Gillmann <ng0@n0.is> # Copyright © 2018 ng0 <ng0@n0.is>
# Copyright © 2018 Julien Lepiller <julien@lepiller.eu> # Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com> # Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -124,6 +125,7 @@ MODULES = \
guix/build-system/ocaml.scm \ guix/build-system/ocaml.scm \
guix/build-system/waf.scm \ guix/build-system/waf.scm \
guix/build-system/r.scm \ guix/build-system/r.scm \
guix/build-system/rakudo.scm \
guix/build-system/ruby.scm \ guix/build-system/ruby.scm \
guix/build-system/scons.scm \ guix/build-system/scons.scm \
guix/build-system/texlive.scm \ guix/build-system/texlive.scm \
@ -164,6 +166,7 @@ MODULES = \
guix/build/python-build-system.scm \ guix/build/python-build-system.scm \
guix/build/ocaml-build-system.scm \ guix/build/ocaml-build-system.scm \
guix/build/r-build-system.scm \ guix/build/r-build-system.scm \
guix/build/rakudo-build-system.scm \
guix/build/ruby-build-system.scm \ guix/build/ruby-build-system.scm \
guix/build/scons-build-system.scm \ guix/build/scons-build-system.scm \
guix/build/texlive-build-system.scm \ guix/build/texlive-build-system.scm \
@ -202,6 +205,7 @@ MODULES = \
guix/import/gnu.scm \ guix/import/gnu.scm \
guix/import/hackage.scm \ guix/import/hackage.scm \
guix/import/json.scm \ guix/import/json.scm \
guix/import/launchpad.scm \
guix/import/opam.scm \ guix/import/opam.scm \
guix/import/print.scm \ guix/import/print.scm \
guix/import/pypi.scm \ guix/import/pypi.scm \

View File

@ -34,7 +34,7 @@ Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo
Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{}
2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018
Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright
@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017, @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017,
2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016,
2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018

View File

@ -34,7 +34,7 @@ Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo
Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{}
2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018
Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright
@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017, @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017,
2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016,
2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018

View File

@ -28,9 +28,9 @@ Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@*
Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@*
Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016 Ben Woodcroft@*
Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@*
Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017 ng0@*
Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@*
Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016 Alex ter Weele@*
@ -48,7 +48,7 @@ Copyright @copyright{} 2017 Maxim Cournoyer@*
Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@*
Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 George Clemmer@*
Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017 Andy Wingo@*
Copyright @copyright{} 2017, 2018 Arun Isaac@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@*
Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2017 nee@*
Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Rutger Helling@*
Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Oleg Pykhalov@*
@ -4760,14 +4760,24 @@ symlinks, as well as empty mount points for virtual file systems like
procfs. procfs.
@end table @end table
@cindex relocatable binaries
@item --relocatable @item --relocatable
@itemx -R @itemx -R
Produce @dfn{relocatable binaries}---i.e., binaries that can be placed Produce @dfn{relocatable binaries}---i.e., binaries that can be placed
anywhere in the file system hierarchy and run from there. For example, anywhere in the file system hierarchy and run from there.
if you create a pack containing Bash with:
When this option is passed once, the resulting binaries require support for
@dfn{user namespaces} in the kernel Linux; when passed
@emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds
PRoot support, can be thought of as the abbreviation of ``Really
Relocatable''. Neat, isn't it?}, relocatable binaries fall to back to PRoot
if user namespaces are unavailable, and essentially work anywhere---see below
for the implications.
For example, if you create a pack containing Bash with:
@example @example
guix pack -R -S /mybin=bin bash guix pack -RR -S /mybin=bin bash
@end example @end example
@noindent @noindent
@ -4786,12 +4796,23 @@ In that shell, if you type @code{ls /gnu/store}, you'll notice that
altogether! That is probably the simplest way to deploy Guix-built altogether! That is probably the simplest way to deploy Guix-built
software on a non-Guix machine. software on a non-Guix machine.
There's a gotcha though: this technique relies on the @dfn{user @quotation Note
namespace} feature of the kernel Linux, which allows unprivileged users By default, relocatable binaries rely on the @dfn{user namespace} feature of
to mount or change root. Old versions of Linux did not support it, and the kernel Linux, which allows unprivileged users to mount or change root.
some GNU/Linux distributions turn it off; on these systems, programs Old versions of Linux did not support it, and some GNU/Linux distributions
from the pack @emph{will fail to run}, unless they are unpacked in the turn it off.
root file system.
To produce relocatable binaries that work even in the absence of user
namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}. In that
case, binaries will try user namespace support and fall back to PRoot if user
namespaces are not supported.
The @uref{https://proot-me.github.io/, PRoot} program provides the necessary
support for file system virtualization. It achieves that by using the
@code{ptrace} system call on the running program. This approach has the
advantage to work without requiring special kernel support, but it incurs
run-time overhead every time a system call is made.
@end quotation
@item --expression=@var{expr} @item --expression=@var{expr}
@itemx -e @var{expr} @itemx -e @var{expr}
@ -5220,6 +5241,29 @@ with @var{libressl}. Then we use it to define a @dfn{variant} of the
This is exactly what the @option{--with-input} command-line option does This is exactly what the @option{--with-input} command-line option does
(@pxref{Package Transformation Options, @option{--with-input}}). (@pxref{Package Transformation Options, @option{--with-input}}).
The following variant of @code{package-input-rewriting} can match packages to
be replaced by name rather than by identity.
@deffn {Scheme Procedure} package-input-rewriting/spec @var{replacements}
Return a procedure that, given a package, applies the given @var{replacements} to
all the package graph (excluding implicit inputs). @var{replacements} is a list of
spec/procedures pair; each spec is a package specification such as @code{"gcc"} or
@code{"guile@@2"}, and each procedure takes a matching package and returns a
replacement for that package.
@end deffn
The example above could be rewritten this way:
@example
(define libressl-instead-of-openssl
;; Replace all the packages called "openssl" with LibreSSL.
(package-input-rewriting/spec `(("openssl" . ,(const libressl)))))
@end example
The key difference here is that, this time, packages are matched by spec and
not by identity. In other words, any package in the graph that is called
@code{openssl} will be replaced.
A more generic procedure to rewrite a package dependency graph is A more generic procedure to rewrite a package dependency graph is
@code{package-mapping}: it supports arbitrary changes to nodes in the @code{package-mapping}: it supports arbitrary changes to nodes in the
graph. graph.
@ -5791,8 +5835,8 @@ some cases, you will need to unpack the package's source code to a
different directory structure than the one indicated by the import path, different directory structure than the one indicated by the import path,
and @code{#:unpack-path} should be used in such cases. and @code{#:unpack-path} should be used in such cases.
Packages that provide Go libraries should be installed along with their Packages that provide Go libraries should install their source code into
source code. The key @code{#:install-source?}, which defaults to the built output. The key @code{#:install-source?}, which defaults to
@code{#t}, controls whether or not the source code is installed. It can @code{#t}, controls whether or not the source code is installed. It can
be set to @code{#f} for packages that only provide executable files. be set to @code{#f} for packages that only provide executable files.
@end defvr @end defvr
@ -5958,6 +6002,24 @@ are run after installation using the R function
@code{tools::testInstalledPackage}. @code{tools::testInstalledPackage}.
@end defvr @end defvr
@defvr {Scheme Variable} rakudo-build-system
This variable is exported by @code{(guix build-system rakudo)} It
implements the build procedure used by @uref{https://rakudo.org/,
Rakudo} for @uref{https://perl6.org/, Perl6} packages. It installs the
package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and
installs the binaries, library files and the resources, as well as wrap
the files under the @code{bin/} directory. Tests can be skipped by
passing @code{#f} to the @code{tests?} parameter.
Which rakudo package is used can be specified with @code{rakudo}.
Which perl6-tap-harness package used for the tests can be specified with
@code{#:prove6} or removed by passing @code{#f} to the
@code{with-prove6?} parameter.
Which perl6-zef package used for tests and installing can be specified
with @code{#:zef} or removed by passing @code{#f} to the
@code{with-zef?} parameter.
@end defvr
@defvr {Scheme Variable} texlive-build-system @defvr {Scheme Variable} texlive-build-system
This variable is exported by @code{(guix build-system texlive)}. It is This variable is exported by @code{(guix build-system texlive)}. It is
used to build TeX packages in batch mode with a specified engine. The used to build TeX packages in batch mode with a specified engine. The
@ -7759,24 +7821,24 @@ 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!
@item --with-branch=@var{package}=@var{branch} @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
Build @var{package} from the latest commit of @var{branch}. The @code{source} Build @var{package} from the latest commit of the @code{master} branch of the
field of @var{package} must be an origin with the @code{git-fetch} method Git repository at @var{url}. Git sub-modules of the repository are fetched,
(@pxref{origin Reference}) or a @code{git-checkout} object; the repository URL recursively.
is taken from that @code{source}. Git sub-modules of the repository are
fetched, recursively.
For instance, the following command builds @code{guile-sqlite3} from the For example, the following command builds the NumPy Python library against the
latest commit of its @code{master} branch, and then builds @code{guix} (which latest commit of the master branch of Python itself:
depends on it) and @code{cuirass} (which depends on @code{guix}) against this
specific @code{guile-sqlite3} build:
@example @example
guix build --with-branch=guile-sqlite3=master cuirass guix build python-numpy \
--with-git-url=python=https://github.com/python/cpython
@end example @end example
This option can also be combined with @code{--with-branch} or
@code{--with-commit} (see below).
@cindex continuous integration @cindex continuous integration
Obviously, since it uses the latest commit of the given branch, the result of Obviously, since it uses the latest commit of the given branch, the result of
such a command varies over time. Nevertheless it is a convenient way to such a command varies over time. Nevertheless it is a convenient way to
@ -7788,6 +7850,22 @@ Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up
consecutive accesses to the same repository. You may want to clean it up once consecutive accesses to the same repository. You may want to clean it up once
in a while to save disk space. in a while to save disk space.
@item --with-branch=@var{package}=@var{branch}
Build @var{package} from the latest commit of @var{branch}. If the
@code{source} field of @var{package} is an origin with the @code{git-fetch}
method (@pxref{origin Reference}) or a @code{git-checkout} object, the
repository URL is taken from that @code{source}. Otherwise you have to use
@code{--with-git-url} to specify the URL of the Git repository.
For instance, the following command builds @code{guile-sqlite3} from the
latest commit of its @code{master} branch, and then builds @code{guix} (which
depends on it) and @code{cuirass} (which depends on @code{guix}) against this
specific @code{guile-sqlite3} build:
@example
guix build --with-branch=guile-sqlite3=master cuirass
@end example
@item --with-commit=@var{package}=@var{commit} @item --with-commit=@var{package}=@var{commit}
This is similar to @code{--with-branch}, except that it builds from This is similar to @code{--with-branch}, except that it builds from
@var{commit} rather than the tip of a branch. @var{commit} must be a valid @var{commit} rather than the tip of a branch. @var{commit} must be a valid
@ -8781,6 +8859,8 @@ the updater for @uref{https://hackage.haskell.org, Hackage} packages.
the updater for @uref{https://www.stackage.org, Stackage} packages. the updater for @uref{https://www.stackage.org, Stackage} packages.
@item crate @item crate
the updater for @uref{https://crates.io, Crates} packages. the updater for @uref{https://crates.io, Crates} packages.
@item launchpad
the updater for @uref{https://launchpad.net, Launchpad} packages.
@end table @end table
For instance, the following command only checks for updates of Emacs For instance, the following command only checks for updates of Emacs
@ -9228,7 +9308,9 @@ This shows the @emph{reverse} DAG of packages. For example:
guix graph --type=reverse-package ocaml guix graph --type=reverse-package ocaml
@end example @end example
...@: yields the graph of packages that depend on OCaml. ...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if
you are also interested in cases where OCaml is an implicit dependency, see
@code{reverse-bag} below.)
Note that for core packages this can yield huge graphs. If all you want Note that for core packages this can yield huge graphs. If all you want
is to know the number of packages that depend on a given package, use is to know the number of packages that depend on a given package, use
@ -9262,6 +9344,20 @@ dependencies.
@item bag-with-origins @item bag-with-origins
Similar to @code{bag}, but also showing origins and their dependencies. Similar to @code{bag}, but also showing origins and their dependencies.
@item reverse-bag
This shows the @emph{reverse} DAG of packages. Unlike @code{reverse-package},
it also takes implicit dependencies into account. For example:
@example
guix graph -t reverse-bag dune
@end example
@noindent
...@: yields the graph of all packages that depend on Dune, directly or
indirectly. Since Dune is an @emph{implicit} dependency of many packages
@i{via} @code{dune-build-system}, this shows a large number of packages,
whereas @code{reverse-package} would show very few if any.
@item derivation @item derivation
This is the most detailed representation: It shows the DAG of This is the most detailed representation: It shows the DAG of
derivations (@pxref{Derivations}) and plain store items. Compared to derivations (@pxref{Derivations}) and plain store items. Compared to
@ -11077,6 +11173,7 @@ declaration.
* Telephony Services:: Telephony services. * Telephony Services:: Telephony services.
* Monitoring Services:: Monitoring services. * Monitoring Services:: Monitoring services.
* Kerberos Services:: Kerberos services. * Kerberos Services:: Kerberos services.
* LDAP Services:: LDAP services.
* Web Services:: Web servers. * Web Services:: Web servers.
* Certificate Services:: TLS certificates via Let's Encrypt. * Certificate Services:: TLS certificates via Let's Encrypt.
* DNS Services:: DNS daemons. * DNS Services:: DNS daemons.
@ -17623,6 +17720,484 @@ Local accounts with lower values will silently fail to authenticate.
@end deftp @end deftp
@node LDAP Services
@subsection LDAP Services
@cindex LDAP
@cindex nslcd, LDAP service
The @code{(gnu services authentication)} module provides the
@code{nslcd-service-type}, which can be used to authenticate against an LDAP
server. In addition to configuring the service itself, you may want to add
@code{ldap} as a name service to the Name Service Switch. @xref{Name Service
Switch} for detailed information.
Here is a simple operating system declaration with a default configuration of
the @code{nslcd-service-type} and a Name Service Switch configuration that
consults the @code{ldap} name service last:
@example
(use-service-modules authentication)
(use-modules (gnu system nss))
...
(operating-system
...
(services
(cons*
(service nslcd-service-type)
(service dhcp-client-service-type)
%base-services))
(name-service-switch
(let ((services (list (name-service (name "db"))
(name-service (name "files"))
(name-service (name "ldap")))))
(name-service-switch
(inherit %mdns-host-lookup-nss)
(password services)
(shadow services)
(group services)
(netgroup services)
(gshadow services)))))
@end example
@c %start of generated documentation for nslcd-configuration
Available @code{nslcd-configuration} fields are:
@deftypevr {@code{nslcd-configuration} parameter} package nss-pam-ldapd
The @code{nss-pam-ldapd} package to use.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number threads
The number of threads to start that can handle requests and perform LDAP
queries. Each thread opens a separate connection to the LDAP server.
The default is to start 5 threads.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} string uid
This specifies the user id with which the daemon should be run.
Defaults to @samp{"nslcd"}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} string gid
This specifies the group id with which the daemon should be run.
Defaults to @samp{"nslcd"}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} log-option log
This option controls the way logging is done via a list containing
SCHEME and LEVEL. The SCHEME argument may either be the symbols "none"
or "syslog", or an absolute file name. The LEVEL argument is optional
and specifies the log level. The log level may be one of the following
symbols: "crit", "error", "warning", "notice", "info" or "debug". All
messages with the specified log level or higher are logged.
Defaults to @samp{("/var/log/nslcd" info)}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} list uri
The list of LDAP server URIs. Normally, only the first server will be
used with the following servers as fall-back.
Defaults to @samp{("ldap://localhost:389/")}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string ldap-version
The version of the LDAP protocol to use. The default is to use the
maximum version supported by the LDAP library.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string binddn
Specifies the distinguished name with which to bind to the directory
server for lookups. The default is to bind anonymously.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string bindpw
Specifies the credentials with which to bind. This option is only
applicable when used with binddn.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string rootpwmoddn
Specifies the distinguished name to use when the root user tries to
modify a user's password using the PAM module.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string rootpwmodpw
Specifies the credentials with which to bind if the root user tries to
change a user's password. This option is only applicable when used with
rootpwmoddn
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-mech
Specifies the SASL mechanism to be used when performing SASL
authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-realm
Specifies the SASL realm to be used when performing SASL authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-authcid
Specifies the authentication identity to be used when performing SASL
authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string sasl-authzid
Specifies the authorization identity to be used when performing SASL
authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize?
Determines whether the LDAP server host name should be canonicalised. If
this is enabled the LDAP library will do a reverse host name lookup. By
default, it is left up to the LDAP library whether this check is
performed or not.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string krb5-ccname
Set the name for the GSS-API Kerberos credentials cache.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} string base
The directory search base.
Defaults to @samp{"dc=example,dc=com"}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} scope-option scope
Specifies the search scope (subtree, onelevel, base or children). The
default scope is subtree; base scope is almost never useful for name
service lookups; children scope is not supported on all servers.
Defaults to @samp{(subtree)}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-deref-option deref
Specifies the policy for dereferencing aliases. The default policy is
to never dereference aliases.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean referrals
Specifies whether automatic referral chasing should be enabled. The
default behaviour is to chase referrals.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} list-of-map-entries maps
This option allows for custom attributes to be looked up instead of the
default RFC 2307 attributes. It is a list of maps, each consisting of
the name of a map, the RFC 2307 attribute to match and the query
expression for the attribute as it is available in the directory.
Defaults to @samp{()}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} list-of-filter-entries filters
A list of filters consisting of the name of a map to which the filter
applies and an LDAP search filter expression.
Defaults to @samp{()}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number bind-timelimit
Specifies the time limit in seconds to use when connecting to the
directory server. The default value is 10 seconds.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number timelimit
Specifies the time limit (in seconds) to wait for a response from the
LDAP server. A value of zero, which is the default, is to wait
indefinitely for searches to be completed.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number idle-timelimit
Specifies the period if inactivity (in seconds) after which the con
nection to the LDAP server will be closed. The default is not to time
out connections.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime
Specifies the number of seconds to sleep when connecting to all LDAP
servers fails. By default one second is waited between the first
failure and the first retry.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime
Specifies the time after which the LDAP server is considered to be
permanently unavailable. Once this time is reached retries will be done
only once per this time period. The default value is 10 seconds.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-ssl-option ssl
Specifies whether to use SSL/TLS or not (the default is not to). If
'start-tls is specified then StartTLS is used rather than raw LDAP over
SSL.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-tls-reqcert-option tls-reqcert
Specifies what checks to perform on a server-supplied certificate. The
meaning of the values is described in the ldap.conf(5) manual page.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-cacertdir
Specifies the directory containing X.509 certificates for peer authen
tication. This parameter is ignored when using GnuTLS.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-cacertfile
Specifies the path to the X.509 certificate for peer authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-randfile
Specifies the path to an entropy source. This parameter is ignored when
using GnuTLS.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-ciphers
Specifies the ciphers to use for TLS as a string.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-cert
Specifies the path to the file containing the local certificate for
client TLS authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string tls-key
Specifies the path to the file containing the private key for client TLS
authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number pagesize
Set this to a number greater than 0 to request paged results from the
LDAP server in accordance with RFC2696. The default (0) is to not
request paged results.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers
This option prevents group membership lookups through LDAP for the
specified users. Alternatively, the value 'all-local may be used. With
that value nslcd builds a full list of non-LDAP users on startup.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number nss-min-uid
This option ensures that LDAP users with a numeric user id lower than
the specified value are ignored.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number nss-uid-offset
This option specifies an offset that is added to all LDAP numeric user
ids. This can be used to avoid user id collisions with local users.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-number nss-gid-offset
This option specifies an offset that is added to all LDAP numeric group
ids. This can be used to avoid user id collisions with local groups.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean nss-nested-groups
If this option is set, the member attribute of a group may point to
another group. Members of nested groups are also returned in the higher
level group and parent groups are returned when finding groups for a
specific user. The default is not to perform extra searches for nested
groups.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers
If this option is set, the group member list is not retrieved when
looking up groups. Lookups for finding which groups a user belongs to
will remain functional so the user will likely still get the correct
groups assigned on login.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration
If this option is set, functions which cause all user/group entries to
be loaded from the directory will not succeed in doing so. This can
dramatically reduce LDAP server load in situations where there are a
great number of users and/or groups. This option is not recommended for
most configurations.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string validnames
This option can be used to specify how user and group names are verified
within the system. This pattern is used to check all user and group
names that are requested and returned from LDAP.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean ignorecase
This specifies whether or not to perform searches using case-insensitive
matching. Enabling this could open up the system to authorization
bypass vulnerabilities and introduce nscd cache poisoning
vulnerabilities which allow denial of service.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-boolean pam-authc-ppolicy
This option specifies whether password policy controls are requested and
handled from the LDAP server when performing user authentication.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string pam-authc-search
By default nslcd performs an LDAP search with the user's credentials
after BIND (authentication) to ensure that the BIND operation was
successful. The default search is a simple check to see if the user's
DN exists. A search filter can be specified that will be used instead.
It should return at least one entry.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string pam-authz-search
This option allows flexible fine tuning of the authorisation check that
should be performed. The search filter specified is executed and if any
entries match, access is granted, otherwise access is denied.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} maybe-string pam-password-prohibit-message
If this option is set password modification using pam_ldap will be
denied and the specified message will be presented to the user instead.
The message can be used to direct the user to an alternative means of
changing their password.
Defaults to @samp{disabled}.
@end deftypevr
@deftypevr {@code{nslcd-configuration} parameter} list pam-services
List of pam service names for which LDAP authentication should suffice.
Defaults to @samp{()}.
@end deftypevr
@c %end of generated documentation for nslcd-configuration
@node Web Services @node Web Services
@subsection Web Services @subsection Web Services
@ -20303,6 +20878,15 @@ The directory to scan for music files.
@item @code{playlist-dir} (default: @code{"~/.mpd/playlists"}) @item @code{playlist-dir} (default: @code{"~/.mpd/playlists"})
The directory to store playlists. The directory to store playlists.
@item @code{db-file} (default: @code{"~/.mpd/tag_cache"})
The location of the music database.
@item @code{state-file} (default: @code{"~/.mpd/state"})
The location of the file that stores current MPD's state.
@item @code{sticker-file} (default: @code{"~/.mpd/sticker.sql"})
The location of the sticker database.
@item @code{port} (default: @code{"6600"}) @item @code{port} (default: @code{"6600"})
The port to run mpd on. The port to run mpd on.
@ -22434,6 +23018,34 @@ that enables sharing the clipboard with a vm and setting the guest display
resolution when the graphical console window resizes. resolution when the graphical console window resizes.
@end deffn @end deffn
@cindex inputattach
@subsubheading inputattach Service
@cindex tablet input, for Xorg
@cindex touchscreen input, for Xorg
The @uref{https://linuxwacom.github.io/, inputattach} service allows you to
use input devices such as Wacom tablets, touchscreens, or joysticks with the
Xorg display server.
@deffn {Scheme Variable} inputattach-service-type
Type of a service that runs @command{inputattach} on a device and
dispatches events from it.
@end deffn
@deftp {Data Type} inputattach-configuration
@table @asis
@item @code{device-type} (default: @code{"wacom"})
The type of device to connect to. Run @command{inputattach --help}, from the
@code{inputattach} package, to see the list of supported device types.
@item @code{device} (default: @code{"/dev/ttyS0"})
The device file to connect to the device.
@item @code{log-file} (default: @code{#f})
If true, this must be the name of a file to log messages to.
@end table
@end deftp
@subsection Dictionary Services @subsection Dictionary Services
@cindex dictionary @cindex dictionary
The @code{(gnu services dict)} module provides the following service: The @code{(gnu services dict)} module provides the following service:

View File

@ -1,6 +1,6 @@
# #
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2017, 2018 Nils Gillmann <ng0@n0.is> # Copyright © 2017, 2018 ng0 <ng0@n0.is>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #

View File

@ -91,11 +91,9 @@ TIMEOUT ~a~%"
(for-each (lambda (file) (for-each (lambda (file)
(install-file file install-dir)) (install-file file install-dir))
(find-files syslinux-dir "\\.c32$")) (find-files syslinux-dir "\\.c32$"))
(unless (invoke/quiet extlinux "--install" install-dir)
(and (zero? (system* extlinux "--install" install-dir)) (write-file-on-device (string-append syslinux-dir "/" #$mbr)
(write-file-on-device 440 device 0))))
(string-append syslinux-dir "/" #$mbr) 440 device 0))
(error "failed to install SYSLINUX")))))
(define install-extlinux-mbr (define install-extlinux-mbr
(install-extlinux "mbr.bin")) (install-extlinux "mbr.bin"))

View File

@ -369,10 +369,11 @@ submenu \"GNU system, old configurations...\" {~%")
;; root partition. ;; root partition.
(setenv "GRUB_ENABLE_CRYPTODISK" "y") (setenv "GRUB_ENABLE_CRYPTODISK" "y")
(unless (zero? (system* grub "--no-floppy" "--target=i386-pc" ;; Hide potentially confusing messages from the user, such as
;; "Installing for i386-pc platform."
(invoke/quiet grub "--no-floppy" "--target=i386-pc"
"--boot-directory" install-dir "--boot-directory" install-dir
device)) device))))
(error "failed to install GRUB (BIOS)")))))
(define install-grub-efi (define install-grub-efi
#~(lambda (bootloader efi-dir mount-point) #~(lambda (bootloader efi-dir mount-point)
@ -388,10 +389,9 @@ submenu \"GNU system, old configurations...\" {~%")
;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or
;; root partition. ;; root partition.
(setenv "GRUB_ENABLE_CRYPTODISK" "y") (setenv "GRUB_ENABLE_CRYPTODISK" "y")
(unless (zero? (system* grub-install "--boot-directory" install-dir (invoke/quiet grub-install "--boot-directory" install-dir
"--bootloader-id=Guix" "--bootloader-id=Guix"
"--efi-directory" target-esp)) "--efi-directory" target-esp))))
(error "failed to install GRUB (EFI)")))))

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -17,8 +18,15 @@
;;; 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 build bootloader) (define-module (gnu build bootloader)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (ice-9 binary-ports) #:use-module (ice-9 binary-ports)
#:export (write-file-on-device)) #:use-module (ice-9 popen)
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 format)
#:export (write-file-on-device
invoke/quiet))
;;; ;;;
@ -35,3 +43,56 @@
(seek output offset SEEK_SET) (seek output offset SEEK_SET)
(put-bytevector output bv)) (put-bytevector output bv))
#:binary #t))))) #:binary #t)))))
(define-syntax-rule (G_ str) str) ;for xgettext
(define (open-pipe-with-stderr program . args)
"Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect
both its standard output and standard error to the pipe. Return two value:
the pipe to read PROGRAM's data from, and the PID of the child process running
PROGRAM."
;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why
;; we need to roll our own.
(match (pipe)
((input . output)
(match (primitive-fork)
(0
(dynamic-wind
(const #t)
(lambda ()
(close-port input)
(dup2 (fileno output) 1)
(dup2 (fileno output) 2)
(apply execlp program program args))
(lambda ()
(primitive-exit 127))))
(pid
(close-port output)
(values input pid))))))
;; TODO: Move to (guix build utils) on the next rebuild cycle.
(define (invoke/quiet program . args)
"Invoke PROGRAM with ARGS and capture PROGRAM's standard output and standard
error. If PROGRAM succeeds, print nothing and return the unspecified value;
otherwise, raise a '&message' error condition that includes the status code
and the output of PROGRAM."
(define-values (pipe pid)
(apply open-pipe-with-stderr program args))
(let loop ((lines '()))
(match (read-line pipe)
((? eof-object?)
(close-port pipe)
(match (waitpid pid)
((_ . status)
(unless (zero? status)
(raise (condition
(&message
(message (format #f (G_ "'~a~{ ~a~}' exited with status ~a; \
output follows:~%~%~{ ~a~%~}")
program args
(or (status:exit-val status)
status)
(reverse lines))))))))))
(line
(loop (cons line lines))))))

View File

@ -10,7 +10,7 @@
# Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com> # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org> # Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
@ -212,6 +212,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gobby.scm \ %D%/packages/gobby.scm \
%D%/packages/golang.scm \ %D%/packages/golang.scm \
%D%/packages/gperf.scm \ %D%/packages/gperf.scm \
%D%/packages/gpodder.scm \
%D%/packages/gprolog.scm \ %D%/packages/gprolog.scm \
%D%/packages/gps.scm \ %D%/packages/gps.scm \
%D%/packages/graph.scm \ %D%/packages/graph.scm \
@ -364,6 +365,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/perl-check.scm \ %D%/packages/perl-check.scm \
%D%/packages/perl-compression.scm \ %D%/packages/perl-compression.scm \
%D%/packages/perl-web.scm \ %D%/packages/perl-web.scm \
%D%/packages/perl6.scm \
%D%/packages/photo.scm \ %D%/packages/photo.scm \
%D%/packages/phabricator.scm \ %D%/packages/phabricator.scm \
%D%/packages/php.scm \ %D%/packages/php.scm \
@ -569,6 +571,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/monitoring.scm \ %D%/tests/monitoring.scm \
%D%/tests/nfs.scm \ %D%/tests/nfs.scm \
%D%/tests/install.scm \ %D%/tests/install.scm \
%D%/tests/ldap.scm \
%D%/tests/mail.scm \ %D%/tests/mail.scm \
%D%/tests/messaging.scm \ %D%/tests/messaging.scm \
%D%/tests/networking.scm \ %D%/tests/networking.scm \
@ -651,6 +654,7 @@ dist_patch_DATA = \
%D%/packages/patches/aria2-CVE-2019-3500.patch \ %D%/packages/patches/aria2-CVE-2019-3500.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/aspell-gcc-compat.patch \
%D%/packages/patches/at-spi2-core-meson-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
@ -671,6 +675,8 @@ dist_patch_DATA = \
%D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/biber-fix-encoding-write.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blender-2.79-newer-ffmpeg.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
%D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/boost-fix-icu-build.patch \
%D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \
@ -706,8 +712,6 @@ dist_patch_DATA = \
%D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \
%D%/packages/patches/cpio-CVE-2016-2037.patch \ %D%/packages/patches/cpio-CVE-2016-2037.patch \
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \
%D%/packages/patches/cracklib-CVE-2016-6318.patch \
%D%/packages/patches/cracklib-fix-buffer-overflow.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/clucene-contribs-lib.patch \
@ -726,10 +730,10 @@ dist_patch_DATA = \
%D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/docker-fix-tests.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/doxygen-test.patch \
%D%/packages/patches/dropbear-CVE-2018-15599.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/efl-mesa-compat.patch \ %D%/packages/patches/efl-mesa-compat.patch \
%D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elixir-path-length.patch \
%D%/packages/patches/einstein-build.patch \ %D%/packages/patches/einstein-build.patch \
%D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \
@ -933,6 +937,7 @@ dist_patch_DATA = \
%D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \
%D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \
%D%/packages/patches/knot-include-system-lmdb-header.patch \
%D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \
%D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-paths.patch \
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
@ -968,10 +973,8 @@ dist_patch_DATA = \
%D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \
%D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \
%D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \
%D%/packages/patches/libextractor-CVE-2018-20430.patch \ %D%/packages/patches/libgit2-avoid-python.patch \
%D%/packages/patches/libextractor-CVE-2018-20431.patch \
%D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgit2-mtime-0.patch \
%D%/packages/patches/libgit2-oom-test.patch \
%D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-fix-tests.patch \
%D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \
%D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnome-encoding.patch \
@ -1178,6 +1181,7 @@ dist_patch_DATA = \
%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 \
%D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \
%D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-testtools.patch \
%D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \
@ -1289,6 +1293,7 @@ dist_patch_DATA = \
%D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \
%D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \
%D%/packages/patches/totem-meson-compat.patch \
%D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \
%D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/twinkle-include-qregexpvalidator.patch \ %D%/packages/patches/twinkle-include-qregexpvalidator.patch \

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw> ;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>

View File

@ -12,7 +12,7 @@
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
@ -1598,13 +1598,13 @@ of supported upstream metrics systems simultaneously.")
(define-public ansible (define-public ansible
(package (package
(name "ansible") (name "ansible")
(version "2.7.8") (version "2.7.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ansible" version)) (uri (pypi-uri "ansible" version))
(sha256 (sha256
(base32 "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx")))) (base32 "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-bcrypt" ,python-bcrypt) `(("python-bcrypt" ,python-bcrypt)
@ -2699,7 +2699,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.0.22-1") (version "3.0.32-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2708,7 +2708,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "1br392s3xc2nwqmfx4nwb3i97wjwasvkq8ayr8jq72mi5qzsgizn")))) (base32 "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)

View File

@ -43,6 +43,7 @@
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages tex) #:use-module (gnu packages tex)
@ -52,6 +53,7 @@
#:use-module (guix build-system ant) #:use-module (guix build-system ant)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -380,7 +382,7 @@ fast arithmetic.")
(define-public arb (define-public arb
(package (package
(name "arb") (name "arb")
(version "2.14.0") (version "2.16.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -389,7 +391,7 @@ fast arithmetic.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554")))) "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("flint" ,flint))) ; flint.h is included by arf.h `(("flint" ,flint))) ; flint.h is included by arf.h
@ -421,6 +423,38 @@ real and complex numbers, with automatic, rigorous error control.")
(license license:lgpl2.1+) (license license:lgpl2.1+)
(home-page "http://fredrikj.net/arb/"))) (home-page "http://fredrikj.net/arb/")))
(define-public python-flint
(package
(name "python-flint")
(version "0.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fredrik-johansson/python-flint.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1v0anazbj1cfi68nl2j6dbd31kgkc1563xmr0zk5xk3xj78569pw"))
(patches (search-patches "python-flint-includes.patch"))))
(build-system python-build-system)
(native-inputs
`(("python-cython" ,python-cython)))
(propagated-inputs
`(("python-numpy" ,python-numpy)))
(inputs
`(("arb" ,arb)
("flint" ,flint)))
(synopsis "Python module wrapping ARB and FLINT")
(description
"Python-flint is a Python extension module wrapping FLINT
(Fast Library for Number Theory) and Arb (arbitrary-precision ball
arithmetic). It supports integers, rationals, modular integers,
real and complex ball arithmetic, polynomials and matrices over all
these types and other mathematical functions.")
(license license:expat)
(home-page "http://fredrikj.net/python-flint/")))
(define-public ntl (define-public ntl
(package (package
(name "ntl") (name "ntl")

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com> ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -263,7 +263,7 @@ waveform until they line up with the proper sounds.")
(define-public pencil2d (define-public pencil2d
(package (package
(name "pencil2d") (name "pencil2d")
(version "0.6.2") (version "0.6.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -272,7 +272,7 @@ waveform until they line up with the proper sounds.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1iv7drwxs32mqs3hybjx2lxyqn8cv2b4rw9ny7gzdacsbhi65knr")))) "097xwvhw7vl9pgknhb40zs6adf7mb1xxfc73h4kiqgp6z59prjl3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)

View File

@ -18,20 +18,24 @@
(define-module (gnu packages arcan) (define-module (gnu packages arcan)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#: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 packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages ocr) #:use-module (gnu packages ocr)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
@ -39,8 +43,10 @@
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public arcan (define-public arcan
@ -177,3 +183,102 @@ engine programmable using Lua.")
"-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off" "-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off"
"-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on")))))
(synopsis "Combined display server, multimedia framework and game engine (SDL)"))) (synopsis "Combined display server, multimedia framework and game engine (SDL)")))
(define-public xarcan
(let ((commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3")
(revision "1" ))
(package
(name "xarcan")
(version (git-version "0.5.4" revision commit))
(source
(origin
(method git-fetch)
(file-name (git-file-name name version))
(uri (git-reference
(url "https://github.com/letoram/xarcan.git")
(commit commit)))
(sha256
(base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
`("--enable-kdrive" "--enable-xarcan"
"--disable-xorg" "--disable-xwayland"
"--disable-xnest" "--disable-xvfb"
"--enable-glamor" "--enable-glx"
"--disable-int10-module" "--enable-ipv6"
"--enable-record" "--without-systemd-daemon"
"--enable-xcsecurity" "--disable-static"
,(string-append "--with-xkb-path="
(assoc-ref %build-inputs "xkeyboard-config")
"/share/X11/xkb")
,(string-append "--with-xkb-bin-directory="
(assoc-ref %build-inputs "xkbcomp")
"/bin")
,(string-append "--with-xkb-output="
"/tmp")) ; FIXME: Copied from xorg
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'noconfigure
(lambda _
(setenv "NOCONFIGURE" "true")
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("util-macros" ,util-macros)))
(inputs
`(("arcan" ,arcan)
("font-util" ,font-util)
("libdrm" ,libdrm)
("libepoxy" ,libepoxy)
("libkbfile" ,libxkbfile)
("libressl" ,libressl)
("libx11" ,libx11)
("libxfont2" ,libxfont2)
("mesa" ,mesa)
("pixman" ,pixman)
("xkeyboard-config" ,xkeyboard-config)
("xkbcomp" ,xkbcomp)
("xorgproto" ,xorgproto)
("xtrans" ,xtrans)))
(home-page "https://arcan-fe.com")
(synopsis "Patched Xserver that bridges connections to Arcan")
(description "Patched Xserver with a KDrive backend that uses the arcan-shmif
to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session
as a window under Arcan.")
(license license:expat))))
(define-public arcan-wayland
(package
(inherit arcan)
(name "arcan-wayland")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("arcan" ,arcan)
("libseccomp" ,libseccomp)
("libxkbcommon" ,libxkbcommon)
("mesa" ,mesa)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(arguments
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'chdir
(lambda _
(chdir "src/tools/waybridge")
#t))
(add-after 'unpack 'fix-cmake-find-shmif
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake"
(("/usr/local") (assoc-ref inputs "arcan")))
#t)))))
(synopsis "Wayland protocol service for Arcan")
(description "Arcan-wayland (waybridge) bridges Wayland connections
with an Arcan connection point. It allows Wayland compatible clients
to connect and render using Arcan.")
(license license:bsd-3)))

View File

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
@ -156,14 +156,14 @@ Filter) modules follow the convention of 1V / Octave.")
(define-public aubio (define-public aubio
(package (package
(name "aubio") (name "aubio")
(version "0.4.6") (version "0.4.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://aubio.org/pub/aubio-" version ".tar.bz2")) "https://aubio.org/pub/aubio-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx")))) "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -2120,17 +2120,17 @@ different audio devices such as ALSA or PulseAudio.")
(define-public qjackctl (define-public qjackctl
(package (package
(name "qjackctl") (name "qjackctl")
(version "0.5.5") (version "0.5.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
version "/qjackctl-" version ".tar.gz")) version "/qjackctl-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5")))) "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ;; no check target '(#:tests? #f ; no check target
;; Disable xunique to prevent X hanging when starting qjackctl in ;; Disable xunique to prevent X hanging when starting qjackctl in
;; tiling window managers such as StumpWM or i3 ;; tiling window managers such as StumpWM or i3
;; (see https://github.com/rncbc/qjackctl/issues/13). ;; (see https://github.com/rncbc/qjackctl/issues/13).
@ -2865,15 +2865,14 @@ interface.")
(define-public qsynth (define-public qsynth
(package (package
(name "qsynth") (name "qsynth")
(version "0.5.4") (version "0.5.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/qsynth/qsynth/" version (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version
"/qsynth-" version ".tar.gz")) "/qsynth-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5"))))
"0kpq5fxr96wnii18ax780w1ivq8ksk892ac0bprn92iz0asfysrd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" phase `(#:tests? #f ; no "check" phase

View File

@ -5,7 +5,7 @@
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>

View File

@ -1,5 +1,5 @@
/* GNU Guix --- Functional package management for GNU /* GNU Guix --- Functional package management for GNU
Copyright (C) 2018 Ludovic Courtès <ludo@gnu.org> Copyright (C) 2018, 2019 Ludovic Courtès <ludo@gnu.org>
This file is part of GNU Guix. This file is part of GNU Guix.
@ -211,6 +211,46 @@ disallow_setgroups (pid_t pid)
close (fd); close (fd);
} }
#ifdef PROOT_PROGRAM
/* Execute the wrapped program with PRoot, passing it ARGC and ARGV, and
"bind-mounting" STORE in the right place. */
static void
exec_with_proot (const char *store, int argc, char *argv[])
{
int proot_specific_argc = 4;
int proot_argc = argc + proot_specific_argc;
char *proot_argv[proot_argc], *proot;
char bind_spec[strlen (store) + 1 + sizeof "@STORE_DIRECTORY@"];
strcpy (bind_spec, store);
strcat (bind_spec, ":");
strcat (bind_spec, "@STORE_DIRECTORY@");
proot = concat (store, PROOT_PROGRAM);
proot_argv[0] = proot;
proot_argv[1] = "-b";
proot_argv[2] = bind_spec;
proot_argv[3] = "@WRAPPED_PROGRAM@";
for (int i = 0; i < argc; i++)
proot_argv[i + proot_specific_argc] = argv[i + 1];
proot_argv[proot_argc] = NULL;
/* Seccomp support seems to invariably lead to segfaults; disable it by
default. */
setenv ("PROOT_NO_SECCOMP", "1", 0);
int err = execv (proot, proot_argv);
if (err < 0)
assert_perror (errno);
}
#endif
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
@ -274,6 +314,10 @@ main (int argc, char *argv[])
break; break;
case -1: case -1:
rm_rf (new_root);
#ifdef PROOT_PROGRAM
exec_with_proot (store, argc, argv);
#else
fprintf (stderr, "%s: error: 'clone' failed: %m\n", argv[0]); fprintf (stderr, "%s: error: 'clone' failed: %m\n", argv[0]);
fprintf (stderr, "\ fprintf (stderr, "\
This may be because \"user namespaces\" are not supported on this system.\n\ This may be because \"user namespaces\" are not supported on this system.\n\
@ -281,6 +325,7 @@ Consequently, we cannot run '@WRAPPED_PROGRAM@',\n\
unless you move it to the '@STORE_DIRECTORY@' directory.\n\ unless you move it to the '@STORE_DIRECTORY@' directory.\n\
\n\ \n\
Please refer to the 'guix pack' documentation for more information.\n"); Please refer to the 'guix pack' documentation for more information.\n");
#endif
return EXIT_FAILURE; return EXIT_FAILURE;
default: default:

View File

@ -980,14 +980,14 @@ precious backup space.
(define-public burp (define-public burp
(package (package
(name "burp") (name "burp")
(version "2.3.0") (version "2.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/burp/burp-" version (uri (string-append "mirror://sourceforge/burp/burp-" version
"/burp-" version ".tar.bz2")) "/burp-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0in49c0ir7lb7jli0fcphdq1nh5rclhans4ngm7z7hzyxa4jrgri")))) "1nkkn0nfydn39cl5rxd1wbmzizird6z05j9h2xr7xczdlhhjnaai"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("librsync" ,librsync) `(("librsync" ,librsync)

View File

@ -38,14 +38,14 @@
(define-public fio (define-public fio
(package (package
(name "fio") (name "fio")
(version "3.11") (version "3.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://brick.kernel.dk/snaps/" (uri (string-append "http://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2")) "fio-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0s8m0wcz5j6sa1hblj80wk3syy5b4shg7y3gabvm9xa3wj0lzasa")))) "0ddj7zm04jqlna3w61qyp4qvwnv0r2lc1hzpwrgbvv4fq581w7d2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:test-target "test" '(#:test-target "test"

View File

@ -770,14 +770,14 @@ packages.")
(define-public r-annotate (define-public r-annotate
(package (package
(name "r-annotate") (name "r-annotate")
(version "1.60.0") (version "1.60.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "annotate" version)) (uri (bioconductor-uri "annotate" version))
(sha256 (sha256
(base32 (base32
"0p6c96lay23a67dyirgnwzm2yw22m592z780vy6p4nqwla8ha18n")))) "0pk6ayr3vyqxk850ljkbyil4i382ngfqcbxlv0qrp62yfqgzcjwp"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi) `(("r-annotationdbi" ,r-annotationdbi)
@ -2483,3 +2483,41 @@ Linnorm can work with raw count, CPM, RPKM, FPKM and TPM. Additionally, the
@code{RnaXSim} function is included for simulating RNA-seq data for the @code{RnaXSim} function is included for simulating RNA-seq data for the
evaluation of DEG analysis methods.") evaluation of DEG analysis methods.")
(license license:expat))) (license license:expat)))
(define-public r-ioniser
(package
(name "r-ioniser")
(version "2.6.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "IONiseR" version))
(sha256
(base32
"01lqisdlsvym8nhgpzn7lpcddk9lv9253dy9v65r2dicb5xqhj00"))))
(properties `((upstream-name . "IONiseR")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)
("r-biocparallel" ,r-biocparallel)
("r-biostrings" ,r-biostrings)
("r-bit64" ,r-bit64)
("r-dplyr" ,r-dplyr)
("r-ggplot2" ,r-ggplot2)
("r-magrittr" ,r-magrittr)
("r-rhdf5" ,r-rhdf5)
("r-shortread" ,r-shortread)
("r-stringr" ,r-stringr)
("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr)
("r-xvector" ,r-xvector)))
(home-page "https://bioconductor.org/packages/IONiseR/")
(synopsis "Quality assessment tools for Oxford Nanopore MinION data")
(description
"IONiseR provides tools for the quality assessment of Oxford Nanopore
MinION data. It extracts summary statistics from a set of fast5 files and can
be used either before or after base calling. In addition to standard
summaries of the read-types produced, it provides a number of plots for
visualising metrics relative to experiment run time or spatially over the
surface of a flowcell.")
(license license:expat)))

View File

@ -40,6 +40,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system haskell) #:use-module (guix build-system haskell)
#:use-module (guix build-system meson)
#:use-module (guix build-system ocaml) #:use-module (guix build-system ocaml)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -477,6 +478,169 @@ BED, GFF/GTF, VCF.")
(base32 (base32
"0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5")))))) "0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5"))))))
(define-public pbbam
(package
(name "pbbam")
(version "0.23.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/PacificBiosciences/pbbam.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0h9gkrpf2lrxklxp72xfl5bi3h5zcm5hprrya9gf0hr3xwlbpp0x"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'find-googletest
(lambda* (#:key inputs #:allow-other-keys)
;; It doesn't find gtest_main because there's no pkg-config file
;; for it. Find it another way.
(substitute* "tests/meson.build"
(("pbbam_gtest_dep = dependency\\('gtest_main'.*")
(format #f "cpp = meson.get_compiler('cpp')
pbbam_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n"
(assoc-ref inputs "googletest"))))
#t)))
;; TODO: tests/pbbam_test cannot be linked
;; ld: tests/59830eb@@pbbam_test@exe/src_test_Accuracy.cpp.o:
;; undefined reference to symbol '_ZTIN7testing4TestE'
;; ld: /gnu/store/...-googletest-1.8.0/lib/libgtest.so:
;; error adding symbols: DSO missing from command line
#:tests? #f
#:configure-flags '("-Dtests=false")))
;; These libraries are listed as "Required" in the pkg-config file.
(propagated-inputs
`(("htslib" ,htslib)
("zlib" ,zlib)))
(inputs
`(("boost" ,boost)
("samtools" ,samtools)))
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)
("python" ,python-wrapper))) ; for tests
(home-page "https://github.com/PacificBiosciences/pbbam")
(synopsis "Work with PacBio BAM files")
(description
"The pbbam software package provides components to create, query, and
edit PacBio BAM files and associated indices. These components include a core
C++ library, bindings for additional languages, and command-line utilities.
This library is not intended to be used as a general-purpose BAM utility - all
input and output BAMs must adhere to the PacBio BAM format specification.
Non-PacBio BAMs will cause exceptions to be thrown.")
(license license:bsd-3)))
(define-public blasr-libcpp
(package
(name "blasr-libcpp")
(version "5.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/PacificBiosciences/blasr_libcpp.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0cn5l42zyq67sj0g2imqkhayz2iqvv0a1pgpbmlq0qynjmsrbfd2"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'link-with-hdf5
(lambda* (#:key inputs #:allow-other-keys)
(let ((hdf5 (assoc-ref inputs "hdf5")))
(substitute* "meson.build"
(("libblasr_deps = \\[" m)
(string-append
m
(format #f "cpp.find_library('hdf5', dirs : '~a'), \
cpp.find_library('hdf5_cpp', dirs : '~a'), "
hdf5 hdf5)))))
#t))
(add-after 'unpack 'find-googletest
(lambda* (#:key inputs #:allow-other-keys)
;; It doesn't find gtest_main because there's no pkg-config file
;; for it. Find it another way.
(substitute* "unittest/meson.build"
(("libblasr_gtest_dep = dependency\\('gtest_main'.*")
(format #f "cpp = meson.get_compiler('cpp')
libblasr_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n"
(assoc-ref inputs "googletest"))))
#t)))
;; TODO: unittest/libblasr_unittest cannot be linked
;; ld: ;; unittest/df08227@@libblasr_unittest@exe/alignment_utils_FileUtils_gtest.cpp.o:
;; undefined reference to symbol
;; '_ZN7testing8internal9DeathTest6CreateEPKcPKNS0_2REES3_iPPS1_'
;; ld: /gnu/store/...-googletest-1.8.0/lib/libgtest.so:
;; error adding symbols: DSO missing from command line
#:tests? #f
#:configure-flags '("-Dtests=false")))
(inputs
`(("boost" ,boost)
("hdf5" ,hdf5)
("pbbam" ,pbbam)
("zlib" ,zlib)))
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/PacificBiosciences/blasr_libcpp")
(synopsis "Library for analyzing PacBio genomic sequences")
(description
"This package provides three libraries used by applications for analyzing
PacBio genomic sequences. This library contains three sub-libraries: pbdata,
hdf and alignment.")
(license license:bsd-3)))
(define-public blasr
(package
(name "blasr")
(version "5.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/PacificBiosciences/blasr.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1skgy2mvz8gsgfh1gc2nfgwvpyzb1hpmp2cf2773h5wsj8nw22kl"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'link-with-hdf5
(lambda* (#:key inputs #:allow-other-keys)
(let ((hdf5 (assoc-ref inputs "hdf5")))
(substitute* "meson.build"
(("blasr_deps = \\[" m)
(string-append
m
(format #f "cpp.find_library('hdf5', dirs : '~a'), \
cpp.find_library('hdf5_cpp', dirs : '~a'), "
hdf5 hdf5)))))
#t)))
;; Tests require "cram" executable, which is not packaged.
#:tests? #f
#:configure-flags '("-Dtests=false")))
(inputs
`(("boost" ,boost)
("blasr-libcpp" ,blasr-libcpp)
("hdf5" ,hdf5)
("pbbam" ,pbbam)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/PacificBiosciences/blasr")
(synopsis "PacBio long read aligner")
(description
"Blasr is a genomic sequence aligner for processing PacBio long reads.")
(license license:bsd-3)))
(define-public ribotaper (define-public ribotaper
(package (package
(name "ribotaper") (name "ribotaper")
@ -732,20 +896,30 @@ Python.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1rna16lyk5aqhnv0dp77wwaplias93f1vw28ad3jmyw6hwkai05v")))) "1rna16lyk5aqhnv0dp77wwaplias93f1vw28ad3jmyw6hwkai05v"))
(modules '((guix build utils)))
(snippet '(begin
;; Delete generated C files.
(for-each delete-file (find-files "." "\\.c"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'use-cython (add-after 'unpack 'use-cython
(lambda _ (setenv "USE_CYTHON" "1") #t)) (lambda _ (setenv "USE_CYTHON" "1") #t))
(add-after 'unpack 'disable-broken-test (add-after 'unpack 'disable-broken-tests
(lambda _ (lambda _
(substitute* "biom/tests/test_cli/test_validate_table.py" (substitute* "biom/tests/test_cli/test_validate_table.py"
(("^(.+)def test_invalid_hdf5" m indent) (("^(.+)def test_invalid_hdf5" m indent)
(string-append indent (string-append indent
"@npt.dec.skipif(True, msg='Guix')\n" "@npt.dec.skipif(True, msg='Guix')\n"
m))) m)))
(substitute* "biom/tests/test_table.py"
(("^(.+)def test_from_hdf5_issue_731" m indent)
(string-append indent
"@npt.dec.skipif(True, msg='Guix')\n"
m)))
#t)) #t))
(add-before 'reset-gzip-timestamps 'make-files-writable (add-before 'reset-gzip-timestamps 'make-files-writable
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1570,6 +1744,47 @@ the original BWA alignment program and shares the genome index structure as
well as many of the command line options.") well as many of the command line options.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public bwa-meth
(package
(name "bwa-meth")
(version "0.2.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brentp/bwa-meth.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"17j31i7zws5j7mhsq9x3qgkxly6mlmrgwhfq0qbflgxrmx04yaiz"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'keep-references-to-bwa
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "bwameth.py"
(("bwa mem")
(string-append (which "bwa") " mem"))
;; There's an ill-advised check for "samtools" on PATH.
(("^checkX.*") ""))
#t)))))
(inputs
`(("bwa" ,bwa)))
(native-inputs
`(("python-toolshed" ,python-toolshed)))
(home-page "https://github.com/brentp/bwa-meth")
(synopsis "Fast and accurante alignment of BS-Seq reads")
(description
"BWA-Meth works for single-end reads and for paired-end reads from the
directional protocol (most common). It uses the method employed by
methylcoder and Bismark of in silico conversion of all C's to T's in both
reference and reads. It recovers the original read (needed to tabulate
methylation) by attaching it as a comment which BWA appends as a tag to the
read. It performs favorably to existing aligners gauged by number of on and
off-target reads for a capture method that targets CpG-rich region.")
(license license:expat)))
(define-public python-bx-python (define-public python-bx-python
(package (package
(name "python-bx-python") (name "python-bx-python")
@ -6132,6 +6347,28 @@ sequences.")
;; STAR is licensed under GPLv3 or later; htslib is MIT-licensed. ;; STAR is licensed under GPLv3 or later; htslib is MIT-licensed.
(license license:gpl3+))) (license license:gpl3+)))
(define-public starlong
(package (inherit star)
(name "starlong")
(arguments
(substitute-keyword-arguments (package-arguments star)
((#:make-flags flags)
`(list "STARlong"))
((#:phases phases)
`(modify-phases ,phases
;; Allow extra long sequence reads.
(add-after 'unpack 'make-extra-long
(lambda _
(substitute* "source/IncludeDefine.h"
(("(#define DEF_readNameLengthMax ).*" _ match)
(string-append match "900000\n")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(install-file "STARlong" bin))
#t))))))))
(define-public subread (define-public subread
(package (package
(name "subread") (name "subread")
@ -6482,14 +6719,14 @@ distribution.")
(define-public r-dexseq (define-public r-dexseq
(package (package
(name "r-dexseq") (name "r-dexseq")
(version "1.28.2") (version "1.28.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DEXSeq" version)) (uri (bioconductor-uri "DEXSeq" version))
(sha256 (sha256
(base32 (base32
"134znafy7hn38rp4nia4pglz56fz6nbkxrf7z2k1sajfsgxa1hs6")))) "1wsj1kqfrakmjnlplxmrv17r2spzcdkmwdkhggyjbf8mdhqs3w16"))))
(properties `((upstream-name . "DEXSeq"))) (properties `((upstream-name . "DEXSeq")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -6603,14 +6840,14 @@ Enrichment Analysis} (GSEA).")
(define-public r-category (define-public r-category
(package (package
(name "r-category") (name "r-category")
(version "2.48.0") (version "2.48.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Category" version)) (uri (bioconductor-uri "Category" version))
(sha256 (sha256
(base32 (base32
"1jdm83bwdfhpfm1y6hwgvxzj6l83h1bdkqv23799kzywnwm016kv")))) "18rsxlwa1l06i635cnznb9b2zssqcgb71pihky29gl2gwp7a654b"))))
(properties `((upstream-name . "Category"))) (properties `((upstream-name . "Category")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -7361,13 +7598,13 @@ CAGE.")
(define-public r-variantannotation (define-public r-variantannotation
(package (package
(name "r-variantannotation") (name "r-variantannotation")
(version "1.28.11") (version "1.28.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "VariantAnnotation" version)) (uri (bioconductor-uri "VariantAnnotation" version))
(sha256 (sha256
(base32 (base32
"19bxi5b9fzqdjadb8bfm8xsgi6nvrwbgn1xcpk59bnmv9vzjkwrh")))) "1a7b0bg579ynpbfh5dk87fdgl62r9cwk4zmrl61m6zil7881p3gh"))))
(properties (properties
`((upstream-name . "VariantAnnotation"))) `((upstream-name . "VariantAnnotation")))
(inputs (inputs
@ -7802,13 +8039,13 @@ as well as query and modify the browser state, such as the current viewport.")
(define-public r-genomicfeatures (define-public r-genomicfeatures
(package (package
(name "r-genomicfeatures") (name "r-genomicfeatures")
(version "1.34.4") (version "1.34.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicFeatures" version)) (uri (bioconductor-uri "GenomicFeatures" version))
(sha256 (sha256
(base32 (base32
"09gc1vbqszrr3ixv4hsfan2l18fcf3gg58783mrfwjv6ci9c4w0d")))) "1cz7qx324dmsrkzyhm956cfgr08gpily5rpym7hc8zz5kbl6i3ra"))))
(properties (properties
`((upstream-name . "GenomicFeatures"))) `((upstream-name . "GenomicFeatures")))
(build-system r-build-system) (build-system r-build-system)
@ -9068,14 +9305,14 @@ trait.")
(define-public r-maldiquant (define-public r-maldiquant
(package (package
(name "r-maldiquant") (name "r-maldiquant")
(version "1.18") (version "1.19.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "MALDIquant" version)) (uri (cran-uri "MALDIquant" version))
(sha256 (sha256
(base32 (base32
"18nl214xjsxkcpbg79jkmw0yznwm5szyh2qb84n7ip46mm779ha6")))) "11zbvm1vw8zn2vmymvydgdczvwj961s2knvrn1q4gbziwi5gqvlc"))))
(properties `((upstream-name . "MALDIquant"))) (properties `((upstream-name . "MALDIquant")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/MALDIquant") (home-page "https://cran.r-project.org/web/packages/MALDIquant")
@ -9579,14 +9816,14 @@ Shiny-based display methods for Bioconductor objects.")
(define-public r-annotationhub (define-public r-annotationhub
(package (package
(name "r-annotationhub") (name "r-annotationhub")
(version "2.14.4") (version "2.14.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "AnnotationHub" version)) (uri (bioconductor-uri "AnnotationHub" version))
(sha256 (sha256
(base32 (base32
"18v2mk395svq3c19wzi6bjwjfnmrvjqkzmj7cmaji7rx4xdgz6ck")))) "0iyrxaijl4614iz5c1j53227xy2g756p3bx7hcwglcybh0k30nki"))))
(properties `((upstream-name . "AnnotationHub"))) (properties `((upstream-name . "AnnotationHub")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -12899,14 +13136,14 @@ analyses in addition to large-scale sequence-level searches.")
(define-public r-diversitree (define-public r-diversitree
(package (package
(name "r-diversitree") (name "r-diversitree")
(version "0.9-10") (version "0.9-11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "diversitree" version)) (uri (cran-uri "diversitree" version))
(sha256 (sha256
(base32 (base32
"0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7")))) "1jqfjmmaigq581l4zxysmkhld0xv6izlbr1hihf9zplkix36majc"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("gfortran" ,gfortran))) `(("gfortran" ,gfortran)))
@ -12915,7 +13152,7 @@ analyses in addition to large-scale sequence-level searches.")
`(("r-ape" ,r-ape) `(("r-ape" ,r-ape)
("r-desolve" ,r-desolve) ("r-desolve" ,r-desolve)
("r-rcpp" ,r-rcpp) ("r-rcpp" ,r-rcpp)
("r-suplex" ,r-subplex))) ("r-subplex" ,r-subplex)))
(home-page "https://www.zoology.ubc.ca/prog/diversitree") (home-page "https://www.zoology.ubc.ca/prog/diversitree")
(synopsis "Comparative 'phylogenetic' analyses of diversification") (synopsis "Comparative 'phylogenetic' analyses of diversification")
(description "This package contains a number of comparative \"phylogenetic\" (description "This package contains a number of comparative \"phylogenetic\"
@ -14031,7 +14268,12 @@ choosing which reads pass the filter.")
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "09j5gz57yr9i34a27vbl72i4g8syv2zzgmsfyjq02yshmnrvkjs6")))) (base32 "09j5gz57yr9i34a27vbl72i4g8syv2zzgmsfyjq02yshmnrvkjs6"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "htslib")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -14070,7 +14312,7 @@ choosing which reads pass the filter.")
("hdf5" ,hdf5) ("hdf5" ,hdf5)
("htslib" ,htslib) ("htslib" ,htslib)
("perl" ,perl) ("perl" ,perl)
("python" ,python) ("python" ,python-wrapper)
("python-biopython" ,python-biopython) ("python-biopython" ,python-biopython)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("python-pysam" ,python-pysam) ("python-pysam" ,python-pysam)
@ -14152,6 +14394,82 @@ approximate the gradient at each iteration of gradient descent. This package
is a Cython wrapper for FIt-SNE.") is a Cython wrapper for FIt-SNE.")
(license license:bsd-4))) (license license:bsd-4)))
(define-public bbmap
(package
(name "bbmap")
(version "35.82")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/bbmap/BBMap_" version ".tar.gz"))
(sha256
(base32
"1q4rfhxcb6z3gm8zg2davjz98w22lkf4hm9ikxz9kdl93pil3wkd"))))
(build-system ant-build-system)
(arguments
`(#:build-target "dist"
#:tests? #f ; there are none
#:make-flags
(list (string-append "-Dmpijar="
(assoc-ref %build-inputs "java-openmpi")
"/lib/mpi.jar"))
#:modules ((guix build ant-build-system)
(guix build utils)
(guix build java-utils))
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-jni-library
(lambda _
(with-directory-excursion "jni"
(invoke "make" "-f" "makefile.linux"))))
;; There is no install target
(replace 'install (install-jars "dist"))
(add-after 'install 'install-scripts-and-documentation
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "calcmem.sh"
(("\\| awk ") (string-append "| " (which "awk") " ")))
(let* ((scripts (find-files "." "\\.sh$"))
(out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(doc (string-append out "/share/doc/bbmap"))
(jni (string-append out "/lib/jni")))
(substitute* scripts
(("\\$DIR\"\"docs") doc)
(("^CP=.*")
(string-append "CP=" out "/share/java/BBTools.jar\n"))
(("^NATIVELIBDIR.*")
(string-append "NATIVELIBDIR=" jni "\n"))
(("CMD=\"java")
(string-append "CMD=\"" (which "java"))))
(for-each (lambda (script) (install-file script bin)) scripts)
;; Install JNI library
(install-file "jni/libbbtoolsjni.so" jni)
;; Install documentation
(install-file "docs/readme.txt" doc)
(copy-recursively "docs/guides" doc))
#t)))
#:jdk ,openjdk11))
(inputs
`(("gawk" ,gawk)
("java-eclipse-jdt-core" ,java-eclipse-jdt-core)
("java-eclipse-jdt-compiler-apt" ,java-eclipse-jdt-compiler-apt)
("java-openmpi" ,java-openmpi)))
(home-page "http://sourceforge.net/projects/bbmap/")
(synopsis "Aligner and other tools for short sequencing reads")
(description
"This package provides bioinformatic tools to align, deduplicate,
reformat, filter and normalize DNA and RNA-seq data. It includes the
following tools: BBMap, a short read aligner for DNA and RNA-seq data; BBNorm,
a kmer-based error-correction and normalization tool; Dedupe, a tool to
simplify assemblies by removing duplicate or contained subsequences that share
a target percent identity; Reformat, to convert reads between
fasta/fastq/scarf/fasta+qual/sam, interleaved/paired, and ASCII-33/64, at over
500 MB/s; and BBDuk, a tool to filter, trim, or mask reads with kmer matches
to an artifact/contaminant file.")
(license license:bsd-3)))
(define-public velvet (define-public velvet
(package (package
(name "velvet") (name "velvet")
@ -14240,3 +14558,106 @@ repeated areas between contigs.")
"Velocyto is a library for the analysis of RNA velocity. Velocyto "Velocyto is a library for the analysis of RNA velocity. Velocyto
includes a command line tool and an analysis pipeline.") includes a command line tool and an analysis pipeline.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public arriba
(package
(name "arriba")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/suhrig/arriba/releases/"
"download/v" version "/arriba_v" version ".tar.gz"))
(sha256
(base32
"0jx9656ry766vb8z08m1c3im87b0c82qpnjby9wz4kcz8vn87dx2"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are none
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((htslib (assoc-ref inputs "htslib")))
(substitute* "Makefile"
(("-I\\$\\(HTSLIB\\)/htslib")
(string-append "-I" htslib "/include/htslib"))
((" \\$\\(HTSLIB\\)/libhts.a")
(string-append " " htslib "/lib/libhts.so"))))
(substitute* "run_arriba.sh"
(("^STAR ") (string-append (which "STAR") " "))
(("samtools --version-only")
(string-append (which "samtools") " --version-only"))
(("samtools index")
(string-append (which "samtools") " index"))
(("samtools sort")
(string-append (which "samtools") " sort")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "arriba" bin)
(install-file "run_arriba.sh" bin)
(install-file "draw_fusions.R" bin)
(wrap-program (string-append bin "/draw_fusions.R")
`("R_LIBS_SITE" ":" prefix (,(getenv "R_LIBS_SITE")))))
#t)))))
(inputs
`(("htslib" ,htslib)
("r-minimal" ,r-minimal)
("r-circlize" ,r-circlize)
("r-genomicalignments" ,r-genomicalignments)
("r-genomicranges" ,r-genomicranges)
("samtools" ,samtools)
("star" ,star)
("zlib" ,zlib)))
(home-page "https://github.com/suhrig/arriba")
(synopsis "Gene fusion detection from RNA-Seq data ")
(description
"Arriba is a command-line tool for the detection of gene fusions from
RNA-Seq data. It was developed for the use in a clinical research setting.
Therefore, short runtimes and high sensitivity were important design criteria.
It is based on the fast STAR aligner and the post-alignment runtime is
typically just around two minutes. In contrast to many other fusion detection
tools which build on STAR, Arriba does not require to reduce the
@code{alignIntronMax} parameter of STAR to detect small deletions.")
;; All code is under the Expat license with the exception of
;; "draw_fusions.R", which is under GPLv3.
(license (list license:expat license:gpl3))))
(define-public adapterremoval
(package
(name "adapterremoval")
(version "2.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/MikkelSchubert/adapterremoval.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1nf3ki5pfzalhrx2fr1y6pfqfi133yj2m7q4fj9irf5fb94bapwr"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "COLOR_BUILD=no"
(string-append "PREFIX="
(assoc-ref %outputs "out")))
#:test-target "test"
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(inputs
`(("zlib" ,zlib)))
(home-page "https://adapterremoval.readthedocs.io/")
(synopsis "Rapid sequence adapter trimming, identification, and read merging")
(description
"This program searches for and removes remnant adapter sequences from
@dfn{High-Throughput Sequencing} (HTS) data and (optionally) trims low quality
bases from the 3' end of reads following adapter removal. AdapterRemoval can
analyze both single end and paired end data, and can be used to merge
overlapping paired-ended reads into (longer) consensus sequences.
Additionally, the AdapterRemoval may be used to recover a consensus adapter
sequence for paired-ended data, for which this information is not available.")
(license license:gpl3+)))

View File

@ -160,7 +160,7 @@ files and generates build instructions for the Ninja build system.")
(define-public meson (define-public meson
(package (package
(name "meson") (name "meson")
(version "0.49.2") (version "0.50.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/" (uri (string-append "https://github.com/mesonbuild/meson/"
@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1z89f71r29laywx75bamjakybv9653wz0vd2l4xhvqy1dqr197zg")))) "07q2wz23wjfk8z66mli1cc9as0ycjp5f39fd4awny82qv8nw86ra"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH

View File

@ -9,7 +9,7 @@
;;; Copyright © 2017 John Darrington <jmd@gnu.org> ;;; Copyright © 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>

View File

@ -76,7 +76,7 @@
(define-public nss-certs (define-public nss-certs
(package (package
(name "nss-certs") (name "nss-certs")
(version "3.42.1") (version "3.43")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -87,7 +87,7 @@
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88")))) "1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out")) (outputs '("out"))
(native-inputs (native-inputs

View File

@ -23,11 +23,12 @@
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -353,8 +354,8 @@ and it supports a very flexible form of test discovery.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public go-gopkg.in-check.v1 (define-public go-gopkg.in-check.v1
(let ((commit "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec") (let ((commit "788fd78401277ebd861206a03c884797c6ec5541")
(revision "0")) (revision "1"))
(package (package
(name "go-gopkg.in-check.v1") (name "go-gopkg.in-check.v1")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -366,10 +367,12 @@ and it supports a very flexible form of test discovery.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np")))) "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "gopkg.in/check.v1")) '(#:import-path "gopkg.in/check.v1"))
(propagated-inputs
`(("go-github-com-kr-pretty" ,go-github-com-kr-pretty)))
(synopsis "Rich testing extension for Go's testing package") (synopsis "Rich testing extension for Go's testing package")
(description (description
"@code{check} is a rich testing extension for Go's testing package.") "@code{check} is a rich testing extension for Go's testing package.")
@ -530,6 +533,27 @@ for every Python test framework. It supports nose, py.test, and unittest.")
(define-public python2-parameterized (define-public python2-parameterized
(package-with-python2 python-parameterized)) (package-with-python2 python-parameterized))
(define-public python-minimock
(package
(name "python-minimock")
(version "1.2.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "MiniMock" version))
(sha256
(base32
"0k2sxb1ibnyg05iblz7zhbv825f1zk9906rab7883iqgvzmdzpsz"))))
(build-system python-build-system)
(home-page "https://pypi.org/project/MiniMock")
(synopsis "Simple Python library for using mock objects")
(description "MiniMock is a simple library for building mock objects with
doctest.")
(license license:expat)))
(define-public python2-minimock
(package-with-python2 python-minimock))
(define-public python-mock (define-public python-mock
(package (package
(name "python-mock") (name "python-mock")
@ -1981,14 +2005,13 @@ create data based on random numbers and yet remain repeatable.")
(define-public python-nose-timer (define-public python-nose-timer
(package (package
(name "python-nose-timer") (name "python-nose-timer")
(version "0.7.3") (version "0.7.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "nose-timer" version)) (uri (pypi-uri "nose-timer" version))
(sha256 (sha256
(base32 (base32 "04inck7l1sgkjbiinhifxk45wk2b3czbwh1x2a390hi183fq1q12"))))
"0hfz5aqnhf493i9kyb6prm4zm8vx7wmfsyg3nvsnh24lzh2kwx44"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-nose" ,python-nose) `(("python-nose" ,python-nose)
@ -2010,8 +2033,7 @@ create data based on random numbers and yet remain repeatable.")
(method url-fetch) (method url-fetch)
(uri (pypi-uri "freezegun" version)) (uri (pypi-uri "freezegun" version))
(sha256 (sha256
(base32 (base32 "1nh0fzqjwg88n57k3qa8mxnmiwrr7lqyd5xvc96qn5g8zcxv8fg8"))))
"1nh0fzqjwg88n57k3qa8mxnmiwrr7lqyd5xvc96qn5g8zcxv8fg8"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-mock" ,python-mock) `(("python-mock" ,python-mock)
@ -2041,13 +2063,13 @@ time by mocking the datetime module.")
(define-public python-flexmock (define-public python-flexmock
(package (package
(name "python-flexmock") (name "python-flexmock")
(version "0.10.2") (version "0.10.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "flexmock" version)) (uri (pypi-uri "flexmock" version))
(sha256 (sha256
(base32 (base32
"0arc6njvs6i9v9hgvzk5m50296g7zy5m9d7pyb43vdsdgxrci5gy")))) "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://flexmock.readthedocs.org") (home-page "https://flexmock.readthedocs.org")
(synopsis "Testing library for Python") (synopsis "Testing library for Python")

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

View File

@ -14,7 +14,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
@ -1782,14 +1782,16 @@ non-Windows systems without running the actual installer using wine.")
(define-public google-brotli (define-public google-brotli
(package (package
(name "google-brotli") (name "google-brotli")
(version "1.0.4") (version "1.0.7")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://github.com/google/brotli/archive/v" (method git-fetch)
version ".tar.gz")) (uri (git-reference
(url "https://github.com/google/brotli.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"))))
"1hrpmz162k4x3xm6vmbpm443jlfr1kp536p8962y2dncy7gs6s12"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases

View File

@ -211,18 +211,15 @@ provers.")
#t)) #t))
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "./remake") (invoke "./remake")))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "./remake" "check") (invoke "./remake" "check")))
#t))
;; TODO: requires coq-gappa and coq-interval. ;; TODO: requires coq-gappa and coq-interval.
;(invoke "./remake" "check-more") ;(invoke "./remake" "check-more")
(replace 'install (replace 'install
(lambda _ (lambda _
(invoke "./remake" "install") (invoke "./remake" "install"))))))
#t)))))
(home-page "http://flocq.gforge.inria.fr/") (home-page "http://flocq.gforge.inria.fr/")
(synopsis "Floating-point formalization for the Coq system") (synopsis "Floating-point formalization for the Coq system")
(description "Flocq (Floats for Coq) is a floating-point formalization for (description "Flocq (Floats for Coq) is a floating-point formalization for

View File

@ -113,14 +113,14 @@ are not used.")
(define-public r-sys (define-public r-sys
(package (package
(name "r-sys") (name "r-sys")
(version "3.0") (version "3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sys" version)) (uri (cran-uri "sys" version))
(sha256 (sha256
(base32 (base32
"1g0q1f56qmp3x5gja19qrmgk3j4d89yp16z1ziv1jn5p4dlmfpxh")))) "0aj3wcyah3r7c9s3rbs0c8nifd4vqmkzg9fqkrb7f838ww0qw24q"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/jeroen/sys") (home-page "https://github.com/jeroen/sys")
(synopsis "Powerful and reliable tools for running system commands in R") (synopsis "Powerful and reliable tools for running system commands in R")
@ -317,14 +317,14 @@ such as copy/paste from an R session.")
(define-public r-callr (define-public r-callr
(package (package
(name "r-callr") (name "r-callr")
(version "3.1.1") (version "3.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "callr" version)) (uri (cran-uri "callr" version))
(sha256 (sha256
(base32 (base32
"15l1qfa3aigba2ghgr2gwcjjy7anagrwg8khsd36fymwkmqj5g69")))) "1s5h2k7c1vgbry90xczin66q89cbkc6mvh4679l5rsz83087pd2b"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-r6" ,r-r6) `(("r-r6" ,r-r6)
@ -340,14 +340,14 @@ that.")
(define-public r-readxl (define-public r-readxl
(package (package
(name "r-readxl") (name "r-readxl")
(version "1.3.0") (version "1.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "readxl" version)) (uri (cran-uri "readxl" version))
(sha256 (sha256
(base32 (base32
"1p7snd8lznyinp0nyg6bsqwn9alh3pnnj77bfg865ingdl1d2yc3")))) "15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-cellranger" ,r-cellranger) `(("r-cellranger" ,r-cellranger)
@ -394,21 +394,20 @@ into a pipeline of data manipulation and visualisation.")
(define-public r-httpuv (define-public r-httpuv
(package (package
(name "r-httpuv") (name "r-httpuv")
(version "1.4.5.1") (version "1.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "httpuv" version)) (uri (cran-uri "httpuv" version))
(sha256 (sha256
(base32 (base32
"0mqd40jckdpkjw1jjd860cdwkb03l6dkh931maijfdaqr1w9hwvn")))) "19m9514yj5sg0rz1zvi8w1z98srnrql4iirgr794fkaap6bs7i2f"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs
`(("r-rcpp" ,r-rcpp)
("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("r-bh" ,r-bh) `(("r-bh" ,r-bh)
("r-later" ,r-later) ("r-later" ,r-later)
("r-promises" ,r-promises))) ("r-promises" ,r-promises)
("r-r6" ,r-r6)
("r-rcpp" ,r-rcpp)))
(home-page "https://github.com/rstudio/httpuv") (home-page "https://github.com/rstudio/httpuv")
(synopsis "HTTP and WebSocket server library for R") (synopsis "HTTP and WebSocket server library for R")
(description (description
@ -1082,14 +1081,14 @@ component analysis (with robust methods, and parallelized functions).")
(define-public r-ape (define-public r-ape
(package (package
(name "r-ape") (name "r-ape")
(version "5.2") (version "5.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ape" version)) (uri (cran-uri "ape" version))
(sha256 (sha256
(base32 (base32
"05b4yka5cirdgxd4d7iiaqvr428pk3j6n9q6dvg5j38kdj2h5sr7")))) "08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-lattice" ,r-lattice) `(("r-lattice" ,r-lattice)
@ -1138,13 +1137,13 @@ XML. To learn more about the Abbyy OCR API, see @url{http://ocrsdk.com/}.")
(define-public r-colorspace (define-public r-colorspace
(package (package
(name "r-colorspace") (name "r-colorspace")
(version "1.4-0") (version "1.4-1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "colorspace" version)) (uri (cran-uri "colorspace" version))
(sha256 (sha256
(base32 "0mpmvz2sycjp4c9y3v3qin7mdjy812hwi7cyjnblcw6xb1ckq06f")))) (base32 "0wyny3ah2d74hqv80s6imrarpna09gq3j9rjnz6zx2qg0lx72gb9"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/colorspace") (home-page "https://cran.r-project.org/web/packages/colorspace")
(synopsis "Color space manipulation") (synopsis "Color space manipulation")
@ -1158,14 +1157,14 @@ colors are provided.")
(define-public r-glue (define-public r-glue
(package (package
(name "r-glue") (name "r-glue")
(version "1.3.0") (version "1.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "glue" version)) (uri (cran-uri "glue" version))
(sha256 (sha256
(base32 (base32
"1vhw5497lpfr4m8lcx9bs0fgdp4ax0sycrk6n8yksp33qd25m7kq")))) "1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/tidyverse/glue") (home-page "https://github.com/tidyverse/glue")
(synopsis "Interpreted string literals") (synopsis "Interpreted string literals")
@ -1272,14 +1271,14 @@ processes. Most of its code is based on the @code{psutil} Python package.")
(define-public r-pkgbuild (define-public r-pkgbuild
(package (package
(name "r-pkgbuild") (name "r-pkgbuild")
(version "1.0.2") (version "1.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "pkgbuild" version)) (uri (cran-uri "pkgbuild" version))
(sha256 (sha256
(base32 (base32
"1i1rrax7x7r2bplig5cfc50lx85jc4n9a3qmvbdviaj22wr2lghs")))) "0k8zwa66rm1ncx19ld5mbaxcjxkswiczpdqyssy44vl8k6scwfn9"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-callr" ,r-callr) `(("r-callr" ,r-callr)
@ -1328,13 +1327,13 @@ you to rapidly iterate while developing a package.")
(define-public r-rcpp (define-public r-rcpp
(package (package
(name "r-rcpp") (name "r-rcpp")
(version "1.0.0") (version "1.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Rcpp" version)) (uri (cran-uri "Rcpp" version))
(sha256 (sha256
(base32 "1hlbw4k79q9ich4w27b01gsvwrsnrflii8zjlcmgfzm1vpq8ndxp")))) (base32 "015rmxns8mhmnd9wnz9bmma4iwx2sf4bcwkkp9hcgvdmblzf0vg7"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes `(("r-knitr" ,r-knitr))) ; for vignettes
@ -1556,14 +1555,14 @@ rows, dropping names) to see if the modified versions are identical.")
(define-public r-dendextend (define-public r-dendextend
(package (package
(name "r-dendextend") (name "r-dendextend")
(version "1.9.0") (version "1.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "dendextend" version)) (uri (cran-uri "dendextend" version))
(sha256 (sha256
(base32 (base32
"1jiani6zwfajky2vafvay2hq158nh99rdrk3j00lycspds9v35fd")))) "091jznl549d44w1h8kk1vwddzhijkyh0wpgkykd494fnc8rzpw48"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-fpc" ,r-fpc) `(("r-fpc" ,r-fpc)
@ -1875,16 +1874,19 @@ provides an interactive R manager and worker environment.")
(define-public r-lmoments (define-public r-lmoments
(package (package
(name "r-lmoments") (name "r-lmoments")
(version "1.2-3") (version "1.3-1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Lmoments" version)) (uri (cran-uri "Lmoments" version))
(sha256 (sha256
(base32 (base32
"13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79")))) "0pc63bj9a8hzr5m3yssrc4kin39fffwkl8rggs3sagzr12d4i7bw"))))
(properties `((upstream-name . "Lmoments"))) (properties `((upstream-name . "Lmoments")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)
("r-rcpparmadillo" ,r-rcpparmadillo)))
(home-page "http://www.tilastotiede.fi/juha_karvanen.html") (home-page "http://www.tilastotiede.fi/juha_karvanen.html")
(synopsis "L-moments and quantile mixtures") (synopsis "L-moments and quantile mixtures")
(description (description
@ -2702,30 +2704,29 @@ provides a one-row summary of model-level statistics.")
(define-public r-recipes (define-public r-recipes
(package (package
(name "r-recipes") (name "r-recipes")
(version "0.1.4") (version "0.1.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "recipes" version)) (uri (cran-uri "recipes" version))
(sha256 (sha256
(base32 (base32
"0bwijw4427v2k5z3qci2kyr5dyzql8b3lvf88rwy16p741jckjsn")))) "056zv4vhayyy8q9izcdknbb9hff2gxivg21g5mkssia78vw8g3mg"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-broom" ,r-broom) `(("r-dplyr" ,r-dplyr)
("r-ddalpha" ,r-ddalpha) ("r-generics" ,r-generics)
("r-dimred" ,r-dimred) ("r-glue" ,r-glue)
("r-dplyr" ,r-dplyr)
("r-gower" ,r-gower) ("r-gower" ,r-gower)
("r-ipred" ,r-ipred) ("r-ipred" ,r-ipred)
("r-lubridate" ,r-lubridate) ("r-lubridate" ,r-lubridate)
("r-magrittr" ,r-magrittr) ("r-magrittr" ,r-magrittr)
("r-matrix" ,r-matrix) ("r-matrix" ,r-matrix)
("r-pls" ,r-pls)
("r-purrr" ,r-purrr) ("r-purrr" ,r-purrr)
("r-rcpproll" ,r-rcpproll) ("r-rcpproll" ,r-rcpproll)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble) ("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr)
("r-tidyselect" ,r-tidyselect) ("r-tidyselect" ,r-tidyselect)
("r-timedate" ,r-timedate) ("r-timedate" ,r-timedate)
("r-withr" ,r-withr))) ("r-withr" ,r-withr)))
@ -2861,14 +2862,14 @@ with the package @code{optim}.")
(define-public r-ordinal (define-public r-ordinal
(package (package
(name "r-ordinal") (name "r-ordinal")
(version "2018.8-25") (version "2019.3-9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ordinal" version)) (uri (cran-uri "ordinal" version))
(sha256 (sha256
(base32 (base32
"03cv9hcrw8j3lhamzhz8sk2p3ns4cw9z41x49h301k2b3pajv43h")))) "0xsr2715ghh1q5hjnx7d8lyavzfvpi370blm1xdljn3p4kar8ldi"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-mass" ,r-mass) `(("r-mass" ,r-mass)
@ -3400,14 +3401,14 @@ plots in @code{ggplot2}.")
(define-public r-cli (define-public r-cli
(package (package
(name "r-cli") (name "r-cli")
(version "1.0.1") (version "1.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "cli" version)) (uri (cran-uri "cli" version))
(sha256 (sha256
(base32 (base32
"1r2yih4c0bdmbx0qrarlf0m1p5z30sri755zmdazsq2pw76zp07g")))) "02hdwvdq5nic6dhxj88jbgsc9m8yrz3yibigg6szkggxyk6hzh2g"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-assertthat" ,r-assertthat) `(("r-assertthat" ,r-assertthat)
@ -3463,14 +3464,14 @@ constants, and control debugging of packages via environment variables.")
(define-public r-processx (define-public r-processx
(package (package
(name "r-processx") (name "r-processx")
(version "3.2.1") (version "3.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "processx" version)) (uri (cran-uri "processx" version))
(sha256 (sha256
(base32 (base32
"1skjyi767avc3safajlj3ikk9lf11zzyjybdcmx8m9y59rf319ql")))) "0ipdcl4080z92jdnd1w4hm4w484spxcrp6j5x9p76ksb401qdca1"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-ps" ,r-ps) `(("r-ps" ,r-ps)
@ -3695,14 +3696,14 @@ terminals.")
(define-public r-tinytex (define-public r-tinytex
(package (package
(name "r-tinytex") (name "r-tinytex")
(version "0.10") (version "0.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "tinytex" version)) (uri (cran-uri "tinytex" version))
(sha256 (sha256
(base32 (base32
"02bz8zaka5j51zin976n5nmk19a0390d0gwgj4zrbh48hl313rqm")))) "017g0niwmx8qafsn9b01gp60j5fgwxch0dnkmjgpxxr1k4h1r64x"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-xfun" ,r-xfun))) `(("r-xfun" ,r-xfun)))
@ -4167,14 +4168,14 @@ sample Robust Rank-Order Distributional Test.")
(define-public r-expm (define-public r-expm
(package (package
(name "r-expm") (name "r-expm")
(version "0.999-3") (version "0.999-4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "expm" version)) (uri (cran-uri "expm" version))
(sha256 (sha256
(base32 (base32
"04k4a6g071jkjc0d30ncmf713dj16brcs9m6pj43hnycc1caq6si")))) "15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs `(("r-matrix" ,r-matrix))) (propagated-inputs `(("r-matrix" ,r-matrix)))
(native-inputs `(("gfortran" ,gfortran))) (native-inputs `(("gfortran" ,gfortran)))
@ -4884,14 +4885,14 @@ misclassification probabilities of different models.")
(define-public r-zip (define-public r-zip
(package (package
(name "r-zip") (name "r-zip")
(version "2.0.0") (version "2.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "zip" version)) (uri (cran-uri "zip" version))
(sha256 (sha256
(base32 (base32
"0a86x6a2cy0lkx98yljk9acb6q3ksz9y5acfaqnmbvnn77pibg86")))) "0cchbzp2s2qz7r4n9qdwgfgik5xzr0dzxmj25r8435i85k86ysi1"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/gaborcsardi/zip") (home-page "https://github.com/gaborcsardi/zip")
(synopsis "Cross-platform Zip compression") (synopsis "Cross-platform Zip compression")
@ -5811,27 +5812,51 @@ from the @code{stats} package, as well as numerous other model classes from
other add-on packages.") other add-on packages.")
(license license:expat))) (license license:expat)))
(define-public r-insight
(package
(name "r-insight")
(version "0.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "insight" version))
(sha256
(base32
"0cy00j4m9r690hrjdmv8wzwn8mbnkjd3g527nvsmid64h9jgks5f"))))
(build-system r-build-system)
(home-page "https://easystats.github.io/insight/")
(synopsis "Easy access to model information for various model objects")
(description
"This package provides a tool to provide an easy, intuitive and
consistent access to information contained in various R models, like model
formulas, model terms, information about random effects, data that was used to
fit the model or data from response variables. The package mainly revolves
around two types of functions: Functions that find (the names of) information,
starting with @code{find_}, and functions that get the underlying data,
starting with @code{get_}. The package has a consistent syntax and works with
many different model objects, where otherwise functions to access these
information are missing.")
(license license:gpl3)))
(define-public r-sjlabelled (define-public r-sjlabelled
(package (package
(name "r-sjlabelled") (name "r-sjlabelled")
(version "1.0.16") (version "1.0.17")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sjlabelled" version)) (uri (cran-uri "sjlabelled" version))
(sha256 (sha256
(base32 (base32
"1zi1ncna16zl9hcy7mzara4kjxqkgwcw9ncp388ss353wwc9y2nc")))) "00c0c22ynpihgf2bvmcfnkvqwqvxax2zzb7wldsmg2f7z5a32aa6"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-broom" ,r-broom) `(("r-dplyr" ,r-dplyr)
("r-dplyr" ,r-dplyr)
("r-haven" ,r-haven) ("r-haven" ,r-haven)
("r-insight" ,r-insight)
("r-magrittr" ,r-magrittr) ("r-magrittr" ,r-magrittr)
("r-prediction" ,r-prediction)
("r-purrr" ,r-purrr) ("r-purrr" ,r-purrr)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)))
("r-snakecase" ,r-snakecase)))
(home-page "https://github.com/strengejacke/sjlabelled") (home-page "https://github.com/strengejacke/sjlabelled")
(synopsis "Labelled data utility functions") (synopsis "Labelled data utility functions")
(description (description
@ -5845,27 +5870,22 @@ vice versa), or to deal with multiple declared missing values.")
(define-public r-sjmisc (define-public r-sjmisc
(package (package
(name "r-sjmisc") (name "r-sjmisc")
(version "2.7.7") (version "2.7.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sjmisc" version)) (uri (cran-uri "sjmisc" version))
(sha256 (sha256
(base32 (base32
"0xm9pmq17maivmjsygwx3bdjd71hf829qbx735hyxa69z9dhp24q")))) "11iiap0w5v0dszgwx4pi3j1zf9vnlw1ml1wjvq1hg9iz1plgbfnc"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-broom" ,r-broom) `(("r-dplyr" ,r-dplyr)
("r-crayon" ,r-crayon)
("r-dplyr" ,r-dplyr)
("r-haven" ,r-haven) ("r-haven" ,r-haven)
("r-magrittr" ,r-magrittr) ("r-magrittr" ,r-magrittr)
("r-purrr" ,r-purrr) ("r-purrr" ,r-purrr)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-sjlabelled" ,r-sjlabelled) ("r-sjlabelled" ,r-sjlabelled)))
("r-stringdist" ,r-stringdist)
("r-stringr" ,r-stringr)
("r-tidyr" ,r-tidyr)))
(home-page "https://github.com/strengejacke/sjmisc") (home-page "https://github.com/strengejacke/sjmisc")
(synopsis "Data and variable transformation functions") (synopsis "Data and variable transformation functions")
(description (description
@ -6056,14 +6076,14 @@ support for default values, positional argument support, etc.")
(define-public r-findpython (define-public r-findpython
(package (package
(name "r-findpython") (name "r-findpython")
(version "1.0.4") (version "1.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "findpython" version)) (uri (cran-uri "findpython" version))
(sha256 (sha256
(base32 (base32
"1zfcdcp4d48d2pzf5n59kqrfk2z9nnyzkx5j00gfmgfkadnv93x5")))) "0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/trevorld/findpython") (home-page "https://github.com/trevorld/findpython")
(synopsis "Functions to find an acceptable Python binary") (synopsis "Functions to find an acceptable Python binary")
@ -6076,19 +6096,18 @@ matches version and feature constraints.")
(define-public r-argparse (define-public r-argparse
(package (package
(name "r-argparse") (name "r-argparse")
(version "2.0.0") (version "2.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "argparse" version)) (uri (cran-uri "argparse" version))
(sha256 (sha256
(base32 (base32
"1qrp7hc8sm6ryw0zws76al865ansig1xbx8ljxz4wabh60msrz3i")))) "1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"))))
(build-system r-build-system) (build-system r-build-system)
(inputs `(("python" ,python))) (inputs `(("python" ,python)))
(propagated-inputs (propagated-inputs
`(("r-findpython" ,r-findpython) `(("r-findpython" ,r-findpython)
("r-getopt" ,r-getopt)
("r-jsonlite" ,r-jsonlite) ("r-jsonlite" ,r-jsonlite)
("r-r6" ,r-r6))) ("r-r6" ,r-r6)))
(home-page "https://github.com/trevorld/argparse") (home-page "https://github.com/trevorld/argparse")
@ -6253,19 +6272,18 @@ containing one or more SNPs that evolved under directional selection.")
(define-public r-proc (define-public r-proc
(package (package
(name "r-proc") (name "r-proc")
(version "1.13.0") (version "1.14.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "pROC" version)) (uri (cran-uri "pROC" version))
(sha256 (sha256
(base32 (base32
"0ain17clympkx09ym7gydylcd93096dxzqx1qzci310yq2l7fknm")))) "0ki1pvj5iaki81crapvwqllg5avn5qlvv62axnsdkdcmv9xc3wg0"))))
(properties `((upstream-name . "pROC"))) (properties `((upstream-name . "pROC")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-ggplot2" ,r-ggplot2) `(("r-plyr" ,r-plyr)
("r-plyr" ,r-plyr)
("r-rcpp" ,r-rcpp))) ("r-rcpp" ,r-rcpp)))
(home-page "http://expasy.org/tools/pROC/") (home-page "http://expasy.org/tools/pROC/")
(synopsis "Display and analyze ROC curves") (synopsis "Display and analyze ROC curves")
@ -7607,20 +7625,42 @@ comparisons of slopes.")
Cohen (1988).") Cohen (1988).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public r-libcoin
(package
(name "r-libcoin")
(version "1.0-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "libcoin" version))
(sha256
(base32
"1i893ij9vkmc4y721npw1s3prmmcs2da5vf3ajm0j8ccmfhbmp4i"))))
(build-system r-build-system)
(propagated-inputs `(("r-mvtnorm" ,r-mvtnorm)))
(home-page "https://cran.r-project.org/web/packages/libcoin")
(synopsis "Linear test statistics for permutation inference")
(description
"This package provides basic infrastructure for linear test statistics
and permutation inference in the framework of Strasser and Weber (1999).")
(license license:gpl2)))
(define-public r-coin (define-public r-coin
(package (package
(name "r-coin") (name "r-coin")
(version "1.2-2") (version "1.3-0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "coin" version)) (uri (cran-uri "coin" version))
(sha256 (sha256
(base32 (base32
"1fq58793bymzig1syjg2lvn6hsxfwkhh00jfrchh3c0y7rfhc66m")))) "1y0yl4mjaxca0jqz53sv1gcpdg89m099rq61iszxvpx7w0vvpkmd"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-modeltools" ,r-modeltools) `(("r-libcoin" ,r-libcoin)
("r-matrixstats" ,r-matrixstats)
("r-modeltools" ,r-modeltools)
("r-multcomp" ,r-multcomp) ("r-multcomp" ,r-multcomp)
("r-mvtnorm" ,r-mvtnorm) ("r-mvtnorm" ,r-mvtnorm)
("r-survival" ,r-survival))) ("r-survival" ,r-survival)))
@ -7694,31 +7734,26 @@ detection, parallelism through BLAS and parallel user templates.")
(define-public r-sjstats (define-public r-sjstats
(package (package
(name "r-sjstats") (name "r-sjstats")
(version "0.17.3") (version "0.17.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sjstats" version)) (uri (cran-uri "sjstats" version))
(sha256 (sha256
(base32 (base32
"02na2pzxp88yp52h7vs959fgydiddmns39m9x4i0vz8fp016bdf8")))) "012hp9m17xzjnsfvjjz2wdfgxm3irsrfx0zmahfnfmgdrwxd5vk5"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-bayesplot" ,r-bayesplot) `(("r-broom" ,r-broom)
("r-broom" ,r-broom)
("r-coin" ,r-coin)
("r-crayon" ,r-crayon)
("r-dplyr" ,r-dplyr) ("r-dplyr" ,r-dplyr)
("r-emmeans" ,r-emmeans) ("r-emmeans" ,r-emmeans)
("r-glmmtmb" ,r-glmmtmb) ("r-insight" ,r-insight)
("r-lme4" ,r-lme4) ("r-lme4" ,r-lme4)
("r-magrittr" ,r-magrittr) ("r-magrittr" ,r-magrittr)
("r-mass" ,r-mass) ("r-mass" ,r-mass)
("r-matrix" ,r-matrix) ("r-matrix" ,r-matrix)
("r-modelr" ,r-modelr) ("r-modelr" ,r-modelr)
("r-nlme" ,r-nlme)
("r-purrr" ,r-purrr) ("r-purrr" ,r-purrr)
("r-pwr" ,r-pwr)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-sjlabelled" ,r-sjlabelled) ("r-sjlabelled" ,r-sjlabelled)
("r-sjmisc" ,r-sjmisc) ("r-sjmisc" ,r-sjmisc)
@ -7772,30 +7807,25 @@ differentiation.")
(define-public r-ggeffects (define-public r-ggeffects
(package (package
(name "r-ggeffects") (name "r-ggeffects")
(version "0.8.0") (version "0.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggeffects" version)) (uri (cran-uri "ggeffects" version))
(sha256 (sha256
(base32 (base32
"152xyadj5m171z7dlzzy40y1fp2l9v46525dlw2al3qr0b7zpm61")))) "1bbr44yk1j8pz4kcbw1cqrzcnbih9n6rsgf96a6py5094qcal2qd"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-crayon" ,r-crayon) `(("r-dplyr" ,r-dplyr)
("r-dplyr" ,r-dplyr) ("r-insight" ,r-insight)
("r-ggplot2" ,r-ggplot2)
("r-lme4" ,r-lme4)
("r-magrittr" ,r-magrittr) ("r-magrittr" ,r-magrittr)
("r-mass" ,r-mass) ("r-mass" ,r-mass)
("r-prediction" ,r-prediction)
("r-purrr" ,r-purrr) ("r-purrr" ,r-purrr)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-scales" ,r-scales) ("r-scales" ,r-scales)
("r-sjlabelled" ,r-sjlabelled) ("r-sjlabelled" ,r-sjlabelled)
("r-sjmisc" ,r-sjmisc) ("r-sjmisc" ,r-sjmisc)))
("r-sjstats" ,r-sjstats)
("r-tidyr" ,r-tidyr)))
(home-page "https://github.com/strengejacke/ggeffects") (home-page "https://github.com/strengejacke/ggeffects")
(synopsis "Create tidy data frames of marginal effects for ggplot") (synopsis "Create tidy data frames of marginal effects for ggplot")
(description (description
@ -7901,14 +7931,14 @@ back to file after modifications.")
(define-public r-fs (define-public r-fs
(package (package
(name "r-fs") (name "r-fs")
(version "1.2.6") (version "1.2.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "fs" version)) (uri (cran-uri "fs" version))
(sha256 (sha256
(base32 (base32
"0kqqaqqml8x3r1mdld40iwns0ylj2f52qsdh1vcn39f7w7c2ka8j")))) "03aq2ill03ladsa4438nrz213ks2mqhxsrb9fjsp62bhk36v8k1a"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-rcpp" ,r-rcpp))) `(("r-rcpp" ,r-rcpp)))
@ -8445,14 +8475,14 @@ This package provides an R interface.")
(define-public r-ncdf4 (define-public r-ncdf4
(package (package
(name "r-ncdf4") (name "r-ncdf4")
(version "1.16") (version "1.16.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ncdf4" version)) (uri (cran-uri "ncdf4" version))
(sha256 (sha256
(base32 (base32
"0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd")))) "083sb24anyd4sw0il3x07pqn9rbx5y5ayqass6mz8x443rnjvphd"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("netcdf" ,netcdf) `(("netcdf" ,netcdf)
@ -8492,14 +8522,14 @@ Bioconductor packages.")
(define-public r-rgl (define-public r-rgl
(package (package
(name "r-rgl") (name "r-rgl")
(version "0.99.16") (version "0.100.19")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rgl" version)) (uri (cran-uri "rgl" version))
(sha256 (sha256
(base32 (base32
"0q8sg8fr0140ilssqhscaxkjc29w1rpp6f4k50amw3zzs9g58ak9")))) "09bhvx8aq104yzysfgd7wlnq4vrvmnd4jzgj0c32whjfal10fqsh"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -8770,14 +8800,14 @@ parametrizations of Nolan.")
(define-public r-gsl (define-public r-gsl
(package (package
(name "r-gsl") (name "r-gsl")
(version "1.9-10.3") (version "2.1-5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gsl" version)) (uri (cran-uri "gsl" version))
(sha256 (sha256
(base32 (base32
"00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg")))) "18kzgwmyfqg570gn2b33fm6mj87fiaa4a3bx954yrj8iq28im71v"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("gsl" ,gsl))) `(("gsl" ,gsl)))
@ -9707,14 +9737,14 @@ and manipulating sets of ontological terms.")
(define-public r-gmp (define-public r-gmp
(package (package
(name "r-gmp") (name "r-gmp")
(version "0.5-13.4") (version "0.5-13.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gmp" version)) (uri (cran-uri "gmp" version))
(sha256 (sha256
(base32 (base32
"15jifzwbzqcnq2apzvsylkx4k9lillkgblm4wf4wb7y31ys0amph")))) "042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn"))))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -10198,14 +10228,14 @@ This makes it a convenient and fast interface to C/C++ and Fortran code.")
(define-public r-spam (define-public r-spam
(package (package
(name "r-spam") (name "r-spam")
(version "2.2-1") (version "2.2-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "spam" version)) (uri (cran-uri "spam" version))
(sha256 (sha256
(base32 (base32
"04bfwwna013hrbl4k6w1cdiz5bkc83jlasivriyn5l9gkj2qskr2")))) "024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-dotcall64" ,r-dotcall64))) `(("r-dotcall64" ,r-dotcall64)))
@ -10583,14 +10613,14 @@ regression coefficients can be conducted via jackknifing.")
(define-public r-huge (define-public r-huge
(package (package
(name "r-huge") (name "r-huge")
(version "1.3.0") (version "1.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "huge" version)) (uri (cran-uri "huge" version))
(sha256 (sha256
(base32 (base32
"18psr7arynax38hcc5y9dxskhsg4a5zjw3hjbgf96zy59wdib5ch")))) "06s22i2cdn6g2r8kq5csyspinayh8dxxg9gkwcf4sa1lmrgb0bf9"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-igraph" ,r-igraph) `(("r-igraph" ,r-igraph)
@ -10636,14 +10666,14 @@ lasso, adaptive lasso and Ridge regression based on cross-validation.")
(define-public r-mcmc (define-public r-mcmc
(package (package
(name "r-mcmc") (name "r-mcmc")
(version "0.9-5") (version "0.9-6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "mcmc" version)) (uri (cran-uri "mcmc" version))
(sha256 (sha256
(base32 (base32
"1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6")))) "1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://www.stat.umn.edu/geyer/mcmc/") (home-page "http://www.stat.umn.edu/geyer/mcmc/")
(synopsis "Markov chain Monte Carlo") (synopsis "Markov chain Monte Carlo")
@ -10707,14 +10737,14 @@ them in distributed compute environments.")
(define-public r-future (define-public r-future
(package (package
(name "r-future") (name "r-future")
(version "1.11.1.1") (version "1.12.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "future" version)) (uri (cran-uri "future" version))
(sha256 (sha256
(base32 (base32
"1s4lyqg4mm1drzc6czaalmhmxfjgp4nznb14ql5xzny9rprgz43i")))) "12hq7hsfydlscwrb37ns9a8561bzpsp82nn7jrcyj0ydk610nipm"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-digest" ,r-digest) `(("r-digest" ,r-digest)
@ -11129,14 +11159,14 @@ such software by imputing dropout events.")
(define-public r-gamlss-dist (define-public r-gamlss-dist
(package (package
(name "r-gamlss-dist") (name "r-gamlss-dist")
(version "5.1-1") (version "5.1-3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gamlss.dist" version)) (uri (cran-uri "gamlss.dist" version))
(sha256 (sha256
(base32 (base32
"1cd0vl9klcb849i8xwyjm8ihb1da92631j1rxdbnflgffkzrkya4")))) "0154pm1f3g77krj0gxh9icz207pshdrxihb6gjv1k5aph8y69zc7"))))
(properties `((upstream-name . "gamlss.dist"))) (properties `((upstream-name . "gamlss.dist")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs `(("r-mass" ,r-mass))) (propagated-inputs `(("r-mass" ,r-mass)))
@ -11338,18 +11368,17 @@ them (Anscombe-Glynn, D'Agostino, Bonett-Seier).")
(define-public r-msir (define-public r-msir
(package (package
(name "r-msir") (name "r-msir")
(version "1.3.1") (version "1.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "msir" version)) (uri (cran-uri "msir" version))
(sha256 (sha256
(base32 (base32
"1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950")))) "0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-mclust" ,r-mclust) `(("r-mclust" ,r-mclust)))
("r-rgl" ,r-rgl)))
(home-page "https://cran.r-project.org/web/packages/msir") (home-page "https://cran.r-project.org/web/packages/msir")
(synopsis "Model-based sliced inverse regression") (synopsis "Model-based sliced inverse regression")
(description (description
@ -11739,3 +11768,58 @@ R, enabling interactive analysis and visualization of genome-scale data.")
"This package provides wrappers on @code{regexpr} and @code{gregexpr} to "This package provides wrappers on @code{regexpr} and @code{gregexpr} to
return the match results in tidy data frames.") return the match results in tidy data frames.")
(license license:expat))) (license license:expat)))
(define-public r-picante
(package
(name "r-picante")
(version "1.8")
(source
(origin
(method url-fetch)
(uri (cran-uri "picante" version))
(sha256
(base32
"1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ape" ,r-ape)
("r-nlme" ,r-nlme)
("r-vegan" ,r-vegan)))
(home-page "https://cran.r-project.org/web/packages/picante/")
(synopsis "Integrating phylogenies and ecology")
(description
"This package provides functions for phylocom integration, community
analyses, null-models, traits and evolution. It implements numerous
ecophylogenetic approaches including measures of community phylogenetic and
trait diversity, phylogenetic signal, estimation of trait values for
unobserved taxa, null models for community and phylogeny randomizations, and
utility functions for data input/output and phylogeny plotting. A full
description of package functionality and methods are provided by Kembel et
al. (2010).")
(license license:gpl2)))
(define-public r-reinforcelearn
(package
(name "r-reinforcelearn")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "reinforcelearn" version))
(sha256
(base32
"0naakmyb14d2cf7cy5ir52qh3bp51gvs6hyhfi3f72yl2jfnnpzg"))))
(build-system r-build-system)
(propagated-inputs
`(("r-checkmate" ,r-checkmate)
("r-nnet" ,r-nnet)
("r-purrr" ,r-purrr)
("r-r6" ,r-r6)))
(home-page "https://markusdumke.github.io/reinforcelearn")
(synopsis "Reinforcement learning")
(description
"This package implements reinforcement learning environments and
algorithms as described in Sutton & Barto (1998). The Q-Learning algorithm
can be used with function approximation, eligibility traces (Singh & Sutton,
1996) and experience replay (Mnih et al., 2013).")
(license license:expat)))

View File

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
@ -647,7 +647,7 @@ data on your platform, so the seed itself will be as random as possible.
(define-public libb2 (define-public libb2
(package (package
(name "libb2") (name "libb2")
(version "0.98") (version "0.98.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -655,7 +655,7 @@ data on your platform, so the seed itself will be as random as possible.
version "/libb2-" version ".tar.gz")) version "/libb2-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vq39cvwy05754l565xl11rqr2jvjb6ykjzca886vi9vm71y0sg8")))) "0bn7yrzdixdvzm46shbhpkqbr6zyqyxiqn7a7x54ag3mrvfnyqjk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
@ -51,12 +51,13 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1)
#:use-module (ice-9 match))
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
(version "1.22.1") (version "1.22.2")
(source(origin (source(origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -64,7 +65,7 @@
"cups-filters-" version ".tar.xz")) "cups-filters-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"08szgpmac7xlf6vqkvg3pbphnrk2mal3gy382q2y3cm7k4plys3y")) "06gy3wv6p7kswz3mjn17f17mqpadvqj2riwc42kksnvp8x0h08cw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; install backends, banners and filters to cups-filters output ;; install backends, banners and filters to cups-filters output
@ -185,7 +186,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
(define-public cups-minimal (define-public cups-minimal
(package (package
(name "cups-minimal") (name "cups-minimal")
(version "2.2.10") (version "2.2.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -193,7 +194,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
version "/cups-" version "-source.tar.gz")) version "/cups-" version "-source.tar.gz"))
(sha256 (sha256
(base32 (base32
"1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p")))) "0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -429,12 +430,26 @@ should only be used as part of the Guix cups-pk-helper service.")
(patches (search-patches "hplip-remove-imageprocessor.patch")) (patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet (snippet
'(begin '(begin
;; Delete non-free blobs ;; Delete non-free blobs: .so files, pre-compiled
(for-each delete-file (find-files "." "\\.so$")) ;; 'locatedriver' executable, etc.
(for-each delete-file
(find-files "."
(lambda (file stat)
(elf-file? file))))
(delete-file "prnt/hpcups/ImageProcessor.h") (delete-file "prnt/hpcups/ImageProcessor.h")
;; Fix type mismatch. ;; Fix type mismatch.
(substitute* "prnt/hpcups/genPCLm.cpp" (substitute* "prnt/hpcups/genPCLm.cpp"
(("boolean") "bool")) (("boolean") "bool"))
;; Install binaries under libexec/hplip instead of
;; share/hplip; that'll at least ensure they get stripped.
;; It's not even clear that they're of any use though...
(substitute* "Makefile.in"
(("^dat2drvdir =.*")
"dat2drvdir = $(pkglibexecdir)\n")
(("^locatedriverdir =.*")
"locatedriverdir = $(pkglibexecdir)\n"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://developers.hp.com/hp-linux-imaging-and-printing") (home-page "https://developers.hp.com/hp-linux-imaging-and-printing")
@ -556,10 +571,19 @@ should only be used as part of the Guix cups-pk-helper service.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments hplip) (substitute-keyword-arguments (package-arguments hplip)
((#:configure-flags cf) ((#:configure-flags cf)
`(delete "--enable-qt5" ,cf)))) ;; Produce a "light build", meaning that only the printer (CUPS) and
(inputs ;; scanner (SANE) support gets built, without all the 'hp-*'
(fold alist-delete (package-inputs hplip) ;; command-line tools.
'("python-pygobject" "python-pyqt"))) `(cons "--enable-lite-build"
(delete "--enable-qt5" ,cf)))
((#:phases phases)
;; The 'wrap-binaries' is not needed here since the 'hp-*' programs
;; are not installed.
`(alist-delete 'wrap-binaries ,phases))))
(inputs (remove (match-lambda
((label . _)
(string-prefix? "python" label)))
(package-inputs hplip)))
(synopsis "GUI-less version of hplip"))) (synopsis "GUI-less version of hplip")))
(define-public foomatic-filters (define-public foomatic-filters

View File

@ -3,7 +3,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -48,6 +48,24 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web)) #:use-module (gnu packages web))
;; XXX A hidden special obsolete libssh2 for temporary use in the curl package.
;; <https://bugs.gnu.org/34927>
(define-public libssh2-1.8.0
(hidden-package
(package
(inherit libssh2)
(version "1.8.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.libssh2.org/download/libssh2-"
version ".tar.gz"))
(sha256
(base32
"1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"))
(patches
(search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))))))
(define-public curl (define-public curl
(package (package
(name "curl") (name "curl")
@ -65,7 +83,11 @@
(inputs `(("gnutls" ,gnutls) (inputs `(("gnutls" ,gnutls)
("gss" ,gss) ("gss" ,gss)
("libidn" ,libidn) ("libidn" ,libidn)
("libssh2" ,libssh2) ;; TODO XXX <https://bugs.gnu.org/34927>
;; Curl doesn't actually use or refer to libssh2 because the build
;; is not configured with '--with-libssh2'. Remove this input when
;; a mass rebuild is appropriate (e.g. core-updates).
("libssh2" ,libssh2-1.8.0)
("openldap" ,openldap) ("openldap" ,openldap)
("nghttp2" ,nghttp2 "lib") ("nghttp2" ,nghttp2 "lib")
("zlib" ,zlib))) ("zlib" ,zlib)))

View File

@ -11,7 +11,7 @@
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
@ -28,7 +28,7 @@
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com> ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
@ -1031,14 +1031,14 @@ changes.")
(define-public tdb (define-public tdb
(package (package
(name "tdb") (name "tdb")
(version "1.3.18") (version "1.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.samba.org/ftp/tdb/tdb-" (uri (string-append "https://www.samba.org/ftp/tdb/tdb-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1")))) "0d9d2f1c83gmmq30bkfs50yb8399mr9xjjzscma4kyq0ajf75861"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -2611,6 +2611,7 @@ transforms idiomatic python function calls to well-formed SQL queries.")
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
(guix build go-build-system) (guix build go-build-system)
(guix build utils)) (guix build utils))
#:install-source? #f
#:phases #:phases
(let ((all-tools (let ((all-tools
'("bsondump" "mongodump" "mongoexport" "mongofiles" '("bsondump" "mongodump" "mongoexport" "mongofiles"
@ -2630,8 +2631,6 @@ transforms idiomatic python function calls to well-formed SQL queries.")
(("skipping restore of system.profile collection\", db)") (("skipping restore of system.profile collection\", db)")
"skipping restore of system.profile collection\")")) "skipping restore of system.profile collection\")"))
#t)) #t))
;; We don't need to install the source code for end-user applications
(delete 'install-source)
(replace 'build (replace 'build
(lambda _ (lambda _
(for-each (lambda (tool) (for-each (lambda (tool)
@ -2711,7 +2710,7 @@ Monitor read/write activity on a mongo server
(define-public apache-arrow (define-public apache-arrow
(package (package
(name "apache-arrow") (name "apache-arrow")
(version "0.7.0") (version "0.10.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2721,7 +2720,7 @@ Monitor read/write activity on a mongo server
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3")))) "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
@ -2765,9 +2764,7 @@ Monitor read/write activity on a mongo server
("rapidjson" ,rapidjson) ("rapidjson" ,rapidjson)
("brotli" ,google-brotli) ("brotli" ,google-brotli)
("flatbuffers" ,flatbuffers) ("flatbuffers" ,flatbuffers)
;; Arrow is not yet compatible with jemalloc >= 5: ("jemalloc" ,jemalloc)
;; https://issues.apache.org/jira/browse/ARROW-1141
("jemalloc" ,jemalloc-4.5.0)
("python-3" ,python) ("python-3" ,python)
("python-numpy" ,python-numpy))) ("python-numpy" ,python-numpy)))
(home-page "https://arrow.apache.org/") (home-page "https://arrow.apache.org/")
@ -2782,7 +2779,7 @@ algorithm implementations.")
(define-public python-pyarrow (define-public python-pyarrow
(package (package
(name "python-pyarrow") (name "python-pyarrow")
(version "0.7.0") (version "0.10.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2792,13 +2789,13 @@ algorithm implementations.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3")))) "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:tests? #f ; XXX Test failures related to missing libhdfs, libhdfs3, '(#:tests? #f ; XXX There are no tests in the "python" directory
; and "Unsupported numpy type 22".
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'build) ; XXX the build is performed again during the install phase
(add-after 'unpack 'enter-source-directory (add-after 'unpack 'enter-source-directory
(lambda _ (chdir "python") #t)) (lambda _ (chdir "python") #t))
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
@ -2814,6 +2811,7 @@ algorithm implementations.")
`(("cmake" ,cmake) `(("cmake" ,cmake)
("python-cython" ,python-cython) ("python-cython" ,python-cython)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)
("python-setuptools-scm" ,python-setuptools-scm))) ("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://arrow.apache.org/docs/python/") (home-page "https://arrow.apache.org/docs/python/")
(synopsis "Python bindings for Apache Arrow") (synopsis "Python bindings for Apache Arrow")

View File

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com> ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -32,11 +32,13 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages code) #:use-module (gnu packages code)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -355,13 +357,38 @@ input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.")
(base32 (base32
"17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9")))) "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-gui")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'hardcode-python
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "gui/GameConqueror.py"
(("/usr/bin/env python")
(string-append (assoc-ref %build-inputs
"python-wrapper") "/bin/python")))
#t))
(add-after 'install 'wrap-gameconqueror
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(python-path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/share/gameconqueror/GameConqueror.py")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs (native-inputs
`(("libtool" ,libtool) `(("libtool" ,libtool)
("python-wrapper" ,python-wrapper)
("gobject-introspection" ,gobject-introspection)
("gtk+" ,gtk+)
("intltool" ,intltool) ("intltool" ,intltool)
("automake" ,automake) ("automake" ,automake)
("autoconf" ,autoconf))) ("autoconf" ,autoconf)))
(inputs (inputs
`(("readline" ,readline))) `(("readline" ,readline)))
(propagated-inputs
`(("python-pygobject" ,python-pygobject)))
(home-page "https://github.com/scanmem/scanmem") (home-page "https://github.com/scanmem/scanmem")
(synopsis "Memory scanner") (synopsis "Memory scanner")
(description "Scanmem is a debugging utility designed to isolate the (description "Scanmem is a debugging utility designed to isolate the

View File

@ -1,8 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com> ;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;; ;;;
@ -740,16 +740,17 @@ the order of added relations.")
(define-public python-django-appconf (define-public python-django-appconf
(package (package
(name "python-django-appconf") (name "python-django-appconf")
(version "1.0.2") (version "1.0.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "django-appconf" version)) (uri (pypi-uri "django-appconf" version))
(sha256 (sha256
(base32 (base32
"0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba")))) "1qw0p9qh78bvkgi38ba58djwn0rd5j1lrkg2c2wk5wb7snj3rw9m"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-django" ,python-django))) `(("python-django" ,python-django)
("python-six" ,python-six)))
(home-page "https://github.com/django-compressor/django-appconf") (home-page "https://github.com/django-compressor/django-appconf")
(synopsis "Handle configuration defaults of packaged Django apps") (synopsis "Handle configuration defaults of packaged Django apps")
(description (description

View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
@ -146,7 +146,8 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/share/man/man1/dig.1" "/share/man/man1/dig.1"
"/share/man/man1/host.1" "/share/man/man1/host.1"
"/share/man/man1/nslookup.1" "/share/man/man1/nslookup.1"
"/share/man/man1/nsupdate.1")))) "/share/man/man1/nsupdate.1"))
#t))
;; When and if guix provides user namespaces for the build process, ;; When and if guix provides user namespaces for the build process,
;; then the following can be uncommented and the subsequent "force-test" ;; then the following can be uncommented and the subsequent "force-test"
;; will not be necessary. ;; will not be necessary.
@ -156,8 +157,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; (system "bin/tests/system/ifconfig.sh up"))) ;; (system "bin/tests/system/ifconfig.sh up")))
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "make" "force-test") (invoke "make" "force-test"))))))
#t)))))
(synopsis "An implementation of the Domain Name System") (synopsis "An implementation of the Domain Name System")
(description "BIND is an implementation of the @dfn{Domain Name System} (description "BIND is an implementation of the @dfn{Domain Name System}
(DNS) protocols for the Internet. It is a reference implementation of those (DNS) protocols for the Internet. It is a reference implementation of those
@ -364,14 +364,14 @@ to result in system-wide compromise.")
(define-public unbound (define-public unbound
(package (package
(name "unbound") (name "unbound")
(version "1.9.0") (version "1.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-" (uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1")))) (base32 "1iarvk0i92asvrkpla9z55aan20k6pklzpck9yk4rfnchsdvzh63"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "python")) (outputs '("out" "python"))
(native-inputs (native-inputs
@ -569,14 +569,16 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "2.7.6") (version "2.8.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (string-append "https://secure.nic.cz/files/knot-dns/"
"knot-" version ".tar.xz")) "knot-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1")) "1vw7xx7bm440jwrpvdd04vrp6ccz2b11swcn9msvs62hf0kdjjj9"))
(patches
(search-patches "knot-include-system-lmdb-header.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View File

@ -43,7 +43,7 @@
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)) #:use-module (gnu packages virtualization))
(define %docker-version "18.09.2") (define %docker-version "18.09.3")
(define-public python-docker-py (define-public python-docker-py
(package (package
@ -162,7 +162,7 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd (define-public containerd
(package (package
(name "containerd") (name "containerd")
(version "1.2.4") (version "1.2.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -171,7 +171,7 @@ Python without keeping their credentials in a Docker configuration file.")
(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 "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy")))) (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/containerd/containerd" `(#:import-path "github.com/containerd/containerd"
@ -239,8 +239,7 @@ network attachments.")
(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 (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx"))
"1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c"))
(patches (patches
(search-patches "docker-engine-test-noinstall.patch" (search-patches "docker-engine-test-noinstall.patch"
"docker-fix-tests.patch")))) "docker-fix-tests.patch"))))
@ -249,9 +248,11 @@ network attachments.")
`(#:modules `(#:modules
((guix build gnu-build-system) ((guix build gnu-build-system)
((guix build go-build-system) #:prefix go:) ((guix build go-build-system) #:prefix go:)
(guix build union)
(guix build utils)) (guix build utils))
#:imported-modules #:imported-modules
(,@%gnu-build-system-modules (,@%gnu-build-system-modules
(guix build union)
(guix build go-build-system)) (guix build go-build-system))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -412,8 +413,8 @@ network attachments.")
;; Make build faster ;; Make build faster
(setenv "GOCACHE" "/tmp") (setenv "GOCACHE" "/tmp")
#t)) #t))
(add-before 'build 'setup-environment (add-before 'build 'setup-go-environment
(assoc-ref go:%standard-phases 'setup-environment)) (assoc-ref go:%standard-phases 'setup-go-environment))
(replace 'build (replace 'build
(lambda _ (lambda _
;; Our LD doesn't like the statically linked relocatable things ;; Our LD doesn't like the statically linked relocatable things
@ -483,8 +484,7 @@ provisioning etc.")
(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 (base32 "09j1i668p330gjz5vw5pss8ghxh1mz7rl2q9ykp02q9p112zhy4j"))))
"0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/docker/cli" `(#:import-path "github.com/docker/cli"

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,7 +39,7 @@
(define-public liblcf (define-public liblcf
(package (package
(name "liblcf") (name "liblcf")
(version "0.5.4") (version "0.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -46,7 +47,7 @@
"/liblcf-" version ".tar.gz")) "/liblcf-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1k99bcw5c23801jk3mbz5sj5h18x46w1qxrkknhwhfgqzpvxhwrs")))) "0dcw9l800314f5c29mqrcg64rkcb6cwqjfnpvwsmvc2l2q5hwlag"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -74,7 +75,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.5.4") (version "0.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -82,7 +83,7 @@ It can read and write LCF and XML files.")
"/easyrpg-player-" version ".tar.gz")) "/easyrpg-player-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0w0idr61slg5828j1q31c1kh1h0ryp8psc006y06jph5pp3qgm48")))) "0zdzp64sshjdl943jklsvzwzzja1fnapslvbd7xss51ym9ra4r6k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -52,6 +52,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -304,3 +305,68 @@ science for high school or college students.
This package provides a @command{snap} executable calling @command{xdg-open} This package provides a @command{snap} executable calling @command{xdg-open}
to open the application in a web browser, for offline usage.") to open the application in a web browser, for offline usage.")
(license license:agpl3+))) (license license:agpl3+)))
(define-public toutenclic
(package
(name "toutenclic")
(version "6.13")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.bipede.fr/downloads/logiciels/"
"ToutEnClic-" version ".tar.xz"))
(sha256
(base32 "1pjprdzc4bn7ckbg4469691ph6yjjr8f022hb4gi4lacs4h71wnd"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(delete 'build)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share/toutenclic"))
(pixmaps (string-append out "/share/pixmaps"))
(bin (string-append out "/bin"))
(executable "toutenclic.py"))
;; Install icon.
(install-file "toutenclic.png" pixmaps)
;; Move files into "share/" directory.
(mkdir-p share)
(copy-recursively "." share)
;; Create executable in "bin/".
(mkdir-p bin)
(with-directory-excursion bin
(symlink (string-append share "/" executable)
executable)))
#t))
(add-after 'install 'create-desktop-file
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(applications (string-append out "/share/applications")))
(mkdir-p applications)
(call-with-output-file
(string-append applications "/toutenclic.desktop")
(lambda (file)
(format file
"[Desktop Entry]~@
Name=ToutEnClic~@
Comment=For schooling without difference~@
Exec=~a/bin/toutenclic.py~@
TryExec=~@*~a/bin/toutenclic.py~@
Terminal=false~@
Icon=toutenclic~@
Type=Application~%"
out)))
#t))))))
(inputs `(("python-pyqt" ,python-pyqt)))
(synopsis "School tools for physically disabled children")
(description "ToutEnClic is intended to facilitate the schooling
of physically disabled children in ordinary schools. It is both
a multi-page virtual exercise book and a kit including pencil,
scissors, glue, ruler, compass, protractor and square. A virtual
keyboard is also available if the child does not have any other
specialized device.")
(home-page "https://bipede.fr/contrib/")
(license license:gpl3)))

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -102,7 +102,7 @@ to take care of the OS-specific details when writing software that uses serial p
(define-public sigrok-firmware-fx2lafw (define-public sigrok-firmware-fx2lafw
(package (package
(name "sigrok-firmware-fx2lafw") (name "sigrok-firmware-fx2lafw")
(version "0.1.5") (version "0.1.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -110,7 +110,7 @@ to take care of the OS-specific details when writing software that uses serial p
"sigrok-firmware-fx2lafw-" version ".tar.gz")) "sigrok-firmware-fx2lafw-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0bbdgy4rpc00jl0l0744m2ibjlqi26bhrkjr7vplivdsjdmhjx6a")))) "18x5zj3xbcylvb651dia6n4zxbdnv0j62r5af60d0l2g68knkjg4"))))
(native-inputs (native-inputs
`(("sdcc" ,sdcc))) `(("sdcc" ,sdcc)))
(build-system gnu-build-system) (build-system gnu-build-system)

View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 nee <nee.git@cock.li> ;;; Copyright © 2017 nee <nee.git@cock.li>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2018 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +33,7 @@
(define-public elixir (define-public elixir
(package (package
(name "elixir") (name "elixir")
(version "1.6.6") (version "1.8.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/elixir-lang/elixir" (uri (string-append "https://github.com/elixir-lang/elixir"
@ -41,7 +41,8 @@
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0c9qz5hasa59a9x1iwpcqpqj6wdbzpijfxqfmzimwj5z8q37nl3l")))) "08lq5p82pnicd49gsj6r2zsbg35wrk6098nrrjb28fcrm5p6736y"))
(patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -84,7 +85,7 @@
(inputs (inputs
`(("erlang" ,erlang) `(("erlang" ,erlang)
("git" ,git))) ("git" ,git)))
(home-page "http://elixir-lang.org/") (home-page "https://elixir-lang.org/")
(synopsis "Elixir programming language") (synopsis "Elixir programming language")
(description "Elixir is a dynamic, functional language used to build (description "Elixir is a dynamic, functional language used to build
scalable and maintainable applications. Elixir leverages the Erlang VM, known scalable and maintainable applications. Elixir leverages the Erlang VM, known

View File

@ -12,7 +12,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
@ -29,14 +29,14 @@
;;; Copyright © 2017, 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2017, 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2018, 2019 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com> ;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de> ;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
@ -97,6 +97,7 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages music)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages w3m) #:use-module (gnu packages w3m)
@ -252,18 +253,21 @@ on stdout instead of using a socket as the Emacsclient does.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-magit (define-public emacs-magit
;; Version 2.90.1 has trouble loading the transient library,
;; so we use a more recent commit that fixes it.
(let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94"))
(package (package
(name "emacs-magit") (name "emacs-magit")
(version "2.90.1") (version (git-version "2.90.1" "1" commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/magit/magit") (url "https://github.com/magit/magit")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4")))) "0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal))) ("emacs" ,emacs-minimal)))
@ -272,11 +276,8 @@ on stdout instead of using a socket as the Emacsclient does.")
("perl" ,perl))) ("perl" ,perl)))
(propagated-inputs (propagated-inputs
`(("dash" ,emacs-dash) `(("dash" ,emacs-dash)
("ghub" ,emacs-ghub) ("with-editor" ,emacs-with-editor)
("graphql" ,emacs-graphql) ("transient" ,emacs-transient)))
("treepy" ,emacs-treepy)
("magit-popup" ,emacs-magit-popup)
("with-editor" ,emacs-with-editor)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
@ -294,26 +295,14 @@ on stdout instead of using a socket as the Emacsclient does.")
(assoc-ref %build-inputs "dash") (assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-" "/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash)) ,(package-version emacs-dash))
(string-append "GHUB_DIR="
(assoc-ref %build-inputs "ghub")
"/share/emacs/site-lisp/guix.d/ghub-"
,(package-version emacs-ghub))
(string-append "GRAPHQL_DIR="
(assoc-ref %build-inputs "graphql")
"/share/emacs/site-lisp/guix.d/graphql-"
,(package-version emacs-graphql))
(string-append "TREEPY_DIR="
(assoc-ref %build-inputs "treepy")
"/share/emacs/site-lisp/guix.d/treepy-"
,(package-version emacs-treepy))
(string-append "MAGIT_POPUP_DIR="
(assoc-ref %build-inputs "magit-popup")
"/share/emacs/site-lisp/guix.d/magit-popup-"
,(package-version emacs-magit-popup))
(string-append "WITH_EDITOR_DIR=" (string-append "WITH_EDITOR_DIR="
(assoc-ref %build-inputs "with-editor") (assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/with-editor-" "/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-with-editor))) ,(package-version emacs-with-editor))
(string-append "TRANSIENT_DIR="
(assoc-ref %build-inputs "transient")
"/share/emacs/site-lisp/guix.d/transient-"
,(package-version emacs-transient)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -334,33 +323,31 @@ You can review and commit the changes you have made to the tracked files, for
example, and you can browse the history of past changes. There is support for example, and you can browse the history of past changes. There is support for
cherry picking, reverting, merging, rebasing, and other common Git cherry picking, reverting, merging, rebasing, and other common Git
operations.") operations.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public magit (define-public magit
(deprecated-package "magit" emacs-magit)) (deprecated-package "magit" emacs-magit))
(define-public emacs-magit-svn (define-public emacs-magit-svn
(let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f"))
(package (package
(name "emacs-magit-svn") (name "emacs-magit-svn")
(version "2.2.1") (version (git-version "2.2.1" "1" commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/magit/magit-svn") (url "https://github.com/magit/magit-svn")
(commit version))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9")))) "1mlqz8dh6jy5rv72lgkxv253dgh73fmbaidskicypapvbl3lr6xy"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(propagated-inputs `(("dash" ,emacs-dash) (propagated-inputs `(("dash" ,emacs-dash)
("ghub" ,emacs-ghub)
("graphql" ,emacs-graphql)
("treepy" ,emacs-treepy)
("with-editor" ,emacs-with-editor) ("with-editor" ,emacs-with-editor)
("magit" ,emacs-magit) ("magit" ,emacs-magit)
("magit-popup" ,emacs-magit-popup))) ("transient" ,emacs-transient)))
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
@ -374,18 +361,9 @@ operations.")
"/bin/emacs")) "/bin/emacs"))
(magit (string-append (assoc-ref %build-inputs "magit") (magit (string-append (assoc-ref %build-inputs "magit")
"/share/emacs/site-lisp")) "/share/emacs/site-lisp"))
(magit-popup (string-append (assoc-ref %build-inputs "magit-popup") (transient (string-append (assoc-ref %build-inputs "transient")
"/share/emacs/site-lisp/guix.d/magit-popup-" "/share/emacs/site-lisp/guix.d/transient-"
,(package-version emacs-magit-popup))) ,(package-version emacs-transient)))
(ghub (string-append (assoc-ref %build-inputs "ghub")
"/share/emacs/site-lisp/guix.d/ghub-"
,(package-version emacs-ghub)))
(graphql (string-append (assoc-ref %build-inputs "graphql")
"/share/emacs/site-lisp/guix.d/graphql-"
,(package-version emacs-graphql)))
(treepy (string-append (assoc-ref %build-inputs "treepy")
"/share/emacs/site-lisp/guix.d/treepy-"
,(package-version emacs-treepy)))
(dash (string-append (assoc-ref %build-inputs "dash") (dash (string-append (assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-" "/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash))) ,(package-version emacs-dash)))
@ -402,8 +380,8 @@ operations.")
(parameterize ((%emacs emacs)) (parameterize ((%emacs emacs))
(emacs-generate-autoloads ,name lisp-dir) (emacs-generate-autoloads ,name lisp-dir)
(setenv "EMACSLOADPATH" (setenv "EMACSLOADPATH"
(string-append ":" magit ":" magit-popup ":" ghub ":" (string-append ":" magit ":" transient
":" graphql ":" treepy ":" dash ":" with-editor)) ":" dash ":" with-editor))
(emacs-batch-eval '(byte-compile-file "magit-svn.el")))) (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))
#t)))) #t))))
(home-page "https://github.com/magit/magit-svn") (home-page "https://github.com/magit/magit-svn")
@ -411,7 +389,7 @@ operations.")
(description (description
"This package is an extension to Magit, the Git Emacs mode, providing "This package is an extension to Magit, the Git Emacs mode, providing
support for Git-SVN.") support for Git-SVN.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public magit-svn (define-public magit-svn
(deprecated-package "magit-svn" emacs-magit-svn)) (deprecated-package "magit-svn" emacs-magit-svn))
@ -563,6 +541,35 @@ handful of functions that are not resource-specific.")
for editing Racket's Scribble documentation syntax in Emacs.") for editing Racket's Scribble documentation syntax in Emacs.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-unpackaged-el
(let ((commit "f4df7f8dfea715e893b2223adda32545803f5cce")
(revision "1"))
(package
(name "emacs-unpackaged-el")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/unpackaged.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1yf3zrgqfhnr0az8gn1kqqwnhfi3nc0vbjkcagwcqwk3sp1jda86"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-org" ,emacs-org)
("emacs-s" ,emacs-s)
("emacs-use-package" ,emacs-use-package)))
(home-page "https://github.com/alphapapa/unpackaged.el")
(synopsis "Useful snippets of Emacs Lisp code")
(description "This package provides Emacs Lisp utilities for a variety
of tasks, including version control, task management, and regex-based
replacement.")
(license license:gpl3+))))
(define-public emacs-haskell-mode (define-public emacs-haskell-mode
(package (package
(name "emacs-haskell-mode") (name "emacs-haskell-mode")
@ -740,6 +747,36 @@ can be referred to during the expression. This technique can improve clarity
in certain cases. It also enables recursion for anonymous functions.") in certain cases. It also enables recursion for anonymous functions.")
(license license:public-domain))) (license license:public-domain)))
(define-public emacs-xr
(package
(name "emacs-xr")
(version "1.9")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/xr-" version ".tar"))
(sha256
(base32
"1mcild3034f4c1x8x05w9q0ps70i1nihvih22cmh3wj4cgllg5w0"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/xr.html")
(synopsis "Convert string regexp to rx notation")
(description
"This is an inverse companion to the @code{rx} package for translating
regexps in string form to the @code{rx} notation. Its chief uses are:
@itemize
@item Migrating existing code to @code{rx} form, for better readability and
maintainability
@item Understanding complex regexp strings and finding errors in them
@end itemize
In addition to Emacs regexps, this package can also parse and troubleshoot
skip set strings, which are arguments to @code{skip-chars-forward} and
@code{skip-chars-backward}.")
(license license:gpl3+)))
;;; ;;;
;;; Web browsing. ;;; Web browsing.
@ -932,6 +969,7 @@ in certain cases. It also enables recursion for anonymous functions.")
(alsa (assoc-ref inputs "alsa-utils")) (alsa (assoc-ref inputs "alsa-utils"))
(mpg321 (assoc-ref inputs "mpg321")) (mpg321 (assoc-ref inputs "mpg321"))
(mp3info (assoc-ref inputs "mp3info")) (mp3info (assoc-ref inputs "mp3info"))
(mutagen (assoc-ref inputs "mutagen"))
(opus (assoc-ref inputs "opus-tools"))) (opus (assoc-ref inputs "opus-tools")))
;; Specify the installation directory. ;; Specify the installation directory.
(substitute* "Makefile" (substitute* "Makefile"
@ -975,8 +1013,9 @@ in certain cases. It also enables recursion for anonymous functions.")
(("\"amixer\"") (("\"amixer\"")
(string-append "\"" alsa "/bin/amixer\""))) (string-append "\"" alsa "/bin/amixer\"")))
(substitute* "emms-tag-editor.el" (substitute* "emms-tag-editor.el"
(("\"mp3info\"") (("\"mid3v2\"")
(string-append "\"" mp3info "/bin/mp3info\""))))))) (string-append "\"" mutagen "/bin/mid3v2\"")))
#t))))
(add-before 'install 'pre-install (add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; The 'install' rule expects the target directories to exist. ;; The 'install' rule expects the target directories to exist.
@ -1009,6 +1048,7 @@ in certain cases. It also enables recursion for anonymous functions.")
("mpg321" ,mpg321) ("mpg321" ,mpg321)
("taglib" ,taglib) ("taglib" ,taglib)
("mp3info" ,mp3info) ("mp3info" ,mp3info)
("mutagen" ,python-mutagen)
("opus-tools" ,opus-tools))) ("opus-tools" ,opus-tools)))
(properties '((upstream-name . "emms"))) (properties '((upstream-name . "emms")))
(synopsis "Emacs Multimedia System") (synopsis "Emacs Multimedia System")
@ -5217,8 +5257,8 @@ extensions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-collection (define-public emacs-evil-collection
(let ((commit "e7b57aae0131634d0da5e599717a86c4b3ca6092") (let ((commit "baa9c6880779d416a91bf5bde3589673a7403612")
(revision "7")) (revision "8"))
(package (package
(name "emacs-evil-collection") (name "emacs-evil-collection")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -5230,7 +5270,7 @@ extensions.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1g7bxvgnsikpxxdimy0lymn3xz53fari048l827sjyw5kxi59d20")))) "09v97nk7qawphfijzqxzi2y63ydmfq7hsgpljjxwkykrc5h0kdlj"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil))) `(("emacs-evil" ,emacs-evil)))
@ -5355,14 +5395,14 @@ passive voice.")
(name "emacs-org") (name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update its sha256 ;; emacs-org-contrib inherits from this package. Please update its sha256
;; checksum as well. ;; checksum as well.
(version "9.2.1") (version "9.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://elpa.gnu.org/packages/org-" (uri (string-append "http://elpa.gnu.org/packages/org-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 (base32
"0ggca29pyksvfblyd2ciqhgi392wlqx0nmph7ck4m5wbzmk2qnry")))) "02fq3x4haady2vagg9b363ynsrxzpijfp420qhciy7x8y7m89abw"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://orgmode.org/") (home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer") (synopsis "Outline-based notes management and organizer")
@ -5376,14 +5416,14 @@ programming and reproducible research.")
(package (package
(inherit emacs-org) (inherit emacs-org)
(name "emacs-org-contrib") (name "emacs-org-contrib")
(version "20190203") (version "20190311")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://orgmode.org/elpa/org-plus-contrib-" (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 (base32
"060rm62p1660n9f6i5w8l932w7gn5ign93q92gva4jy4bkmvczyb")))) "189p0f70j7z3hh72ay8cxa9n8xkcj06dlw765fwnqd2mm72vx0nb"))))
(arguments (arguments
`(#:modules ((guix build emacs-build-system) `(#:modules ((guix build emacs-build-system)
(guix build utils) (guix build utils)
@ -5863,18 +5903,22 @@ Yasnippet.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-helm-system-packages (define-public emacs-helm-system-packages
;; There won't be a new release after 1.10.1 until
;; https://github.com/emacs-helm/helm-system-packages/issues/25 is fixed,
;; and latest commits fix import issues with Guix.
(let ((commit "6572340f41611ef1991e9612d34d59130957ee4a"))
(package (package
(name "emacs-helm-system-packages") (name "emacs-helm-system-packages")
(version "1.10.1") (version (git-version "1.10.1" "1" commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/emacs-helm/helm-system-packages") (url "https://github.com/emacs-helm/helm-system-packages")
(commit (string-append "v" version)))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f")))) "0mcz6vkpk12vsyd37xv1rbg4v442sxc3lj8yxskqg294xbdaclz4"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(inputs (inputs
`(("recutils" ,recutils))) `(("recutils" ,recutils)))
@ -5898,7 +5942,7 @@ execute the desired action over any selections of packages: Install,
uninstall, display packages details (in Org Mode) or insert details at point, uninstall, display packages details (in Org Mode) or insert details at point,
find files owned by packages... And much more, including performing all the find files owned by packages... And much more, including performing all the
above over the network.") above over the network.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-memoize (define-public emacs-memoize
(package (package
@ -9048,6 +9092,29 @@ arXiv, Google Scholar, Library of Congress, etc.
@code{wmctrl} command-line window-management program.") @code{wmctrl} command-line window-management program.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-erc-image
(let ((commit "82fb3871f02e24b1e880770b9a3d187aab43d0f0")
(revision "1"))
(package
(name "emacs-erc-image")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kidd/erc-image.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i"))))
(build-system emacs-build-system)
(home-page "https://github.com/kidd/erc-image.el")
(synopsis "Show inlined images (png/jpg/gif/svg) in ERC buffers")
(description "This plugin subscribes to hooks @code{erc-insert-modify-hook}
and @code{erc-send-modify-hook} to download and show images.")
(license license:gpl3+))))
(define-public emacs-helm-gtags (define-public emacs-helm-gtags
(package (package
(name "emacs-helm-gtags") (name "emacs-helm-gtags")
@ -9946,27 +10013,51 @@ The default setup uses helm-bibtex.
You should really read org-ref.org in this package for details.") You should really read org-ref.org in this package for details.")
(license license:gpl3+)))) (license license:gpl3+))))
;; This project is unmaintained. Please use emacs-org-re-reveal instead.
(define-public emacs-org-reveal (define-public emacs-org-reveal
(let ((commit "1cdd088ec5fab631c564dca7f9f74fd3e9b7d4d4"))
(package (package
(name "emacs-org-reveal") (name "emacs-org-reveal")
;; There are no proper tag, so we use the latest commit of the stable (version (git-version "0.1" "2" commit))
;; branch, as does MELPA.
(version "20161027.926")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/yjwen/org-reveal.git") (url "https://github.com/yjwen/org-reveal.git")
(commit "001567cc12d50ba07612edd1718b86a12e8c2547"))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8")))) "1vjxjadq2i74p96y9jxnqj1yb86fsgxzmn7bjgnb88ay6nvc1l72"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/yjwen/org-reveal") (home-page "https://github.com/yjwen/org-reveal")
(synopsis "Org and Reveal.js powered HTML presentation tool") (synopsis "Org and Reveal.js powered HTML presentation tool")
(description "Org-Reveal is a command@{org-mode} extension that allows to (description "Org-Reveal is a command@{org-mode} extension that allows
create beautiful presentations (slides) with 3D effects from simple but to create beautiful presentations (slides) with 3D effects from simple but
powerful Org contents.") powerful Org contents.")
(license license:gpl3+))))
(define-public emacs-org-re-reveal
(package
(name "emacs-org-re-reveal")
(version "1.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/oer/org-re-reveal.git")
(commit "50cc6574c77f12d423f6cd096d8f76feb3673abc")))
(file-name (git-file-name name version))
(sha256
(base32
"1v3z30gpimg4spf6zzqwp9b597zxk89h0vpq6xp58js4rjg4ixk8"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-htmlize" ,emacs-htmlize)
("emacs-org" ,emacs-org)))
(home-page "https://gitlab.com/oer/org-re-reveal")
(synopsis "Build HTML presentations with reveal.js from Org source files")
(description "This project started as fork of org-reveal. It provides an
export back-end for HTML presentations with reveal.js from Org mode source
files.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-add-hooks (define-public emacs-add-hooks
@ -10698,7 +10789,7 @@ keep Parens and Indentation inline with one another.")
(define-public emacs-helm-eww (define-public emacs-helm-eww
(package (package
(name "emacs-helm-eww") (name "emacs-helm-eww")
(version "1.1") (version "1.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -10707,7 +10798,7 @@ keep Parens and Indentation inline with one another.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0dvlp7y6kqc4azg5b7jx5lz2rwd0ia7y0y3hcj9y23zd88r73lg7")))) "0hpq1h0p69c9k6hkd2mjpprx213sc5475q7pr2zpmwrjdzgcv70z"))))
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm))) `(("emacs-helm" ,emacs-helm)))
(build-system emacs-build-system) (build-system emacs-build-system)
@ -11199,6 +11290,29 @@ visiting the bookmark, a new @code{eshell} session will be opened in the
appropriate directory if no @code{eshell} session is active.") appropriate directory if no @code{eshell} session is active.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-eshell-z
(package
(name "emacs-eshell-z")
(version "0.3.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xuchunyang/eshell-z")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc"))))
(build-system emacs-build-system)
(home-page "https://github.com/xuchunyang/eshell-z")
(synopsis "Quick navigation to frequently visited directories")
(description
"This package is a port of @code{z}, and keeps track of visited directories
and commands invoked within them in order to enable navigation via input of
matching regexps.")
(license license:gpl3+)))
(define-public emacs-esh-autosuggest (define-public emacs-esh-autosuggest
(package (package
(name "emacs-esh-autosuggest") (name "emacs-esh-autosuggest")
@ -11776,26 +11890,23 @@ e.g: @code{from:Peter to:Anne flag:attach search term}.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-helm-pass (define-public emacs-helm-pass
(let ((commit "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"))
(package (package
(name "emacs-helm-pass") (name "emacs-helm-pass")
(version (git-version "20180416" "1" commit)) (version "0.3")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/jabranham/helm-pass/archive/" (url "https://github.com/emacs-helm/helm-pass")
commit (commit version)))
".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pgq4hj9wvz7z2fyxwsvbh6rmc1akya84v382nx26rr76iavz6wi")))) "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm) `(("emacs-helm" ,emacs-helm)
("emacs-password-store" ,emacs-password-store))) ("emacs-password-store" ,emacs-password-store)))
(home-page (home-page "https://github.com/emacs-helm/helm-pass")
"https://github.com/jabranham/helm-pass")
(synopsis "Helm interface to pass, the standard Unix password manager") (synopsis "Helm interface to pass, the standard Unix password manager")
(description (description
"Users of @code{helm-pass} may also be interested in functionality "Users of @code{helm-pass} may also be interested in functionality
@ -11806,7 +11917,7 @@ provided by other Emacs packages dealing with pass:
@item @code{auth-source-pass.el}: integration of Emacs' auth-source with @item @code{auth-source-pass.el}: integration of Emacs' auth-source with
@code{pass}, included in Emacs 26+). @code{pass}, included in Emacs 26+).
@end itemize\n") @end itemize\n")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-image+ (define-public emacs-image+
(let ((commit "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc")) (let ((commit "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc"))
@ -12300,10 +12411,10 @@ files) are provided.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-hackernews (define-public emacs-hackernews
(let ((commit "d8c450bbc76d6bb65ec5cdb6c3b888a23f3769e9")) (let ((commit "916c3da8da45c757f5ec2faeed57fa370513d4ac"))
(package (package
(name "emacs-hackernews") (name "emacs-hackernews")
(version (git-version "0.4.0" "1" commit)) (version (git-version "0.5.0" "1" commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -12313,7 +12424,7 @@ files) are provided.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"06mp4n6c300jv5lhwf50ircfjckzr2p1zd38s4mqnxxjlf1maim7")))) "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/clarete/hackernews.el") (home-page "https://github.com/clarete/hackernews.el")
(synopsis "Hacker News client for Emacs") (synopsis "Hacker News client for Emacs")
@ -12469,6 +12580,30 @@ execute its commands and resize images.")
backends, including the @command{wordnet} offline backend.") backends, including the @command{wordnet} offline backend.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-editorconfig
(package
(name "emacs-editorconfig")
(version "0.7.14")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/editorconfig/editorconfig-emacs")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"19j2428ij7sqvrqs7rqg1mcnv9109y6drqba40dkv3vrkk5d2yia"))))
(build-system emacs-build-system)
(home-page "https://github.com/editorconfig/editorconfig-emacs")
(synopsis "Define and maintain consistent coding styles between different
editors and IDEs")
(description "The EditorConfig project consists of a file format for
defining coding styles and a collection of text editor plugins that enable
editors to read the file format and adhere to defined styles. EditorConfig
files are easily readable and they work nicely with version control systems.")
(license license:gpl3+)))
(define-public emacs-all-the-icons (define-public emacs-all-the-icons
(package (package
(name "emacs-all-the-icons") (name "emacs-all-the-icons")
@ -12606,7 +12741,7 @@ correctly.")
(define-public emacs-helm-slime (define-public emacs-helm-slime
(package (package
(name "emacs-helm-slime") (name "emacs-helm-slime")
(version "0.2.0") (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -12615,7 +12750,7 @@ correctly.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0vn93vv2wclnwq6f480z14jn9wfp0ylhp5dd48ycc9jicfsnxqfj")))) "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm) `(("emacs-helm" ,emacs-helm)
@ -13506,3 +13641,214 @@ like @code{company}, @code{flycheck}, and @code{projectile}.")
@code{lsp-mode}, such as visual flychecking, displaying references in-line, @code{lsp-mode}, such as visual flychecking, displaying references in-line,
and code peeking.") and code peeking.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-helm-notmuch
(package
(name "emacs-helm-notmuch")
(version "1.2")
(home-page "https://github.com/emacs-helm/helm-notmuch/")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1k038dbdpaa411gl4071x19fklhnizhr346plxw23lsnxir9dhqc"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
("notmuch" ,notmuch)))
(synopsis "Search emails with Emacs Notmuch and Helm")
(description
"This package can be used to search emails in Emacs, searching result
displays as you type thanks to Helm, though @command{notmuch-search} does the
real search.")
(license license:gpl3+)))
(define-public emacs-elmacro
(let ((commit "89b9b0feabafd01fee48111d67131c4c9b5fed9a"))
(package
(name "emacs-elmacro")
(version (git-version "1.1.0" "1" commit))
(home-page "https://github.com/Silex/elmacro")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-s" ,emacs-s)
("emacs-dash" ,emacs-dash)))
(synopsis "Convert keyboard macros to Emacs Lisp")
(description
"This package displays keyboard macros or latest interactive commands
as Emacs Lisp.")
(license license:gpl3+))))
(define-public emacs-transient
;; 0.1.0 depends on lv.el but not later versions.
(let ((commit "7e45a57ec81185631fe763733f64c99021df2a06"))
(package
(name "emacs-transient")
(version (git-version "0.1.0" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/transient")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0r6d4c1lga3bk0s7q7y4v4hbpxnd9h40cjxybqvax2z902931fz1"))))
(build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
(propagated-inputs
`(("dash" ,emacs-dash)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils))
#:tests? #f ; tests are not included in the release
#:make-flags (list "lisp" "info"
(string-append "LOAD_PATH=-L . -L "
(assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash)))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lisp (string-append out "/share/emacs/site-lisp/guix.d/"
"transient" "-" ,version))
(info (string-append out "/share/info")))
(for-each (cut install-file <> lisp)
(find-files "." "\\.elc*$"))
(install-file "docs/transient.info" (string-append info)))
#t)))))
(home-page "https://magit.vc/manual/transient")
(synopsis "Transient commands in Emacs")
(description
"Taking inspiration from prefix keys and prefix arguments in Emacs,
Transient implements a similar abstraction involving a prefix command, infix
arguments and suffix commands. We could call this abstraction a \"transient
command\", but because it always involves at least two commands (a prefix and
a suffix) we prefer to call it just a \"transient\".")
(license license:gpl3+))))
(define-public emacs-semantic-refactor
;; The last release, 0.5, was made on 2015-07-26 and there have been 47
;; commits since then.
(let ((commit "6f2c97d17fb70f4ca2112f5a2b99a8ec162004f5"))
(package
(name "emacs-semantic-refactor")
(version (git-version "0.5" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tuhdo/semantic-refactor")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1lyz3zjkx2csh0xdy1zpx8s32qp1p3sig57mwi9xhgpqjyf0axmb"))))
(build-system emacs-build-system)
(home-page "https://github.com/tuhdo/semantic-refactor")
(synopsis "Refactoring tool for C/C++ and Lisp dialects")
(description "This package provides a refactoring tool based on the
Emacs Semantic parser framework. For C and C++ it supports operations such as:
@enumerate
@item Generating class implementations
@item Generating function prototypes
@item Converting functions to function pointers
@item Moving semantic units
@item etc...
@end enumerate
For Lisp dialects like Clojure, ELisp, and Scheme, it supports operations such
as:
@enumerate
@item Formatting the whole buffer
@item Converting sexpressions to one or multiple lines
@item etc...
@end enumerate\n")
(license license:gpl3+))))
(define-public emacs-nhexl-mode
(package
(name "emacs-nhexl-mode")
(version "1.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/nhexl-mode-"
version ".el"))
(sha256
(base32
"031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/nhexl-mode.html")
(synopsis "Minor mode to edit files via hex-dump format")
(description
"This package implements NHexl mode, a minor mode for editing files
in hex dump format. The mode command is called @command{nhexl-mode}.
This minor mode implements similar functionality to @command{hexl-mode},
but using a different implementation technique, which makes it
usable as a \"plain\" minor mode. It works on any buffer, and does
not mess with the undo log or with the major mode.
It also comes with:
@itemize
@item @command{nhexl-nibble-edit-mode}: a \"nibble editor\" minor mode, where
the cursor pretends to advance by nibbles (4-bit) and the self-insertion keys
(which only work for hex-digits) will only modify the nibble under point.
@item @command{nhexl-overwrite-only-mode}: a minor mode to try and avoid
moving text. In this minor mode, not only self-inserting keys overwrite
existing text, but commands like `yank' and @command{kill-region} as well.
@item It overrides @code{C-u} to use hexadecimal, so you can do @code{C-u a 4
C-f} to advance by #xa4 characters.
@end itemize\n")
(license license:gpl3+)))
(define-public emacs-helm-wikipedia
(let ((commit "126f044e0a0e1432e0791c33ce2a41875d704a9b"))
(package
(name "emacs-helm-wikipedia")
(version (git-version "0.0.0" "1" commit))
(home-page "https://github.com/emacs-helm/helm-wikipedia/")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"148a5xsnbsiddhf9cl7yxdk41lrv38h0pip91kcflw9d7l0dp7pr"))))
(build-system emacs-build-system)
(inputs
`(("helm" ,emacs-helm)))
(synopsis "Search suggestions and article extracts from Wikipedia for Emacs")
(description
"This package provides an Emacs Helm interface for search suggestions
and article extracts for Wikipedia.")
(license license:gpl3+))))

View File

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2016 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>

View File

@ -8,7 +8,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2018, 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Tim Stahel <swedneck@swedneck.xyz> ;;; Copyright © 2019 Tim Stahel <swedneck@swedneck.xyz>
;;; ;;;
@ -1003,7 +1003,8 @@ interface to select the best such procedures to use on a given system.")
"0w1n4d249vlpda0hi6z1v13qp21vlbp3ykn0m8qg4rd5132j7fg1")))) "0w1n4d249vlpda0hi6z1v13qp21vlbp3ykn0m8qg4rd5132j7fg1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:configure-flags '("--enable-shared")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-tests (add-before 'configure 'fix-tests
(lambda _ (lambda _
@ -1027,17 +1028,19 @@ determines the frequencies, decay constants, amplitudes, and phases of those sin
(define-public guile-libctl (define-public guile-libctl
(package (package
(name "guile-libctl") (name "guile-libctl")
(version "3.2.2") (version "4.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append (string-append
"http://ab-initio.mit.edu/libctl/libctl-" "https://github.com/NanoComp/libctl/releases/download/v"
version ".tar.gz")) version "/libctl-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1g7gqybq20jhdnw5vg18bgbj9jz0408gfmjvs8b4xs30pic8pgca")))) "0x8r56lpfq83kfbq28vr25icl19xpfd6fjrxzcpdmv30l9pash83"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-shared")))
(native-inputs (native-inputs
`(("fortran" ,gfortran))) `(("fortran" ,gfortran)))
(inputs (inputs
@ -1052,22 +1055,23 @@ for scientific simulations.")
(define-public mpb (define-public mpb
(package (package
(name "mpb") (name "mpb")
(version "1.5") (version "1.8.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append (string-append
"http://ab-initio.mit.edu/mpb/mpb-" "https://github.com/NanoComp/mpb/releases/download/v"
version ".tar.gz")) version "/mpb-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1mqb2d8jq957nksayjygq58iy8i42vjryzg9iy5fpfay31wzxsix")))) "1jgrb7dd6qs6j6y1gnxmdgrh79l2bvqa6nk60a4pw1annsks4brd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-libctl=" (list (string-append "--with-libctl="
(assoc-ref %build-inputs "libctl") (assoc-ref %build-inputs "libctl")
"/share/libctl")))) "/share/libctl")
"--enable-shared")))
(native-inputs (native-inputs
`(("fortran" ,gfortran) `(("fortran" ,gfortran)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
@ -1093,16 +1097,16 @@ fully-vectorial and three-dimensional methods.")
(define-public meep (define-public meep
(package (package
(name "meep") (name "meep")
(version "1.3") (version "1.8.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append (string-append
"http://ab-initio.mit.edu/meep/meep-" "https://github.com/NanoComp/meep/releases/download/v"
version ".tar.gz")) version "/meep-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0f6lbw2hrksg7xscwdqs78jc9nmzx9fs8j0hz1y4i8qknkqiyk2n")))) "14zyxmm3p80j5fz5b89sl7hgkgcisqjny5hjh4pi274ziqjqz8bm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1116,7 +1120,7 @@ fully-vectorial and three-dimensional methods.")
(inputs (inputs
`(("fftw" ,fftw) `(("fftw" ,fftw)
("gsl" ,gsl) ("gsl" ,gsl)
("guile" ,guile-2.0) ; doesn't build with guile-2.2 ("guile" ,guile-2.2)
("harminv" ,harminv) ("harminv" ,harminv)
("hdf5" ,hdf5) ("hdf5" ,hdf5)
("lapack" ,lapack) ("lapack" ,lapack)

View File

@ -2,7 +2,7 @@
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org> ;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
;;; ;;;

View File

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2018 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

View File

@ -7,7 +7,7 @@
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
;;; Copyright © 2016 Jookia <166291@gmail.com> ;;; Copyright © 2016 Jookia <166291@gmail.com>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com> ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
@ -267,19 +267,17 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over
(define-public font-liberation (define-public font-liberation
(package (package
(name "font-liberation") (name "font-liberation")
(version "2.00.1") (version "2.00.5")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://releases.pagure.org/" (uri (string-append "https://github.com/liberationfonts/liberation-fonts/"
"liberation-fonts/liberation-fonts-ttf-" "files/2926169/liberation-fonts-ttf-" version ".tar.gz"))
version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0kdjsbf0y716k1kv0i0ixdpvg7b9b8xkcsg6favaxdc7pshg0kzi"))))
"010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "https://pagure.io/liberation-fonts/") (home-page "https://github.com/liberationfonts")
(synopsis (synopsis "Fonts compatible with Arial, Times New Roman, and Courier New")
"Fonts compatible with Arial, Times New Roman, and Courier New")
(description (description
"The Liberation font family aims at metric compatibility with "The Liberation font family aims at metric compatibility with
Arial, Times New Roman, and Courier New. Arial, Times New Roman, and Courier New.
@ -353,14 +351,28 @@ Biolinum is available in both Regular and Bold weights.")
(sha256 (sha256
(base32 "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg")))) (base32 "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" "pcf-8bit"))
(arguments
`(#:tests? #f ; no test target in tarball
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-more-bits
;; X11 8-bit code pages aren't installed by default (they were
;; until version 4.46). Build and install them separately.
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "pcf-8bit" make-flags)))
(add-after 'install 'install-more-bits
(lambda* (#:key make-flags outputs #:allow-other-keys)
(let ((pcf-8bit (assoc-ref outputs "pcf-8bit")))
(apply invoke "make" "install-pcf-8bit" (string-append "prefix="
pcf-8bit)
make-flags)))))))
(native-inputs (native-inputs
`(("bdftopcf" ,bdftopcf) `(("bdftopcf" ,bdftopcf)
("font-util" ,font-util) ("font-util" ,font-util)
("mkfontdir" ,mkfontdir) ("mkfontdir" ,mkfontdir)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python))) ("python" ,python)))
(arguments
`(#:tests? #f)) ; no test target in tarball
(home-page "http://terminus-font.sourceforge.net/") (home-page "http://terminus-font.sourceforge.net/")
(synopsis "Simple bitmap programming font") (synopsis "Simple bitmap programming font")
(description "Terminus Font is a clean, fixed-width bitmap font, designed (description "Terminus Font is a clean, fixed-width bitmap font, designed

View File

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
@ -389,25 +389,20 @@ X11-system or any other graphical user interface.")
(define-public teckit (define-public teckit
(package (package
(name "teckit") (name "teckit")
(version "2.5.8") (version "2.5.9") ;signed by key 0xC9183BEA0288CDEE
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://github.com/silnrsi/teckit/releases/"
(url "https://github.com/silnrsi/teckit") "download/v" version "/teckit-" version ".tar.gz"))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1jmsdmfz7bgq1n5qsqgpq1b1n77f1hll0czfw5wkxz4knzb14ndn")))) (base32 "0gbxyip4wdibirdg2pvzayzyy927vxyd6dfyfiflx8zg88qzn8v8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("zlib" ,zlib) `(("zlib" ,zlib)
("expat" ,expat))) ("expat" ,expat)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("perl" ,perl))) ;for the tests
("automake" ,automake)
("libtool" ,libtool)
("perl" ,perl))) ; for the tests
(synopsis "Toolkit for encoding conversions") (synopsis "Toolkit for encoding conversions")
(description (description
"TECkit is a low-level toolkit intended to be used by other applications "TECkit is a low-level toolkit intended to be used by other applications
@ -560,14 +555,14 @@ definitions.")
(define-public fontforge (define-public fontforge
(package (package
(name "fontforge") (name "fontforge")
(version "20170731") (version "20190317")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/fontforge/fontforge/releases/download/" "https://github.com/fontforge/fontforge/releases/download/"
version "/fontforge-dist-" version ".tar.xz")) version "/fontforge-" version ".tar.gz"))
(sha256 (base32 (sha256 (base32
"08l8h3yvk4v7652jvmd3ls7nf5miybkx2fmkf1mpwwfixpxxw2l4")))) "1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -614,11 +609,7 @@ definitions.")
"pango" "cairo" "fontconfig"))) "pango" "cairo" "fontconfig")))
;; Checks for potrace program at runtime ;; Checks for potrace program at runtime
`("PATH" ":" prefix (,potrace))) `("PATH" ":" prefix (,potrace)))
#t)))) #t))))))
;; Skip test 40 "FontForge .sfd file open check" to work around
;; <https://github.com/fontforge/fontforge/issues/3246>.
#:make-flags '("TESTSUITEFLAGS=-k '!\\.sfd'")))
(synopsis "Outline font editor") (synopsis "Outline font editor")
(description (description
"FontForge allows you to create and modify postscript, truetype and "FontForge allows you to create and modify postscript, truetype and

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

View File

@ -9,7 +9,7 @@
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
@ -230,7 +230,7 @@ the freedesktop.org XDG Base Directory specification.")
(define-public elogind (define-public elogind
(package (package
(name "elogind") (name "elogind")
(version "239.4") (version "241.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -239,7 +239,7 @@ the freedesktop.org XDG Base Directory specification.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"106hld2fa89iz0d17gkmwvbkxc2yspn1klq73nvkj4878wx3vcr9")))) "0a4irq4ycps3xcizjjr0gz3j46dyqvcwa4ncinpqpqlasi8l18nk"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -398,14 +398,14 @@ Python.")
(define-public wayland (define-public wayland
(package (package
(name "wayland") (name "wayland")
(version "1.16.0") (version "1.17.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://wayland.freedesktop.org/releases/" (uri (string-append "https://wayland.freedesktop.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf")))) "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f)) `(#:parallel-tests? #f))

View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

View File

@ -857,16 +857,16 @@ interface (API).")
(define-public python-pygame (define-public python-pygame
(package (package
(name "python-pygame") (name "python-pygame")
(version "1.9.3") (version "1.9.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pygame" version)) (uri (pypi-uri "pygame" version))
(sha256 (sha256
(base32 (base32
"1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m")))) "1dn0nb86jl7yr8709cncxdr0yrmviqakw7zx3g8jbbwrr60if3bh"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; Tests require pygame to be installed first. `(#:tests? #f ; tests require pygame to be installed first
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Set the paths to the dependencies manually because ;; Set the paths to the dependencies manually because
@ -1237,7 +1237,7 @@ scripted in a Python-like language.")
(define-public eureka (define-public eureka
(package (package
(name "eureka") (name "eureka")
(version "1.21") (version "1.24")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/eureka-editor/Eureka/" (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/"
@ -1247,7 +1247,7 @@ scripted in a Python-like language.")
"-source.tar.gz")) "-source.tar.gz"))
(sha256 (sha256
(base32 (base32
"1a7pf7xi56fcz7jc8layih5gq5m66g2ss4x5j61kzgip07j6rkir")))) "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f

View File

@ -15,7 +15,7 @@
;;; Copyright © 2015, 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org> ;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
;;; Copyright © 2016, 2017, 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org> ;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
;;; Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@ -25,7 +25,7 @@
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info> ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
@ -36,6 +36,8 @@
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -143,6 +145,7 @@
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages vulkan) #:use-module (gnu packages vulkan)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages wget)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -256,13 +259,10 @@ canyons and wait for the long I-shaped block to clear four rows at a time.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public cataclysm-dda (define-public cataclysm-dda
(let ((commit "0b2c194e5c6a06f4fbf14a0ec1260e0f3cf2567c") (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc"))
(revision "2"))
(package (package
(name "cataclysm-dda") (name "cataclysm-dda")
;; This denotes the version released after the 0.C release. (version "0.D")
;; Revert to a normal version number if updating to stable version 0.D.
(version (git-version "0.C" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -270,7 +270,7 @@ canyons and wait for the long I-shaped block to clear four rows at a time.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1yzsn0y2g27bvbxjvivjyjhkmf2w5na1qqw5qfkswcfqqwym2y33")) "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -2335,7 +2335,7 @@ world}, @uref{http://evolonline.org, Evol Online} and
("sdl" ,sdl) ("sdl" ,sdl)
("xz" ,xz) ("xz" ,xz)
("zlib" ,zlib))) ("zlib" ,zlib)))
(synopsis "Transportation economics simulator") (synopsis "Transportation economics simulator game")
(description "OpenTTD is a game in which you transport goods and (description "OpenTTD is a game in which you transport goods and
passengers by land, water and air. It is a re-implementation of Transport passengers by land, water and air. It is a re-implementation of Transport
Tycoon Deluxe with many enhancements including multiplayer mode, Tycoon Deluxe with many enhancements including multiplayer mode,
@ -2556,7 +2556,7 @@ Transport Tycoon Deluxe.")
(define openrct2-objects (define openrct2-objects
(package (package
(name "openrct2-objects") (name "openrct2-objects")
(version "1.0.6") (version "1.0.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2564,8 +2564,7 @@ Transport Tycoon Deluxe.")
version "/objects.zip")) version "/objects.zip"))
(file-name (string-append name "-" version ".zip")) (file-name (string-append name "-" version ".zip"))
(sha256 (sha256
(base32 (base32 "02apb8h553m7d6jvysgb1zahvxc1yzyygfca2iclb21b3fhpsas4"))))
"00kfy95zx6g4ldr6br5p7bwkwfx6pw9v78fd3rvghjnwyvf5fhki"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs (native-inputs
`(("bash" ,bash) `(("bash" ,bash)
@ -2597,21 +2596,20 @@ Transport Tycoon Deluxe.")
(define-public openrct2 (define-public openrct2
(package (package
(name "openrct2") (name "openrct2")
(version "0.2.1") (version "0.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/OpenRCT2/OpenRCT2/archive/v" (uri (string-append "https://github.com/OpenRCT2/OpenRCT2/archive/v"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0yxaphgfq85piaacnnfy6lrvmnqmfj1891rxlkl5ndngq0zh0ysb"))
"1fxzk037xphpyk7vv5jfrcz739zrj86p43pnf5gjjv9rjxwv7m8f"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF"
"-DDOWNLOAD_TITLE_SEQUENCES=OFF") "-DDOWNLOAD_TITLE_SEQUENCES=OFF")
#:tests? #f ; Tests require network. #:tests? #f ; tests require network access
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-usr-share-paths&add-data (add-after 'unpack 'fix-usr-share-paths&add-data
@ -2622,10 +2620,12 @@ Transport Tycoon Deluxe.")
(substitute* "src/openrct2/platform/Platform.Linux.cpp" (substitute* "src/openrct2/platform/Platform.Linux.cpp"
(("/usr/share") (("/usr/share")
(string-append (assoc-ref %outputs "out") "/share"))) (string-append (assoc-ref %outputs "out") "/share")))
(copy-recursively (string-append titles (copy-recursively
"/share/openrct2/title-sequences") "data/title") (string-append titles "/share/openrct2/title-sequences")
(copy-recursively (string-append objects "data/title")
"/share/openrct2/objects") "data/object")))) (copy-recursively
(string-append objects "/share/openrct2/objects")
"data/object"))))
(add-before 'configure 'get-rid-of-errors (add-before 'configure 'get-rid-of-errors
(lambda _ (lambda _
;; Don't treat warnings as errors. ;; Don't treat warnings as errors.
@ -4822,6 +4822,8 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(("#elif defined(__FreeBSD__)" line) (("#elif defined(__FreeBSD__)" line)
(string-append (string-append
line " || defined(__GNUC__)"))) line " || defined(__GNUC__)")))
(substitute* '("src/tgl.h")
(("#include <GL/glext.h>") ""))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -6272,3 +6274,130 @@ game field is extended to 4D space, which has to filled up by the gamer with
4D hyper cubes.") 4D hyper cubes.")
(license license:gpl3))) (license license:gpl3)))
(define-public arx-libertatis
(package
(name "arx-libertatis")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "http://arx-libertatis.org/files/arx-libertatis-"
version ".tar.xz"))
(sha256
(base32
"0hjfxlsmp8wwqr06snv2dlly2s79ra0d9aw49gkp6rn8m50b9bc2"))))
(build-system cmake-build-system)
(outputs '("out" "installer"))
(arguments
'(#:tests? #f ; No tests.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-install-helper-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((p7zip (assoc-ref inputs "p7zip"))
(innoextract (assoc-ref inputs "innoextract"))
(wget (assoc-ref inputs "wget"))
(zenity (assoc-ref inputs "zenity")))
(substitute* "scripts/arx-install-data"
(("have innoextract")
(string-append "have " innoextract "/bin/innoextract"))
(("then innoextract")
(string-append "then " innoextract "/bin/innoextract"))
(("else innoextract")
(string-append "else " innoextract "/bin/innoextract"))
(("for _extract_zip_sz in 7za 7z")
(string-append "for _extract_zip_sz in " p7zip "/bin/7za"))
(("else if have 7z")
(string-append "else if have " p7zip "/bin/7za"))
(("7z x -tiso")
(string-append p7zip "/bin/7z x -tiso"))
(("if have wget")
(string-append "if have " wget "/bin/wget"))
(("wget -O")
(string-append wget "/bin/wget -O"))
(("for backend in \\$preferred zenity")
(string-append "for backend in $preferred " zenity "/bin/zenity"))
(("zenity +--title")
(string-append zenity "/bin/zenity --title"))
(("^zenity\\)")
(string-append zenity "/bin/zenity)"))))
#t))
(add-after 'install 'move-installer
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(installer (assoc-ref outputs "installer")))
(mkdir-p (string-append installer "/bin"))
(rename-file (string-append out "/bin/arx-install-data")
(string-append installer "/bin/arx-install-data"))))))))
(inputs
`(("sdl" ,sdl) ; Switch to sdl2 in >1.1.2.
("mesa" ,mesa) ; Switch to libepoxy in >1.1.2.
("glew" ,glew)
("openal" ,openal)
("zlib" ,zlib)
("boost" ,boost)
("glm" ,glm)
("freetype" ,freetype)
;; The following are only needed by the arx-install-data script.
("p7zip" ,p7zip) ; Install-helper uses it to extract ISO and .cab archives.
("zenity" ,zenity) ; GUI for install-helper.
("wget" ,wget) ; Used by the install-helper to download the patch.
;; The install-helper needs it to extract the patch.
("innoextract" ,innoextract)))
(home-page "https://arx-libertatis.org/")
(synopsis "Port of Arx Fatalis, a first-person role-playing game")
(description "Arx Libertatis is a cross-platform, open source port of Arx
Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by
Arkane Studios. This port however does not include the game data, so you need
to obtain a copy of the original Arx Fatalis or its demo to play Arx
Libertatis. Arx Fatalis features crafting, melee and ranged combat, as well
as a unique casting system where the player draws runes in real time to effect
the desired spell.")
(license license:gpl3+)))
(define-public edgar
(package
(name "edgar")
(version "1.30")
(source
(origin
(method url-fetch)
(uri
(string-append "https://github.com/riksweeney/edgar/releases/download/"
version "/edgar-" version "-1.tar.gz"))
(sha256
(base32
"0bhbs33dg0nb8wqlh6px1jj41j05f89ngdqwdkffabmjk7wq5isx"))))
(build-system gnu-build-system)
(arguments '(#:tests? #f ; there are no tests
#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "BIN_DIR=" (assoc-ref %outputs "out") "/bin/"))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'fix-env
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (string-append (assoc-ref inputs "sdl")
"/include/SDL/"))
#t)))))
(inputs `(("sdl" ,sdl)
("sdl-img" ,sdl-image)
("sdl-mixer" ,sdl-mixer)
("sdl-ttf" ,sdl-ttf)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("gnu-gettext" ,gnu-gettext)
("libtool" ,libtool)
("which" ,which)))
(synopsis "2d action platformer game")
(description "The Legend of Edgar is a 2D platform game with a persistent world.
When Edgar's father fails to return home after venturing out one dark and stormy night,
Edgar fears the worst: he has been captured by the evil sorcerer who lives in
a fortress beyond the forbidden swamp.")
(home-page "https://www.parallelrealities.co.uk/games/edgar/")
(license license:gpl2+)))

View File

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -99,15 +99,14 @@ most common applications of GD involve website development.")
(define-public perl-gd (define-public perl-gd
(package (package
(name "perl-gd") (name "perl-gd")
(version "2.69") (version "2.71")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/"
"GD-" version ".tar.gz")) "GD-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"))))
"0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x"))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs (inputs
`(("fontconfig" ,fontconfig) `(("fontconfig" ,fontconfig)
@ -130,15 +129,14 @@ you can create PNG images on the fly or modify existing files.")
(define-public perl-gd-securityimage (define-public perl-gd-securityimage
(package (package
(name "perl-gd-securityimage") (name "perl-gd-securityimage")
(version "1.73") (version "1.75")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/B/BU/BURAK/" (uri (string-append "mirror://cpan/authors/id/B/BU/BURAK/"
"GD-SecurityImage-" version ".tar.gz")) "GD-SecurityImage-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix"))))
"1kaxs67rfd4w46lxgcg3pa05a596l0h1k8n4zk2gwrrar4022wpx"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
'(#:phases '(#:phases

View File

@ -35,8 +35,8 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages mtools) #:use-module (gnu packages mtools)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages virtualization) #:use-module (gnu packages textutils)
#:use-module (gnu packages wm)) #:use-module (gnu packages virtualization))
(define-public genimage (define-public genimage
(package (package

View File

@ -52,6 +52,7 @@
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#: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 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 sqlite) #:use-module (gnu packages sqlite)
@ -201,15 +202,14 @@ and driving.")
(define-public libgeotiff (define-public libgeotiff
(package (package
(name "libgeotiff") (name "libgeotiff")
(version "1.4.2") (version "1.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq"))
"0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -741,29 +741,6 @@ to create databases that are optimized for rendering/tile/map-services.")
license:bsd-2 license:bsd-2
license:bsd-3)))) license:bsd-3))))
(define-public protozero
(package
(name "protozero")
(version "1.6.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mapbox/protozero.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "10ldzni46cplmkgx1f73yn95qcb71xh9nxpcfdmi107y3kvicv3c"))))
(build-system cmake-build-system)
(home-page "https://github.com/mapbox/protozero")
(synopsis "Minimalistic protocol buffer decoder and encoder in C++")
(description "Protozero is a minimalistic protocol buffer decoder and
encoder in C++. The developer using protozero has to manually translate the
@file{.proto} description into code.")
(license (list
license:asl2.0 ; for folly
license:bsd-2))))
(define-public libosmium (define-public libosmium
(package (package
(name "libosmium") (name "libosmium")

View File

@ -3,7 +3,7 @@
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net> ;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "18.3.4") (version "18.3.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -233,10 +233,10 @@ also known as DXTn or DXTC) for Mesa.")
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j")) "0lvrfjaic7dhay9v52f9k3q5aac8xagfq3pnzjrl0cn65jlaw9s0"))
(patches (patches
(search-patches "mesa-skip-disk-cache-test.patch")))) (search-patches "mesa-skip-disk-cache-test.patch"))))
(build-system gnu-build-system) (build-system meson-build-system)
(propagated-inputs (propagated-inputs
`(;; The following are in the Requires.private field of gl.pc. `(;; The following are in the Requires.private field of gl.pc.
("libdrm" ,libdrm) ("libdrm" ,libdrm)
@ -264,7 +264,10 @@ also known as DXTn or DXTC) for Mesa.")
("wayland" ,wayland) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols))) ("wayland-protocols" ,wayland-protocols)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("bison" ,bison)
("flex" ,flex)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python)
("python-mako" ,python-mako) ("python-mako" ,python-mako)
("which" ,(@ (gnu packages base) which)))) ("which" ,(@ (gnu packages base) which))))
@ -273,47 +276,48 @@ also known as DXTn or DXTC) for Mesa.")
'(,@(match (%current-system) '(,@(match (%current-system)
((or "armhf-linux" "aarch64-linux") ((or "armhf-linux" "aarch64-linux")
;; TODO: Fix svga driver for aarch64 and armhf. ;; TODO: Fix svga driver for aarch64 and armhf.
'("--with-gallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl")) '("-Dgallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl"))
(_ (_
'("--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
;; Enable various optional features. TODO: opencl requires libclc, ;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio ;; omx requires libomxil-bellagio
"--with-platforms=x11,drm,surfaceless,wayland" "-Dplatforms=x11,drm,surfaceless,wayland"
"--enable-glx-tls" ;Thread Local Storage, improves performance "-Dglx=dri" ;Thread Local Storage, improves performance
;; "--enable-opencl" ;; "-Dopencl=true"
;; "--enable-omx" ;; "-Domx=true"
"--enable-osmesa" "-Dosmesa=gallium"
"--enable-xa" "-Dgallium-xa=true"
;; features required by wayland ;; features required by wayland
"--enable-gles2" "-Dgles2=true"
"--enable-gbm" "-Dgbm=true"
"--enable-shared-glapi" "-Dshared-glapi=true"
;; Enable Vulkan on i686-linux and x86-64-linux. ;; Enable Vulkan on i686-linux and x86-64-linux.
,@(match (%current-system) ,@(match (%current-system)
("x86_64-linux" ("x86_64-linux"
'("--with-vulkan-drivers=intel,radeon")) '("-Dvulkan-drivers=intel,amd"))
;; TODO: Fix intel driver on i686-linux. ;; TODO: Fix intel driver on i686-linux.
("i686-linux" ("i686-linux"
'("--with-vulkan-drivers=radeon")) '("-Dvulkan-drivers=amd"))
(_ (_
'(""))) '("-Dvulkan-drivers=auto")))
;; Also enable the tests. ;; Also enable the tests.
"--enable-gallium-tests" "-Dbuild-tests=true"
;; on non-intel systems, drop i915 and i965 ;; on non-intel systems, drop i915 and i965
;; from the default dri drivers ;; from the default dri drivers
,@(match (%current-system) ,@(match (%current-system)
((or "x86_64-linux" "i686-linux") ((or "x86_64-linux" "i686-linux")
'("--with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast" '("-Ddri-drivers=i915,i965,nouveau,r200,r100"
"--enable-llvm")) ; default is x86/x86_64 only "-Dllvm=true")) ; default is x86/x86_64 only
(_ (_
'("--with-dri-drivers=nouveau,r200,radeon,swrast")))) '("-Ddri-drivers=nouveau,r200,r100"))))
#:modules ((ice-9 match) #:modules ((ice-9 match)
(srfi srfi-1) (srfi srfi-1)
(guix build utils) (guix build utils)
(guix build gnu-build-system)) (guix build meson-build-system))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after
@ -323,7 +327,7 @@ also known as DXTn or DXTC) for Mesa.")
(("/usr/bin/env python2") (which "python"))) (("/usr/bin/env python2") (which "python")))
#t)) #t))
(add-before (add-before
'build 'fix-dlopen-libnames 'configure 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; Remain agnostic to .so.X.Y.Z versions while doing ;; Remain agnostic to .so.X.Y.Z versions while doing

View File

@ -7,7 +7,7 @@
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
@ -668,7 +668,7 @@ useful for C++.")
(define-public perl-glib (define-public perl-glib
(package (package
(name "perl-glib") (name "perl-glib")
(version "1.327") (version "1.329")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -676,7 +676,7 @@ useful for C++.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0n7hjhbh5xhagvb0qjwzg21j22ks0csah0chgk98g4wnfllxjl0k")))) "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-extutils-depends" ,perl-extutils-depends) `(("perl-extutils-depends" ,perl-extutils-depends)

View File

@ -8,7 +8,7 @@
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2015, 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015, 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
@ -19,7 +19,7 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
@ -58,6 +58,7 @@
#:use-module (gnu packages avahi) #:use-module (gnu packages avahi)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages build-tools) #:use-module (gnu packages build-tools)
#:use-module (gnu packages calendar) #:use-module (gnu packages calendar)
@ -120,6 +121,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit) #:use-module (gnu packages polkit)
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
@ -1308,6 +1310,72 @@ dealing with different structured file formats.")
(license license:lgpl2.1))) (license license:lgpl2.1)))
(define-public librsvg (define-public librsvg
(package
(name "librsvg")
(version "2.40.20")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--disable-static"
"--enable-vala") ; needed for e.g. gnome-mines
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
;; By default the gdk-pixbuf loader is installed under
;; gdk-pixbuf's prefix. Work around that.
(("gdk_pixbuf_moduledir = .*$")
(string-append "gdk_pixbuf_moduledir = "
"$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
"loaders\n"))
;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
(("gdk_pixbuf_cache_file = .*$")
"gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
#t))
(add-before 'check 'remove-failing-tests
(lambda _
(with-directory-excursion "tests/fixtures/reftests"
(for-each delete-file
'(;; This test fails on i686:
"svg1.1/masking-path-04-b.svg"
;; This test fails on armhf:
"svg1.1/masking-mask-01-b.svg"
;; This test fails on aarch64:
"bugs/777834-empty-text-children.svg")))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("vala" ,vala)
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(inputs
`(("pango" ,pango)
("libcroco" ,libcroco)
("bzip2" ,bzip2)
("libgsf" ,libgsf)
("libxml2" ,libxml2)))
(propagated-inputs
;; librsvg-2.0.pc refers to all of that.
`(("cairo" ,cairo)
("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)))
(home-page "https://wiki.gnome.org/LibRsvg")
(synopsis "Render SVG files using Cairo")
(description
"Librsvg is a C library to render SVG files using the Cairo 2D graphics
library.")
(license license:lgpl2.0+)))
(define-public librsvg-next
(package (package
(name "librsvg") (name "librsvg")
(version "2.44.12") (version "2.44.12")
@ -2382,7 +2450,7 @@ and RDP protocols.")
(define-public dconf (define-public dconf
(package (package
(name "dconf") (name "dconf")
(version "0.28.0") (version "0.32.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2391,7 +2459,7 @@ and RDP protocols.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1")))) "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38"))))
(build-system meson-build-system) (build-system meson-build-system)
(propagated-inputs (propagated-inputs
;; In Requires of dconf.pc. ;; In Requires of dconf.pc.
@ -2400,7 +2468,8 @@ and RDP protocols.")
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("dbus" ,dbus))) ("dbus" ,dbus)))
(native-inputs (native-inputs
`(("libxslt" ,libxslt) ;for xsltproc `(("bash-completion" ,bash-completion)
("libxslt" ,libxslt) ;for xsltproc
("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("docbook-xml" ,docbook-xml-4.2) ("docbook-xml" ,docbook-xml-4.2)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
@ -3260,15 +3329,15 @@ playlists in a variety of formats.")
(define-public aisleriot (define-public aisleriot
(package (package
(name "aisleriot") (name "aisleriot")
(version "3.22.5") (version "3.22.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/aisleriot/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) "aisleriot-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh")))) "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -3764,7 +3833,8 @@ for application developers.")
(sha256 (sha256
(base32 (base32
"1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g")) "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g"))
(patches (search-patches "totem-meson-easy-codec.patch")))) (patches (search-patches "totem-meson-easy-codec.patch"
"totem-meson-compat.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -4772,7 +4842,7 @@ configuration program to choose applications starting on login.")
;; For testing ;; For testing
("dbus-launch" ,dbus) ("dbus-launch" ,dbus)
("uuidgen" ,util-linux) ("uuidgen" ,util-linux)
("xvfb" ,xorg-server))) ("xvfb" ,xorg-server-for-tests)))
(propagated-inputs (propagated-inputs
;; These are all in the Requires.private field of gjs-1.0.pc. ;; These are all in the Requires.private field of gjs-1.0.pc.
`(("cairo" ,cairo) `(("cairo" ,cairo)
@ -5758,13 +5828,21 @@ properties, screen resolution, and other GNOME parameters.")
#t)))) #t))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
#:disallowed-references ((,glib "bin")
,inkscape ,libxslt
,ruby-sass)
#:configure-flags #:configure-flags
(list "-Dsystemd=false" (list "-Dsystemd=false"
;; Otherwise, the RUNPATH will lack the final path component. ;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath=" (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/gnome-shell")) "/lib/gnome-shell"))
#:modules ((guix build meson-build-system)
(guix build utils)
(srfi srfi-1))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-keysdir (add-after 'unpack 'fix-keysdir
@ -5807,7 +5885,16 @@ properties, screen resolution, and other GNOME parameters.")
`("PYTHONPATH" ":" prefix (,python-path)) `("PYTHONPATH" ":" prefix (,python-path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
'("gnome-shell-extension-tool" "gnome-shell-perf-tool")) '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))
#t)))))) #t)))
(replace 'glib-or-gtk-wrap
(let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap)))
(lambda* (#:key inputs outputs #:allow-other-keys #:rest rest)
;; By default Inkscape et al. would end up in the XDG_DATA_DIRS
;; settings of the wrappers created by the 'glib-or-gtk-wrap'
;; phase. Fix that since we don't need these.
(wrap #:inputs (fold alist-delete inputs
'("inkscape" "intltool" "glib:bin"))
#:outputs outputs)))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
@ -5820,7 +5907,7 @@ properties, screen resolution, and other GNOME parameters.")
("sassc" ,sassc) ("sassc" ,sassc)
("xsltproc" ,libxslt) ("xsltproc" ,libxslt)
;; For tests ;; For tests
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server-for-tests)))
(inputs (inputs
`(("accountsservice" ,accountsservice) `(("accountsservice" ,accountsservice)
("caribou" ,caribou) ("caribou" ,caribou)
@ -7702,3 +7789,52 @@ underlying library but cannot for various reasons. In most cases, they are
wildly out of scope for those libraries. In other cases, they are not quite wildly out of scope for those libraries. In other cases, they are not quite
generic enough to work for everyone.") generic enough to work for everyone.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public evolution
(package
(name "evolution")
(version "3.28.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/evolution/"
(version-major+minor version) "/"
"evolution-" version ".tar.xz"))
(sha256
(base32
"0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged
"-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release
; in four years and cannot be built.
(native-inputs
`(("glib" ,glib "bin") ; glib-mkenums
("pkg-config" ,pkg-config)
("intltool" ,intltool)
("itstool" ,itstool)))
(inputs
`(("enchant" ,enchant)
("evolution-data-server" ,evolution-data-server) ; must be the same version
("gcr" ,gcr)
("gnome-autoar" ,gnome-autoar)
("gnome-desktop" ,gnome-desktop)
("gtkspell3" ,gtkspell3)
("highlight" ,highlight)
("libcanberra" ,libcanberra)
("libgweather" ,libgweather)
("libnotify" ,libnotify)
("libsoup" ,libsoup)
("nss" ,nss)
("openldap" ,openldap)
("webkitgtk" ,webkitgtk)
("ytnef" ,ytnef)))
(home-page "https://gitlab.gnome.org/GNOME/evolution")
(synopsis "Manage your email, contacts and schedule")
(description "Evolution is a personal information management application
that provides integrated mail, calendaring and address book
functionality.")
;; See COPYING for details.
(license (list license:lgpl2.1 license:lgpl3 ; either one of these
license:openldap2.8 ; addressbook/gui/component/openldap-extract.h
license:lgpl2.1+)))) ; smime/lib/*

View File

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017, 2018, 2019 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; ;;;
@ -68,16 +68,14 @@
(define-public libextractor (define-public libextractor
(package (package
(name "libextractor") (name "libextractor")
(version "1.8") (version "1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/libextractor/libextractor-" (uri (string-append "mirror://gnu/libextractor/libextractor-"
version ".tar.gz")) version ".tar.gz"))
(patches (search-patches "libextractor-CVE-2018-20430.patch"
"libextractor-CVE-2018-20431.patch"))
(sha256 (sha256
(base32 (base32
"1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2")))) "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; WARNING: Checks require /dev/shm to be in the build chroot, especially
;; not to be a symbolic link to /run/shm. ;; not to be a symbolic link to /run/shm.

View File

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
@ -223,14 +223,14 @@ compatible to GNU Pth.")
(define-public gnupg (define-public gnupg
(package (package
(name "gnupg") (name "gnupg")
(version "2.2.13") (version "2.2.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn")))) "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View File

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
@ -407,7 +407,7 @@ in C/C++.")
(define-public nspr (define-public nspr
(package (package
(name "nspr") (name "nspr")
(version "4.20") (version "4.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -415,7 +415,7 @@ in C/C++.")
version "/src/nspr-" version ".tar.gz")) version "/src/nspr-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c")))) "0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
@ -443,7 +443,7 @@ in the Mozilla clients.")
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(version "3.42.1") (version "3.43")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -454,7 +454,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88")) "1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (search-patches "nss-pkgconfig.patch" (patches (search-patches "nss-pkgconfig.patch"
"nss-increase-test-timeout.patch")))) "nss-increase-test-timeout.patch"))))
@ -578,7 +578,7 @@ from forcing GEXP-PROMISE."
#:system system #:system system
#:guile-for-build guile))) #:guile-for-build guile)))
(define %icecat-version "60.5.1-guix1") (define %icecat-version "60.6.0-guix1")
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -600,7 +600,7 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"1xbi1gvrrvqby04vx6klxff7h5r87dqgi1fx6i4mbg3ll59gy09z")))) "1mc57dhwyjr6qjm3q617wvj306wi72548wjx7lz1dxkz6hndi03w"))))
(upstream-icecat-base-version "60.3.0") ; maybe older than base-version (upstream-icecat-base-version "60.3.0") ; maybe older than base-version
(upstream-icecat-gnu-version "1") (upstream-icecat-gnu-version "1")
@ -722,11 +722,15 @@ from forcing GEXP-PROMISE."
(string-append old-icecat-dir "/l10n") (string-append old-icecat-dir "/l10n")
(string-append old-icecat-dir "/debian")) (string-append old-icecat-dir "/debian"))
(format #t (string-append "Packing new IceCat tarball...~%")) (format #t "Packing new IceCat tarball...~%")
(force-output) (force-output)
(invoke "tar" "cfa" #$output (invoke "tar" "cfa" #$output
;; avoid non-determinism in the archive ;; Avoid non-determinism in the archive. We set the
"--mtime=@0" ;; mtime of files in the archive to early 1980 because
;; the build process fails if the mtime of source
;; files is pre-1980, due to the creation of zip
;; archives.
"--mtime=@315619200" ; 1980-01-02 UTC
"--owner=root:0" "--owner=root:0"
"--group=root:0" "--group=root:0"
"--sort=name" "--sort=name"

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2016, 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -182,7 +182,7 @@ together over the internet in real-time.")
(define-public libinfinity (define-public libinfinity
(package (package
(name "libinfinity") (name "libinfinity")
(version "0.6.8") (version "0.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -190,12 +190,12 @@ together over the internet in real-time.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0nylsb6qz9pjw3agjp27c4za205i6zg6i5g1vgs5vbdnbh77wkhc")))) "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("gsasl" ,gsasl) ("gsasl" ,gsasl)
("gtk+" ,gtk+-2) ("gtk+" ,gtk+)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

File diff suppressed because it is too large Load Diff

79
gnu/packages/gpodder.scm Normal file
View File

@ -0,0 +1,79 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gpodder)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cmake)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt))
(define-public libmygpo-qt
(package
(name "libmygpo-qt")
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (string-append "http://stefan.derkits.at/files/"
"libmygpo-qt/libmygpo-qt." version ".tar.gz"))
(sha256
(base32
"1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2"))
(patches (search-patches "libmygpo-qt-fix-qt-5.11.patch"
"libmygpo-qt-missing-qt5-modules.patch"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("qt" ,qtbase)))
(arguments
`(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON")
;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446
;; is fixed.
#:tests? #f))
(home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt")
(synopsis "Qt/C++ library wrapping the gpodder web service")
(description "@code{libmygpo-qt} is a Qt/C++ library wrapping the
@url{https://gpodder.net} APIs. It allows applications to discover, manage
and track podcasts.")
(license license:lgpl2.1+)))
(define-public python-podcastparser
(package
(name "python-podcastparser")
(version "0.6.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "podcastparser" version))
(sha256
(base32
"1ksj1gcmbnm5i43xhpqxbs2mqi6xzawwwkwbh9h6lwa1wxxvv247"))))
(native-inputs
`(("python-nose" ,python-nose)))
(build-system python-build-system)
(home-page "http://gpodder.org/podcastparser")
(synopsis "Simplified and fast RSS parser Python library")
(description "@code{podcastparser} is a library for the gPodder project to
provide an easy and reliable way of parsing RSS and Atom-based podcast feeds
in Python.")
(license license:isc)))

View File

@ -11,6 +11,7 @@
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Alex Kost <alezost@gmail.com> ;;; Copyright © 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -165,10 +166,98 @@ the 3D pipeline—modeling, rigging, animation, simulation, rendering,
compositing and motion tracking, even video editing and game creation. The compositing and motion tracking, even video editing and game creation. The
application can be customized via its API for Python scripting. application can be customized via its API for Python scripting.
WARNING: This package offers a beta build of Blender, because the stable release WARNING: This is a beta build of Blender.")
no longer works in Guix. See @uref{https://issues.guix.info/issue/33882}.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public blender-2.79
(package
(name "blender")
(version "2.79b")
(source (origin
(method url-fetch)
(uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.gz"))
(sha256
(base32
"1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"))
(patches (search-patches "blender-2.79-newer-ffmpeg.patch"
"blender-2.79-python-3.7-fix.patch"))))
(build-system cmake-build-system)
(arguments
(let ((python-version (version-major+minor (package-version python))))
`(;; Test files are very large and not included in the release tarball.
#:tests? #f
#:configure-flags
(list "-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_CYCLES=ON"
"-DWITH_DOC_MANPAGE=ON"
"-DWITH_FFTW3=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_IMAGE_OPENJPEG=ON"
"-DWITH_INPUT_NDOF=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_JACK=ON"
"-DWITH_MOD_OCEANSIM=ON"
"-DWITH_PLAYER=ON"
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_SYSTEM_OPENJPEG=ON"
(string-append "-DPYTHON_LIBRARY=python" ,python-version "m")
(string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python")
"/lib")
(string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python")
"/include/python" ,python-version "m")
(string-append "-DPYTHON_VERSION=" ,python-version))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-broken-import
(lambda _
(substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
(("import encode_bin") "from . import encode_bin"))
#t))
(add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not appear
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
;; the CPATH to satisfy the dependency on "half.h".
(setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase")
"/include/OpenEXR"
":" (or (getenv "CPATH") "")))
#t))))))
(inputs
`(("boost" ,boost)
("jemalloc" ,jemalloc)
("libx11" ,libx11)
("openimageio" ,openimageio)
("openexr" ,openexr)
("ilmbase" ,ilmbase)
("openjpeg" ,openjpeg-1)
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libtiff" ,libtiff)
("ffmpeg" ,ffmpeg)
("fftw" ,fftw)
("jack" ,jack-1)
("libsndfile" ,libsndfile)
("freetype" ,freetype)
("glew" ,glew)
("openal" ,openal)
("python" ,python)
("zlib" ,zlib)))
(home-page "https://blender.org/")
(synopsis "3D graphics creation suite")
(description
"Blender is a 3D graphics creation suite. It supports the entirety of
the 3D pipelinemodeling, rigging, animation, simulation, rendering,
compositing and motion tracking, even video editing and game creation. The
application can be customized via its API for Python scripting.
NOTE: This older version of Blender is the last release that does not require
OpenGL 3. It is retained for use with older computers.")
(license license:gpl2+)))
(define-public assimp (define-public assimp
(package (package
(name "assimp") (name "assimp")

View File

@ -227,6 +227,7 @@ for the GStreamer multimedia library.")
("flac" ,flac) ("flac" ,flac)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+)
("jack" ,jack-1) ("jack" ,jack-1)
("lame" ,lame) ("lame" ,lame)
("libavc1394" ,libavc1394) ("libavc1394" ,libavc1394)

View File

@ -13,7 +13,7 @@
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org> ;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@ -85,7 +85,7 @@
(define-public atk (define-public atk
(package (package
(name "atk") (name "atk")
(version "2.28.1") (version "2.32.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -93,17 +93,12 @@
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd")))) "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb"))))
(build-system gnu-build-system) (build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
`(#:configure-flags
(list (string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))))
(propagated-inputs `(("glib" ,glib))) ; required by atk.pc (propagated-inputs `(("glib" ,glib))) ; required by atk.pc
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
("glib" ,glib "bin") ; glib-mkenums, etc. ("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(synopsis "GNOME accessibility toolkit") (synopsis "GNOME accessibility toolkit")
@ -402,9 +397,9 @@ printing and other features typical of a source code editor.")
(version "4.0.2") (version "4.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/gtksourceview/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) "gtksourceview-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1b2z9c0skxrgw2vh08hv6qxky8jbvamc4rgww82j0kpp533rz0hm")))) "1b2z9c0skxrgw2vh08hv6qxky8jbvamc4rgww82j0kpp533rz0hm"))))
@ -447,7 +442,7 @@ highlighting and other features typical of a source code editor.")
(define-public gtksourceview-3 (define-public gtksourceview-3
(package (inherit gtksourceview) (package (inherit gtksourceview)
(name "gtksourceview") (name "gtksourceview")
(version "3.24.7") (version "3.24.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -455,7 +450,7 @@ highlighting and other features typical of a source code editor.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1rp8zspwyw3mmdgccsas3pa6v7s0hqjaaglg6n4kcls7ccx0vhm5")))))) "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))))
(define-public gdk-pixbuf (define-public gdk-pixbuf
(package (package
@ -560,20 +555,21 @@ in the GNOME project.")
(define-public at-spi2-core (define-public at-spi2-core
(package (package
(name "at-spi2-core") (name "at-spi2-core")
(version "2.28.0") (version "2.32.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "at-spi2-core-meson-compat.patch"))
(sha256 (sha256
(base32 (base32
"11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2")))) "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
'(#:configure-flags '(#:configure-flags
(list "-Denable_docs=true") (list "-Ddocs=true")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-documentation-path (add-after 'unpack 'set-documentation-path
@ -610,9 +606,8 @@ in the GNOME project.")
(propagated-inputs (propagated-inputs
;; atspi-2.pc refers to all these. ;; atspi-2.pc refers to all these.
`(("dbus" ,dbus) `(("dbus" ,dbus)
("glib" ,glib))) ("glib" ,glib)
(inputs ("libxi" ,libxi)
`(("libxi" ,libxi)
("libxtst" ,libxtst))) ("libxtst" ,libxtst)))
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) `(("gobject-introspection" ,gobject-introspection)
@ -630,7 +625,7 @@ is part of the GNOME accessibility project.")
(define-public at-spi2-atk (define-public at-spi2-atk
(package (package
(name "at-spi2-atk") (name "at-spi2-atk")
(version "2.26.2") (version "2.32.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -638,8 +633,8 @@ is part of the GNOME accessibility project.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1")))) "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"))))
(build-system gnu-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -647,14 +642,16 @@ is part of the GNOME accessibility project.")
;; Run test-suite under a dbus session. ;; Run test-suite under a dbus session.
(lambda _ (lambda _
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0")
(invoke "dbus-launch" "make" "check")))))) (invoke "dbus-launch" "meson" "test"))))))
(propagated-inputs (propagated-inputs
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
(inputs (inputs
`(("atk" ,atk))) `(("atk" ,atk)))
(native-inputs (native-inputs
`(("dbus" ,dbus) ; for testing `(("pkg-config" ,pkg-config)
("pkg-config" ,pkg-config))) ;; For tests.
("dbus" ,dbus)
("libxml2" ,libxml2)))
(synopsis "Assistive Technology Service Provider Interface, ATK bindings") (synopsis "Assistive Technology Service Provider Interface, ATK bindings")
(description (description
"The Assistive Technology Service Provider Interface "The Assistive Technology Service Provider Interface

View File

@ -1,8 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2016 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -87,39 +87,74 @@ dependencies.")
"086dijnpl5dpglf70d6f9sizyakr313y7blpdjrmbi687j1x3qcl")))) "086dijnpl5dpglf70d6f9sizyakr313y7blpdjrmbi687j1x3qcl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`( ;; The '.scm' files go to $(datadir), so set that to the `(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 rdelim)
(ice-9 popen))
;; The '.scm' files go to $(datadir), so set that to the
;; standard value. ;; standard value.
#:configure-flags (list (string-append "--datadir=" #:configure-flags (list (string-append "--datadir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.2")) "/share/guile/site/2.2"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-go-directory (add-before 'configure 'set-module-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install .go files to $out/share/guile/site/2.2. ;; Install .scm files to $out/share/guile/site/2.2.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out"))
(effective (read-line
(open-pipe* OPEN_READ
"guile" "-c"
"(display (effective-version))"))))
(substitute* "module/Makefile.in" (substitute* "module/Makefile.in"
(("^wmdir = .*$") (("^wmdir = .*$")
(string-append "wmdir = " out (string-append "wmdir = " out
"/share/guile/site/2.2\n")))) "/share/guile/site/"
effective "\n"))))
#t)) #t))
(add-after 'install 'set-load-path (add-after 'install 'set-load-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Put Guile-XCB's and Guile-WM's modules in the ;; Put Guile-XCB's and Guile-WM's modules in the
;; search path of PROG. ;; search path of PROG.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(effective (read-line
(open-pipe* OPEN_READ
"guile" "-c"
"(display (effective-version))")))
(prog (string-append out "/bin/guile-wm")) (prog (string-append out "/bin/guile-wm"))
(mods (string-append (mods (string-append out "/share/guile/site/" effective))
out "/share/guile/site/2.2")) (gos (string-append out "/lib/guile/" effective "/site-ccache"))
(xcb (string-append (xcb (assoc-ref inputs "guile-xcb")))
(assoc-ref inputs "guile-xcb") (wrap-program prog
"/share/guile/site/2.2"))) `("GUILE_AUTO_COMPILE" ":" = ("0"))
(wrap-program `("GUILE_LOAD_PATH" ":" prefix
prog (,mods ,(string-append xcb "/share/guile/site/" effective)))
`("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix `("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,mods ,xcb)))) (,gos ,(string-append xcb "/lib/guile/"
effective "/site-ccache")))))
#t)) #t))
(add-after 'install 'install-go-files
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(effective (read-line
(open-pipe* OPEN_READ
"guile" "-c"
"(display (effective-version))")))
(module-dir (string-append out "/share/guile/site/"
effective))
(object-dir (string-append out "/lib/guile/" effective
"/site-ccache"))
(prefix (string-length module-dir)))
(setenv "GUILE_AUTO_COMPILE" "0")
;; compile to the destination
(for-each (lambda (file)
(let* ((base (string-drop (string-drop-right file 4)
prefix))
(go (string-append object-dir base ".go")))
(invoke "guild" "compile" "-L" module-dir
file "-o" go)))
(find-files module-dir "\\.scm$"))
#t)))
(add-after 'install 'install-xsession (add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; add a .desktop file to xsessions ;; add a .desktop file to xsessions

View File

@ -14,7 +14,7 @@
;;; Copyright © 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>

View File

@ -3,7 +3,7 @@
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 rsiddharth <s@ricketyspace.net> ;;; Copyright © 2017 rsiddharth <s@ricketyspace.net>

View File

@ -1,9 +1,9 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2017 rsiddharth <s@ricketyspace.net> ;;; Copyright © 2017 rsiddharth <s@ricketyspace.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -357,7 +357,7 @@ are implemented as FFI bindings to efficient code from zlib.")
(define-public ghc-entropy (define-public ghc-entropy
(package (package
(name "ghc-entropy") (name "ghc-entropy")
(version "0.4.1.1") (version "0.4.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -365,8 +365,7 @@ are implemented as FFI bindings to efficient code from zlib.")
"entropy-" version "/" "entropy-" version "/"
"entropy-" version ".tar.gz")) "entropy-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf"))))
"1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(home-page "https://github.com/TomMD/entropy") (home-page "https://github.com/TomMD/entropy")
(synopsis "Provides platform independent entropy source for Haskell") (synopsis "Provides platform independent entropy source for Haskell")
@ -462,14 +461,14 @@ libraries, like OpenSSL.")
(define-public ghc-x509 (define-public ghc-x509
(package (package
(name "ghc-x509") (name "ghc-x509")
(version "1.7.3") (version "1.7.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"x509/x509-" version ".tar.gz")) "x509/x509-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21")))) "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-memory" ,ghc-memory) `(("ghc-memory" ,ghc-memory)
@ -491,7 +490,7 @@ libraries, like OpenSSL.")
(define-public ghc-x509-store (define-public ghc-x509-store
(package (package
(name "ghc-x509-store") (name "ghc-x509-store")
(version "1.6.6") (version "1.6.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
@ -499,7 +498,7 @@ libraries, like OpenSSL.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va")))) "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-pem" ,ghc-pem) `(("ghc-pem" ,ghc-pem)
@ -520,7 +519,7 @@ collections, certificates, revocation lists, and exception lists.")
(define-public ghc-x509-validation (define-public ghc-x509-validation
(package (package
(name "ghc-x509-validation") (name "ghc-x509-validation")
(version "1.6.10") (version "1.6.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
@ -528,7 +527,7 @@ collections, certificates, revocation lists, and exception lists.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n")))) "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-memory" ,ghc-memory) `(("ghc-memory" ,ghc-memory)

View File

@ -4,7 +4,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
@ -3974,7 +3974,7 @@ work, but is substantially simpler and faster.")
(define-public ghc-base64-bytestring (define-public ghc-base64-bytestring
(package (package
(name "ghc-base64-bytestring") (name "ghc-base64-bytestring")
(version "1.0.0.1") (version "1.0.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3983,8 +3983,7 @@ work, but is substantially simpler and faster.")
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32 "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr"))))
"0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
(home-page "https://github.com/bos/base64-bytestring") (home-page "https://github.com/bos/base64-bytestring")

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -34,7 +35,7 @@
(define-public hyperledger-fabric (define-public hyperledger-fabric
(package (package
(name "hyperledger-fabric") (name "hyperledger-fabric")
(version "1.4") (version "1.4.0")
;; While the GitHub repository is supposed to be "just a mirror," the Go ;; While the GitHub repository is supposed to be "just a mirror," the Go
;; imports refer to it explicitly. ;; imports refer to it explicitly.
(home-page "https://github.com/hyperledger/fabric") (home-page "https://github.com/hyperledger/fabric")
@ -42,10 +43,11 @@
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url home-page) (url home-page)
(commit (string-append "release-" version)))) ;; release-…’ are branches, and move. v… are the tags.
(commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1g003wf6439f2c9i2vphf4sh463yyasq1vpqmkpw9lj170a6kl8k")) "0nmg24ishwddxm1i2vh5ah5ylmmcg0apnjbgv1hljvhl48k4pzxq"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system go-build-system) (build-system go-build-system)
(native-inputs (native-inputs

View File

@ -4,7 +4,7 @@
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018 Lprndn <guix@lprndn.info> ;;; Copyright © 2018 Lprndn <guix@lprndn.info>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
@ -59,36 +59,39 @@
#: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 serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
;; We use the latest snapshot of this package because the latest release is
;; from 2011 and has known vulnerabilities that cannot easily be fixed by
;; applying patches.
(define-public dcmtk (define-public dcmtk
(package (package
(name "dcmtk") (name "dcmtk")
(version "3.6.1_20170228") (version "3.6.4")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://dicom.offis.de/pub/dicom/offis/" (uri
"software/dcmtk/snapshot/dcmtk-" (string-append "ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/"
version ".tar.gz")) "dcmtk" (string-join (string-split version #\.) "")
"/dcmtk-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1h22z8g0kmvhg8lgkbikyzyphhvxvq6018a00yd6i4g0z9ag6gx9"))))
"04cwfx8yrscqcd59mxk2fh6314ckayi9cp68iql5a57pf2pg5qld")))) (build-system cmake-build-system)
(build-system gnu-build-system)
(inputs (inputs
`(("libtiff" ,libtiff) `(;; Our ICU is too recent: “error: UChar does not name a type“.
;; ("icu4c" ,icu4c)
("libjpeg" ,libjpeg)
("libpng" ,libpng) ("libpng" ,libpng)
("doxygen" ,doxygen) ("libtiff" ,libtiff)
("libxml2" ,libxml2)
("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("doxygen" ,doxygen))) ; for HTML documentation
(home-page "http://dcmtk.org") (home-page "https://dcmtk.org")
(synopsis "Libraries and programs implementing parts of the DICOM standard") (synopsis "Libraries and programs implementing parts of the DICOM standard")
(description "DCMTK is a collection of libraries and applications (description "DCMTK is a collection of libraries and applications
implementing large parts the DICOM standard. It includes software for implementing large parts the DICOM standard. It includes software for
@ -414,14 +417,15 @@ vision algorithms. It can be used to do things like:
(define-public vips (define-public vips
(package (package
(name "vips") (name "vips")
(version "8.7.1") (version "8.7.4")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/libvips/libvips/releases/download/v" "https://github.com/libvips/libvips/releases/download/v"
version "/vips-" version ".tar.gz")) version "/vips-" version ".tar.gz"))
(sha256 (sha256
(base32 "1w3b90pdw7nj2p0gb4f96h6zhmga513f968ldfhz1rkhg7y81c0s")))) (base32 "01gjhcrl6zj7mcj1al717v5jsniahplqhz1xkfh2j78vyfl1hxff"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -449,9 +453,15 @@ vision algorithms. It can be used to do things like:
("expat" ,expat) ("expat" ,expat)
("hdf5" ,hdf5))) ("hdf5" ,hdf5)))
(home-page "https://libvips.github.io/libvips/") (home-page "https://libvips.github.io/libvips/")
(synopsis "Image processing system") (synopsis "Multithreaded image processing system with low memory needs")
(description (description
"vips is a demand-driven, horizontally threaded image processing library.") "VIPS is a demand-driven, horizontally threaded image processing library.
It's particularly good at processing large images, working with colour,
scientific analysis, and general research & development.
Compared to most image processing libraries VIPS needs little RAM and runs
quickly, especially on machines with more than one CPU core. This is primarily
due to its architecture which automatically parallelises the image workflows.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public nip2 (define-public nip2

View File

@ -4,7 +4,7 @@
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
@ -188,7 +188,7 @@ It is the default image viewer on LXDE desktop environment.")
(define-public sxiv (define-public sxiv
(package (package
(name "sxiv") (name "sxiv")
(version "24") (version "25")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -197,7 +197,7 @@ It is the default image viewer on LXDE desktop environment.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d")))) "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -206,7 +206,7 @@ It is the default image viewer on LXDE desktop environment.")
"CC=gcc" "CC=gcc"
;; Xft.h #includes <ft2build.h> (without freetype2/). The sxiv ;; Xft.h #includes <ft2build.h> (without freetype2/). The sxiv
;; Makefile works around this by hard-coding /usr/include instead. ;; Makefile works around this by hard-coding /usr/include instead.
(string-append "DEF_CPPFLAGS=-I" (string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "freetype") (assoc-ref %build-inputs "freetype")
"/include/freetype2") "/include/freetype2")
"V=1") "V=1")
@ -285,17 +285,16 @@ your images. Among its features are:
(define-public catimg (define-public catimg
(package (package
(name "catimg") (name "catimg")
(version "2.4.0") (version "2.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/posva/catimg.git") (url "https://github.com/posva/catimg.git")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0n74iczzgxrcq3zpa7ndycb9rinm829yvf81c747q4ngv5q6pzcm"))))
"1sk74nfc1aklg784pzknr37dyz4k7h9fck3mifpn43rav5qy2zpy"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests

View File

@ -13,7 +13,7 @@
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>

View File

@ -5,7 +5,7 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -48,14 +48,14 @@
;; The 7 release series has an incompatible API, while the 6 series is still ;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API. ;; users are ready for the 7-series API.
(version "6.9.10-27") (version "6.9.10-34")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-" (uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1skngh58lkpa2scc9rhjxvhyn6f7nlwd28hbwrxzlvvb7qil9jcq")))) "1pm1lvbfw67780nch7w80dsvx7v8wbrpj43v3c9217dpz0l89442"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
@ -170,19 +170,19 @@ script.")
(define-public graphicsmagick (define-public graphicsmagick
(package (package
(name "graphicsmagick") (name "graphicsmagick")
(version "1.3.30") (version "1.3.31")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (uri
(list (list
(string-append "mirror://sourceforge/" name "/" name (string-append "mirror://sourceforge/graphicsmagick/graphicsmagick"
"/" version "/GraphicsMagick-" version ".tar.xz") "/" version "/GraphicsMagick-" version ".tar.xz")
(string-append "ftp://ftp.graphicsmagick.org/pub/" (string-append "ftp://ftp.graphicsmagick.org/pub/"
"GraphicsMagick/" (version-major+minor version) "GraphicsMagick/" (version-major+minor version)
"/GraphicsMagick-" version ".tar.xz"))) "/GraphicsMagick-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32 "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9"))))
"1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

View File

@ -91,7 +91,9 @@ that are shared between @command{go-ipfs/commands} and its rewrite
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash)
("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) ("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg)
("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils)
@ -137,14 +139,16 @@ that are shared between @command{go-ipfs/commands} and its rewrite
("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils)
("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union))
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore) ("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore)
("go-github-com-urfave-cli" ,go-github-com-urfave-cli) ("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
("go-github-com-whyrusleeping-json-filter" ,go-github-com-whyrusleeping-json-filter) ("go-github-com-whyrusleeping-json-filter" ,go-github-com-whyrusleeping-json-filter)
("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter)
("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump)
("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)))
(home-page "https://github.com/whyrusleeping/gx") (home-page "https://github.com/whyrusleeping/gx")
(synopsis "Package management tool using IPFS") (synopsis "Package management tool using IPFS")
(description "@command{gx} is a packaging tool built around the (description "@command{gx} is a packaging tool built around the
@ -197,13 +201,15 @@ powerful and simple.")
("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash)
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils)
("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union))
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore) ("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore)
("go-github-com-urfave-cli" ,go-github-com-urfave-cli) ("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter)
("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump)
("go-golang-org-x-crypto-blake2s" ,go-golang-org-x-crypto-blake2s)
("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519)
("go-golang-org-x-crypto-sha3" ,go-golang-org-x-crypto-sha3)))
(home-page "https://github.com/whyrusleeping/gx-go") (home-page "https://github.com/whyrusleeping/gx-go")
(synopsis "Golang subtool for the @command{gx} package manager") (synopsis "Golang subtool for the @command{gx} package manager")
(description "A subtool for the @command{gx} package manager for packages (description "A subtool for the @command{gx} package manager for packages
@ -213,7 +219,7 @@ written in Go.")
(define-public go-ipfs (define-public go-ipfs
(package (package
(name "go-ipfs") (name "go-ipfs")
(version "0.4.18") (version "0.4.19")
(source (source
(origin (origin
(method url-fetch/tarbomb) (method url-fetch/tarbomb)
@ -221,8 +227,7 @@ written in Go.")
"https://dist.ipfs.io/go-ipfs/v" version "https://dist.ipfs.io/go-ipfs/v" version
"/go-ipfs-source.tar.gz")) "/go-ipfs-source.tar.gz"))
(sha256 (sha256
(base32 (base32 "0s04ap14p6hnipjm27nm5k8s28zv9k5g9mziyh3ibgwn7dzb1kpx"))
"19hfgbyn5sr1bw0cwm3gsjz0w3b3vh3mmkax1906raah30lavj1x"))
(file-name (string-append name "-" version "-source")))) (file-name (string-append name "-" version "-source"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments

View File

@ -3,7 +3,7 @@
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net> ;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;

View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2018 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -149,7 +149,7 @@ digits, is a cardinal or ordinal number.")
(define-public perl-lingua-en-tagger (define-public perl-lingua-en-tagger
(package (package
(name "perl-lingua-en-tagger") (name "perl-lingua-en-tagger")
(version "0.29") (version "0.30")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -157,7 +157,7 @@ digits, is a cardinal or ordinal number.")
"Lingua-EN-Tagger-" version ".tar.gz")) "Lingua-EN-Tagger-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0dssn101kmpkh2ik1430mj2ikk04849vbpgi60382kvh9xn795na")))) "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
`(("perl-memoize-expirelru" ,perl-memoize-expirelru) `(("perl-memoize-expirelru" ,perl-memoize-expirelru)

View File

@ -2,7 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2017, 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017, 2018 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

View File

@ -204,14 +204,14 @@ not rely on XS.")
(define-public perl-ev (define-public perl-ev
(package (package
(name "perl-ev") (name "perl-ev")
(version "4.22") (version "4.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-" (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14d9115q8f2ca2q3vbcalm55zqsbx8xjq5aj098laj9f9rrzirra")) "0slw68zxrkfribf6lhggdhpay3mdng0nqxlglkwrk19myblchr9f"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View File

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -176,8 +176,8 @@ spreadsheets and presentations.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" (uri (string-append "mirror://sourceforge/libwpd/libwpd/"
name "-" version "/" name "-" version ".tar.xz")) "libwpd-" version "/libwpd-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj")))) "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -265,14 +265,14 @@ way--presentation and vector drawing interfaces.")
(define-public libwpg (define-public libwpg
(package (package
(name "libwpg") (name "libwpg")
(version "0.3.2") (version "0.3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" (uri (string-append "mirror://sourceforge/libwpg/libwpg/"
name "-" version "/" name "-" version ".tar.xz")) "libwpg-" version "/libwpg-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp")))) "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -531,24 +531,18 @@ Microsoft Publisher documents of all versions.")
(define-public libnumbertext (define-public libnumbertext
(package (package
(name "libnumbertext") (name "libnumbertext")
(version "1.0") (version "1.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/numbertext/" name (uri (string-append "https://github.com/Numbertext/libnumbertext/"
"/archive/" version ".tar.gz")) "releases/download/" version
"/libnumbertext-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "1xzlwhwwhvr76kfdsw5gvfjfdayz803z65h331gv5dpc9imhijg1"))))
"0wnsn4911fdd2na8jxkcvmk04a6xw6qlviic9w4qwg9fcym6866v"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-static"))) `(#:configure-flags '("--disable-static")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/Numbertext/libnumbertext") (home-page "https://github.com/Numbertext/libnumbertext")
(synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions") (synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions")
(description (description
@ -909,14 +903,14 @@ and to return information on pronunciations, meanings and synonyms.")
(define-public libqxp (define-public libqxp
(package (package
(name "libqxp") (name "libqxp")
(version "0.0.1") (version "0.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dev-www.libreoffice.org/src/libqxp/" (uri (string-append "https://dev-www.libreoffice.org/src/libqxp/"
"libqxp-" version ".tar.xz")) "libqxp-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wswz49y0lqwqw2nj9j7jaj5ag88hapcz8czgkxax57zhihpy9cc")))) "0p4lb84m05wqd8qr8ni9sp80ivlm83ffn0nxiv4m42hj22qvcdz1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)

View File

@ -308,7 +308,7 @@ wrapper for accessing libusb-1.0.")
(version "2.0.0") (version "2.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.libimobiledevice.org/downloads/" (uri (string-append "https://www.libimobiledevice.org/downloads/"
"libplist-" version ".tar.bz2")) "libplist-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
@ -319,7 +319,7 @@ wrapper for accessing libusb-1.0.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python-cython" ,python-cython))) ("python-cython" ,python-cython)))
(home-page "http://www.libimobiledevice.org/") (home-page "https://www.libimobiledevice.org/")
(synopsis "C library to handle Apple Property List files") (synopsis "C library to handle Apple Property List files")
(description "This package provides a small portable C library to handle (description "This package provides a small portable C library to handle
Apple Property List files in binary or XML.") Apple Property List files in binary or XML.")
@ -331,7 +331,7 @@ Apple Property List files in binary or XML.")
(version "1.0.10") (version "1.0.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.libimobiledevice.org/downloads/" (uri (string-append "https://www.libimobiledevice.org/downloads/"
"libusbmuxd-" version ".tar.bz2")) "libusbmuxd-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
@ -340,7 +340,7 @@ Apple Property List files in binary or XML.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("libplist" ,libplist))) ("libplist" ,libplist)))
(home-page "http://www.libimobiledevice.org/") (home-page "https://www.libimobiledevice.org/")
(synopsis "Library to multiplex connections from and to iOS devices") (synopsis "Library to multiplex connections from and to iOS devices")
(description "This package provides a client library to multiplex (description "This package provides a client library to multiplex
connections from and to iOS devices by connecting to a socket provided by a connections from and to iOS devices by connecting to a socket provided by a
@ -353,7 +353,7 @@ connections from and to iOS devices by connecting to a socket provided by a
(version "1.2.0") (version "1.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.libimobiledevice.org/downloads/" (uri (string-append "https://www.libimobiledevice.org/downloads/"
"libimobiledevice-" version ".tar.bz2")) "libimobiledevice-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
@ -376,7 +376,7 @@ connections from and to iOS devices by connecting to a socket provided by a
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python-cython" ,python-cython) ("python-cython" ,python-cython)
("libtool" ,libtool))) ("libtool" ,libtool)))
(home-page "http://www.libimobiledevice.org/") (home-page "https://www.libimobiledevice.org/")
(synopsis "Protocol library and tools to communicate with Apple devices") (synopsis "Protocol library and tools to communicate with Apple devices")
(description "libimobiledevice is a software library that talks the (description "libimobiledevice is a software library that talks the
protocols to support Apple devices. It allows other software to easily access protocols to support Apple devices. It allows other software to easily access
@ -392,7 +392,7 @@ music and video to the device.")
(version "1.1.3") (version "1.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.libimobiledevice.org/downloads/" (uri (string-append "https://www.libimobiledevice.org/downloads/"
"ifuse-" version ".tar.bz2")) "ifuse-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
@ -403,7 +403,7 @@ music and video to the device.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.libimobiledevice.org/") (home-page "https://www.libimobiledevice.org/")
(synopsis "Mount iOS devices") (synopsis "Mount iOS devices")
(description "This package provides @command{ifuse}, a command to mount (description "This package provides @command{ifuse}, a command to mount
iOS devices and access their contents.") iOS devices and access their contents.")
@ -415,7 +415,7 @@ iOS devices and access their contents.")
(version "1.1.0") (version "1.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.libimobiledevice.org/downloads/" (uri (string-append "https://www.libimobiledevice.org/downloads/"
"usbmuxd-" version ".tar.bz2")) "usbmuxd-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
@ -427,7 +427,7 @@ iOS devices and access their contents.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.libimobiledevice.org/") (home-page "https://www.libimobiledevice.org/")
(synopsis "Multiplex connections over USB to an iOS device") (synopsis "Multiplex connections over USB to an iOS device")
(description "This package provides the @code{usbmuxd} daemon (description "This package provides the @code{usbmuxd} daemon
which multiplexes connections over USB to an iOS device. To which multiplexes connections over USB to an iOS device. To

View File

@ -85,7 +85,7 @@ statements and serializes in normalized format.")
(define-public perl-software-license (define-public perl-software-license
(package (package
(name "perl-software-license") (name "perl-software-license")
(version "0.103013") (version "0.103014")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -94,7 +94,7 @@ statements and serializes in normalized format.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wqgh7vdlc966amlrq0b2szz18lnrl9rfh8wlf7v0hqg74vxjh96")))) "128pbm9pf5drakm9bpkifc1zg8f005xabfwzg21nc03m5mhfligb"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-try-tiny" ,perl-try-tiny))) `(("perl-try-tiny" ,perl-try-tiny)))

View File

@ -11,14 +11,14 @@
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2016, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com> ;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com> ;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
@ -32,6 +32,7 @@
;;; Copyright © 2018 Manuel Graf <graf@init.at> ;;; Copyright © 2018 Manuel Graf <graf@init.at>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -405,8 +406,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
It has been modified to remove all non-free binary blobs.") It has been modified to remove all non-free binary blobs.")
(license license:gpl2))) (license license:gpl2)))
(define %linux-libre-version "5.0.1") (define %linux-libre-version "5.0.3")
(define %linux-libre-hash "0izbdpml170g5jg87ccnf2q1hc01gsyiy1gqxnqzzi3pri00dfyz") (define %linux-libre-hash "1ivdqr3y8r2hmv3a1g0a641cr2ckl3x4arapw0j6nwd0sbcyncam")
(define %linux-libre-5.0-patches (define %linux-libre-5.0-patches
(list %boot-logo-patch (list %boot-logo-patch
@ -419,8 +420,8 @@ It has been modified to remove all non-free binary blobs.")
#:patches %linux-libre-5.0-patches #:patches %linux-libre-5.0-patches
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define %linux-libre-4.19-version "4.19.28") (define %linux-libre-4.19-version "4.19.30")
(define %linux-libre-4.19-hash "0j65gp9z3qrygx67mkhm4ri3pj1pz0gdwcdlds2ypg53rh12jc0a") (define %linux-libre-4.19-hash "1i15cs7zb53hagllgga8jaz0j1p9b22j93iczwc2w587zzhzlvng")
(define %linux-libre-4.19-patches (define %linux-libre-4.19-patches
(list %boot-logo-patch (list %boot-logo-patch
@ -433,8 +434,8 @@ It has been modified to remove all non-free binary blobs.")
#:patches %linux-libre-4.19-patches #:patches %linux-libre-4.19-patches
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define %linux-libre-4.14-version "4.14.105") (define %linux-libre-4.14-version "4.14.107")
(define %linux-libre-4.14-hash "06pp13d2g0j2v8jy8fh20b4ismzg9wn3i7bnx2hpyvslz256rrgg") (define %linux-libre-4.14-hash "19i17b8sjjvi99vya1vncjalysdy027hp35rrla68gjs28dyas7r")
(define-public linux-libre-4.14 (define-public linux-libre-4.14
(make-linux-libre %linux-libre-4.14-version (make-linux-libre %linux-libre-4.14-version
@ -443,8 +444,8 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.9 (define-public linux-libre-4.9
(make-linux-libre "4.9.162" (make-linux-libre "4.9.164"
"07swv6xvjsl5nv5y3sc2nfdnmqdz9gjy8hgrjvi0bljwzf1fbxmy" "06bbynvijqlk92bpppmnjijyfwr0sk01krqdw4hpgbrvlg3wdlbk"
'("x86_64-linux" "i686-linux") '("x86_64-linux" "i686-linux")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
@ -963,7 +964,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(define-public strace (define-public strace
(package (package
(name "strace") (name "strace")
(version "4.26") (version "5.0")
(home-page "https://strace.io") (home-page "https://strace.io")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -971,7 +972,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
"/strace-" version ".tar.xz")) "/strace-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw")))) "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -1251,7 +1252,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(define-public iproute (define-public iproute
(package (package
(name "iproute2") (name "iproute2")
(version "4.20.0") (version "5.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1259,10 +1260,11 @@ that the Ethernet protocol is much simpler than the IP protocol.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8")))) "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no test suite `( ;; There is a test suite, but it wants network namespaces and sudo.
#:tests? #f
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list "DESTDIR=" (list "DESTDIR="
(string-append "BASH_COMPDIR=" out (string-append "BASH_COMPDIR=" out
@ -1282,12 +1284,15 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(("^.*ARPDDIR.*$") "")) (("^.*ARPDDIR.*$") ""))
#t))))) #t)))))
(inputs (inputs
`(("iptables" ,iptables) `(("db4" ,bdb)
("db4" ,bdb))) ("iptables" ,iptables)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("bison" ,bison)
("flex" ,flex) ("flex" ,flex)
("bison" ,bison))) ("pkg-config" ,pkg-config)))
;; For tests.
;; ("libmnl" ,libmnl)
;; ("util-linux" ,util-linux)
(home-page (home-page
"https://wiki.linuxfoundation.org/networking/iproute2") "https://wiki.linuxfoundation.org/networking/iproute2")
(synopsis (synopsis
@ -4052,7 +4057,7 @@ of flash storage.")
(define-public libseccomp (define-public libseccomp
(package (package
(name "libseccomp") (name "libseccomp")
(version "2.3.3") (version "2.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/seccomp/libseccomp/" (uri (string-append "https://github.com/seccomp/libseccomp/"
@ -4060,7 +4065,7 @@ of flash storage.")
"/libseccomp-" version ".tar.gz")) "/libseccomp-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz")))) "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("which" ,which))) `(("which" ,which)))
@ -4275,7 +4280,7 @@ Light is the successor of lightscript.")
(define-public tlp (define-public tlp
(package (package
(name "tlp") (name "tlp")
(version "1.1") (version "1.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -4285,7 +4290,7 @@ Light is the successor of lightscript.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"068hzmh90x600saynbl7iwg1pm0ywldn4jazyxx5y1fixs8s1qbn")))) "0rcp9i0fisdm4h6799ffr696l1vl661fnwb2dij268nlwwmkr90g"))))
(inputs `(("bash" ,bash) (inputs `(("bash" ,bash)
("dbus" ,dbus) ("dbus" ,dbus)
("ethtool" ,ethtool) ("ethtool" ,ethtool)
@ -4315,7 +4320,8 @@ Light is the successor of lightscript.")
(setenv "TLP_NO_PMUTILS" "1") (setenv "TLP_NO_PMUTILS" "1")
(setenv "TLP_SBIN" (string-append out "/bin")) (setenv "TLP_SBIN" (string-append out "/bin"))
(setenv "TLP_BIN" (string-append out "/bin")) (setenv "TLP_BIN" (string-append out "/bin"))
(setenv "TLP_TLIB" (string-append out "/share/tlp-pm")) (setenv "TLP_TLIB" (string-append out "/share/tlp"))
(setenv "TLP_FLIB" (string-append out "/share/tlp/func.d"))
(setenv "TLP_ULIB" (string-append out "/lib/udev")) (setenv "TLP_ULIB" (string-append out "/lib/udev"))
(setenv "TLP_CONF" "/etc/tlp") (setenv "TLP_CONF" "/etc/tlp")
(setenv "TLP_SHCPL" (setenv "TLP_SHCPL"
@ -4369,7 +4375,6 @@ Light is the successor of lightscript.")
a default configuration already optimized for battery life. Nevertheless, a default configuration already optimized for battery life. Nevertheless,
TLP is customizable to fulfil system requirements. TLP settings are applied TLP is customizable to fulfil system requirements. TLP settings are applied
every time the power supply source is changed.") every time the power supply source is changed.")
;; 'COPYING' is a custom version that says that one file is GPLv3+ and the ;; 'COPYING' is a custom version that says that one file is GPLv3+ and the
;; rest is GPLv2+. ;; rest is GPLv2+.
(license (list license:gpl2+ license:gpl3+)))) (license (list license:gpl2+ license:gpl3+))))
@ -5076,7 +5081,11 @@ management tools in userspace.")
"0ss0r6jlxxinf9fhpc0fgf7b89n9mzirpa85xxjmi1ix9l6cls6x")))) "0ss0r6jlxxinf9fhpc0fgf7b89n9mzirpa85xxjmi1ix9l6cls6x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; kernel/user integration tests are in package "xfstests" `(#:tests? #f ;kernel/user integration tests are in package "xfstests"
#:phases (modify-phases %standard-phases
(add-after 'install 'install-headers
(lambda _
(invoke "make" "install-dev"))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("util-linux" ,util-linux))) ("util-linux" ,util-linux)))
@ -5194,3 +5203,45 @@ the correct permissions and ownership, and then pack them up, or one would
have to construct the archives directly, without using the archiver.") have to construct the archives directly, without using the archiver.")
(home-page "http://freshmeat.sourceforge.net/projects/fakeroot") (home-page "http://freshmeat.sourceforge.net/projects/fakeroot")
(license license:gpl3+))) (license license:gpl3+)))
(define-public inputattach
(package
(name "inputattach")
(version "0.42.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/linuxwacom/input-wacom.git")
(commit (string-append "input-wacom-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "04lnn7v0rm4ppbya140im5d4igcl6c1nrqpgbsr0i8wkral0nv7j"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'bootstrap)
(delete 'configure)
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "inputattach"
(invoke (string-append (assoc-ref inputs "gcc")
"/bin/gcc")
"-O2" "-o" "inputattach" "inputattach.c"))
#t))
(delete 'check)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((target-dir (string-append
(assoc-ref outputs "out")
"/bin/")))
(mkdir-p target-dir)
(copy-file "inputattach/inputattach"
(string-append target-dir
"inputattach"))
#t))))))
(home-page "https://linuxwacom.github.io/")
(synopsis "Dispatch input peripherals events to a device file")
(description "inputattach dispatches input events from several device
types and interfaces and translates so that the X server can use them.")
(license license:gpl2+)))

View File

@ -3,7 +3,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>

View File

@ -270,7 +270,7 @@ code analysis tools.")
version "/libcxx-" version ".src.tar.xz")) version "/libcxx-" version ".src.tar.xz"))
(sha256 (sha256
(base32 (base32
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) "1wdrxg365ig0kngx52pd0n820sncp24blb0zpalc579iidhh4002"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("clang" ,clang) `(("clang" ,clang)

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

View File

@ -290,14 +290,14 @@ directory structure and file attributes.")
(define (make-lua-sec name lua) (define (make-lua-sec name lua)
(package (package
(name name) (name name)
(version "0.6") (version "0.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/brunoos/luasec/archive/" (uri (string-append "https://github.com/brunoos/luasec/archive/"
"luasec-" version ".tar.gz")) "luasec-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0pgd1anzznl4s0h16wg8dlw9mgdb9h52drlcki6sbf5y31fa7wyf")))) "0c9sdz3gvrsbvvdqzpnsappgwl40hfljlpfybqis6wia3mdyjxi1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -410,13 +410,13 @@ Notable examples are GTK+, GStreamer and Webkit.")
(define (make-lua-lpeg name lua) (define (make-lua-lpeg name lua)
(package (package
(name name) (name name)
(version "1.0.1") (version "1.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-" (uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0sq25z3r324a324ky73izgq9mbf66j2xvjp0fxf227rwxalzgnb2")))) (base32 "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View File

@ -1,13 +1,14 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ison111 <ison111@protonmail.com> ;;; Copyright © 2018 Ison111 <ison111@protonmail.com>
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -55,7 +56,7 @@
(define-public libfm (define-public libfm
(package (package
(name "libfm") (name "libfm")
(version "1.3.0.2") (version "1.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/pcmanfm/" (uri (string-append "mirror://sourceforge/pcmanfm/"
@ -63,7 +64,7 @@
"%29/LibFM/" name "-" version ".tar.xz")) "%29/LibFM/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q")))) "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)
("gtk+" ,gtk+-2))) ("gtk+" ,gtk+-2)))
@ -190,7 +191,7 @@ performance, all instances of the terminal are sharing a single process.")
(define-public menu-cache (define-public menu-cache
(package (package
(name "menu-cache") (name "menu-cache")
(version "1.0.2") (version "1.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/lxde/" name "/" (uri (string-append "mirror://sourceforge/lxde/" name "/"
@ -198,7 +199,7 @@ performance, all instances of the terminal are sharing a single process.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg")))) "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)
("libfm" ,libfm-extra))) ("libfm" ,libfm-extra)))
@ -212,15 +213,15 @@ speed up the access to freedesktop.org defined application menus.")
(define-public pcmanfm (define-public pcmanfm
(package (package
(name "pcmanfm") (name "pcmanfm")
(version "1.3.0") (version "1.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" (uri (string-append "mirror://sourceforge/pcmanfm/"
"PCManFM%20%2B%20Libfm%20%28tarball%20release" "PCManFM%20%2B%20Libfm%20%28tarball%20release"
"%29/PCManFM/" name "-" version ".tar.xz")) "%29/PCManFM/pcmanfm-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas")))) "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("gtk+" ,gtk+-2) (inputs `(("gtk+" ,gtk+-2)
("gvfs" ,gvfs) ; for trash and mount support ("gvfs" ,gvfs) ; for trash and mount support

View File

@ -3,9 +3,9 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -124,7 +124,7 @@ to statistics about the system on which it's run.")
(define-public lxqt-build-tools (define-public lxqt-build-tools
(package (package
(name "lxqt-build-tools") (name "lxqt-build-tools")
(version "0.5.0") (version "0.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -132,7 +132,7 @@ to statistics about the system on which it's run.")
"/download/" version "/download/" version
"/lxqt-build-tools-" version ".tar.xz")) "/lxqt-build-tools-" version ".tar.xz"))
(sha256 (sha256
(base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) (base32 "0n0p0mf12n9f7zm2592779rpqrbcamfdz87nnjb8j058bc8g3214"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -157,7 +157,7 @@ itself as well as other components maintained by the LXQt project.")
(define-public libqtxdg (define-public libqtxdg
(package (package
(name "libqtxdg") (name "libqtxdg")
(version "3.2.0") (version "3.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -165,7 +165,7 @@ itself as well as other components maintained by the LXQt project.")
"https://github.com/lxqt/libqtxdg/releases/download/" "https://github.com/lxqt/libqtxdg/releases/download/"
version "/libqtxdg-" version ".tar.xz")) version "/libqtxdg-" version ".tar.xz"))
(sha256 (sha256
(base32 "0lq548pa69hfvnbj2ypba5ygm8n6v6g7bqqm8p5g538l1l3394cl")))) (base32 "1mnnq8vbf5xjlrzajzfkay0yzzxri0zz0xi8x8rmxpw38xmglq8h"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -182,6 +182,8 @@ itself as well as other components maintained by the LXQt project.")
;; required by Qt5XdgIconLoader.pc ;; required by Qt5XdgIconLoader.pc
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtsvg" ,qtsvg))) ("qtsvg" ,qtsvg)))
(native-inputs
`(("lxqt-build-tools" ,lxqt-build-tools)))
(home-page "https://github.com/lxqt/libqtxdg") (home-page "https://github.com/lxqt/libqtxdg")
(synopsis "Qt implementation of freedesktop.org xdg specifications") (synopsis "Qt implementation of freedesktop.org xdg specifications")
(description "Libqtxdg implements the freedesktop.org xdg specifications (description "Libqtxdg implements the freedesktop.org xdg specifications
@ -191,7 +193,7 @@ in Qt.")
(define-public liblxqt (define-public liblxqt
(package (package
(name "liblxqt") (name "liblxqt")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -199,13 +201,10 @@ in Qt.")
"https://github.com/lxqt/" name "/releases/download/" "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) (base32 "1gb922npf6nw4w3nkvh4czk8xmdzzqkzq3zgl1h303fjaib359qs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -213,6 +212,13 @@ in Qt.")
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
"DESTINATION \"share/polkit-1/actions")) "DESTINATION \"share/polkit-1/actions"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -233,14 +239,14 @@ components of the LXQt desktop environment.")
(define-public libsysstat (define-public libsysstat
(package (package
(name "libsysstat") (name "libsysstat")
(version "0.4.1") (version "0.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0ngz8v3bixsdg96d5ipcyxd6nsrg52974xdxy9rnimahlv1yaxn3")))) (base32 "0rz9w49khra9kl91kfnd3wxkldy1fqf6755mvlgbsqxb1yv8597w"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments '(#:tests? #f)) ; no tests (arguments '(#:tests? #f)) ; no tests
(inputs (inputs
@ -259,14 +265,14 @@ and memory usage or network traffic.")
(define-public lxqt-about (define-public lxqt-about
(package (package
(name "lxqt-about") (name "lxqt-about")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "08imj7p77ifzfxnn8c482mhrvfx9gi0rb43ab5rw1rkmfvax2n5w")))) (base32 "01xp5ddcxc9wvl7jm4179hjrirj07mpzm9z50936d1fqx34wfbis"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -280,9 +286,19 @@ and memory usage or network traffic.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags #:phases
;; TODO: prefetch translations files from 'lxqt-l10n'. (modify-phases %standard-phases
'("-DPULL_TRANSLATIONS=NO"))) (add-before 'build 'setenv
(lambda _
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt.org") (home-page "https://lxqt.org")
(synopsis "Provides information about LXQt and the system") (synopsis "Provides information about LXQt and the system")
(description "lxqt-about is a dialogue window providing information about (description "lxqt-about is a dialogue window providing information about
@ -292,14 +308,14 @@ LXQt and the system it's running on.")
(define-public lxqt-admin (define-public lxqt-admin
(package (package
(name "lxqt-admin") (name "lxqt-admin")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0qvpv668ja83ydbdrlal1596xhag3xlkbd6qlh9xwdpb7nysvns1")))) (base32 "0f0skkxqyhpidpd5phliax869v4n2whvglg8rahzia2zhw4ylzry"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -313,9 +329,6 @@ LXQt and the system it's running on.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -323,6 +336,14 @@ LXQt and the system it's running on.")
(substitute* "lxqt-admin-user/CMakeLists.txt" (substitute* "lxqt-admin-user/CMakeLists.txt"
(("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
"DESTINATION \"share/polkit-1/actions")) "DESTINATION \"share/polkit-1/actions"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-admin-time/CMakeLists.txt"
"lxqt-admin-user/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org") (home-page "https://lxqt.org")
(synopsis "LXQt system administration tool") (synopsis "LXQt system administration tool")
@ -333,25 +354,28 @@ the operating system LXQt is running on.")
(define-public lxqt-config (define-public lxqt-config
(package (package
(name "lxqt-config") (name "lxqt-config")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0rizhl2v41kpgp57a61r6nmwcdw8nh9hprrrf33nfrdw8hpwxb95")))) (base32 "16k36knv6d72gg8hp7423l3ic43y3l3zbaf3spqn2a354y30myrg"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("eudev" ,eudev)
("kwindowsystem" ,kwindowsystem)
("libkscreen" ,libkscreen) ("libkscreen" ,libkscreen)
("liblxqt" ,liblxqt) ("liblxqt" ,liblxqt)
("libqtxdg" ,libqtxdg) ("libqtxdg" ,libqtxdg)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxi" ,libxi)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)
("solid" ,solid) ("solid" ,solid)
("xf86-input-libinput" ,xf86-input-libinput)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -359,9 +383,6 @@ the operating system LXQt is running on.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -369,6 +390,20 @@ the operating system LXQt is running on.")
(substitute* '("src/CMakeLists.txt") (substitute* '("src/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-config-file-associations/CMakeLists.txt"
"lxqt-config-brightness/CMakeLists.txt"
"lxqt-config-appearance/CMakeLists.txt"
"lxqt-config-locale/CMakeLists.txt"
"lxqt-config-monitor/CMakeLists.txt"
"lxqt-config-input/CMakeLists.txt"
"liblxqt-config-cursor/CMakeLists.txt"
"src/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org") (home-page "https://lxqt.org")
(synopsis "Tools to configure LXQt and the underlying operating system") (synopsis "Tools to configure LXQt and the underlying operating system")
@ -379,14 +414,14 @@ configuration of both LXQt and the underlying operating system.")
(define-public lxqt-globalkeys (define-public lxqt-globalkeys
(package (package
(name "lxqt-globalkeys") (name "lxqt-globalkeys")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1gyvcjbhi7zpvgz1sf773dv9gc35hx5fz023njp9r4vl0dpcavgd")))) (base32 "0m6svwy20bfy9d21g5l0qzjndph3rd8zqagmqgdjzjhh3lxwrsrk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -401,9 +436,6 @@ configuration of both LXQt and the underlying operating system.")
("lxqt-build-tools" ,lxqt-build-tools))) ("lxqt-build-tools" ,lxqt-build-tools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -412,6 +444,13 @@ configuration of both LXQt and the underlying operating system.")
"xdg/CMakeLists.txt") "xdg/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "config/CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Daemon used to register global keyboard shortcuts") (synopsis "Daemon used to register global keyboard shortcuts")
@ -423,14 +462,14 @@ as a whole and are not limited to distinct applications.")
(define-public lxqt-notificationd (define-public lxqt-notificationd
(package (package
(name "lxqt-notificationd") (name "lxqt-notificationd")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1l0hdbvghyhqgvy4pih7rvz26bc6yc8a3l1bdj11hnkw62h1i7d6")))) (base32 "1kiag3fcx12qmslln6x6lwvm4f1spymwf71389kdya3vwx7hkmcy"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -444,9 +483,6 @@ as a whole and are not limited to distinct applications.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no test target '(#:tests? #f ; no test target
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -454,6 +490,14 @@ as a whole and are not limited to distinct applications.")
(substitute* '("autostart/CMakeLists.txt") (substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("config/CMakeLists.txt"
"src/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "The LXQt notification daemon") (synopsis "The LXQt notification daemon")
@ -464,14 +508,14 @@ according to the Desktop Notifications Specification.")
(define-public lxqt-openssh-askpass (define-public lxqt-openssh-askpass
(package (package
(name "lxqt-openssh-askpass") (name "lxqt-openssh-askpass")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0l2272gya8jgv71bvg2hz37lnhiznv4ng3j0p6j79f99hwb5ygpk")))) (base32 "1fvbgjidpifn420avh8n1gym49vcz6zgayz7xygg1x93s4awy1cs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -485,9 +529,15 @@ according to the Desktop Notifications Specification.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags #:phases
;; TODO: prefetch translations files from 'lxqt-l10n'. (modify-phases %standard-phases
'("-DPULL_TRANSLATIONS=NO"))) (add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "GUI to query passwords on behalf of SSH agents") (synopsis "GUI to query passwords on behalf of SSH agents")
(description "lxqt-openssh-askpass is a GUI to query credentials on behalf (description "lxqt-openssh-askpass is a GUI to query credentials on behalf
@ -497,14 +547,14 @@ of other programs.")
(define-public lxqt-panel (define-public lxqt-panel
(package (package
(name "lxqt-panel") (name "lxqt-panel")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1qraigzq7nc5a2q6f5ybxwx07gxffa3m3bg7fiv6ppwss51xqfd1")))) (base32 "1r3wx0v3jm7j41h7gxr49izc9xa1afvrzq4wcdm0qbj98qa1rgpq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -534,9 +584,6 @@ of other programs.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -545,6 +592,14 @@ of other programs.")
"menu/CMakeLists.txt") "menu/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("cmake/BuildPlugin.cmake"
"panel/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "The LXQt desktop panel") (synopsis "The LXQt desktop panel")
@ -554,14 +609,14 @@ of other programs.")
(define-public lxqt-policykit (define-public lxqt-policykit
(package (package
(name "lxqt-policykit") (name "lxqt-policykit")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1d97fys6625nk4q6irp0jhsbk30xi7idnii1f3vrrrdcl2cahagp")))) (base32 "127rqb0nprybkc41lk0yq0r0dk5pbbw22gvrm4pwag71qh8wpk5i"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -579,8 +634,6 @@ of other programs.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no test target '(#:tests? #f ; no test target
#:configure-flags
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -588,6 +641,13 @@ of other programs.")
(substitute* '("autostart/CMakeLists.txt") (substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "The LXQt PolicyKit agent") (synopsis "The LXQt PolicyKit agent")
@ -598,14 +658,14 @@ LXQt.")
(define-public lxqt-powermanagement (define-public lxqt-powermanagement
(package (package
(name "lxqt-powermanagement") (name "lxqt-powermanagement")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "15nvdypyjwnp7k3d2pkhdbmaqb3ccacmh95rbdbc5mr7yrjy9613")))) (base32 "06bvgbkbl9p9n8ba5cfsynqgmpb5c8yfnsvp7zqhflj8k9p9msip"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kidletime" ,kidletime) `(("kidletime" ,kidletime)
@ -621,9 +681,6 @@ LXQt.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -631,6 +688,14 @@ LXQt.")
(substitute* '("autostart/CMakeLists.txt") (substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("config/CMakeLists.txt"
"src/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Power management module for LXQt") (synopsis "Power management module for LXQt")
@ -642,14 +707,14 @@ when laptop batteries are low on power.")
(define-public lxqt-qtplugin (define-public lxqt-qtplugin
(package (package
(name "lxqt-qtplugin") (name "lxqt-qtplugin")
(version "0.13.0") (version "0.14.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0nnwbc99njpsyqb0cy3x0srcgwa7qrnq0qwcyx7fbvwsq1l8cz56")))) (base32 "18y7xfxwyismcycg70q6r8zrcygz1pdcvg6lqc6ba7azqb9806ds"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libdbusmenu-qt" ,libdbusmenu-qt) `(("libdbusmenu-qt" ,libdbusmenu-qt)
@ -680,14 +745,14 @@ Qt with LXQt.")
(define-public lxqt-runner (define-public lxqt-runner
(package (package
(name "lxqt-runner") (name "lxqt-runner")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0dsg6fdcqbl7gza0sg1pb49zn5x31q7zx77jp7mkf6wc2lv8lali")))) (base32 "1c687shypivkhjrpzs1jcy5l2i8d7xzm31c4is1xx6x9nbkgm4bm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -705,9 +770,6 @@ Qt with LXQt.")
("lxqt-build-tools" ,lxqt-build-tools))) ("lxqt-build-tools" ,lxqt-build-tools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -715,6 +777,13 @@ Qt with LXQt.")
(substitute* '("autostart/CMakeLists.txt") (substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Tool used to launch programs quickly by typing their names") (synopsis "Tool used to launch programs quickly by typing their names")
@ -725,14 +794,14 @@ allows for launching applications or shutting down the system.")
(define-public lxqt-session (define-public lxqt-session
(package (package
(name "lxqt-session") (name "lxqt-session")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1aibppppmg46ybbajx2qc395l0yp9rqlp2am01fqjxadsf8vci5z")))) (base32 "11i2vimv3336dvvxb6y5csdybwjncr7cq3kwlj52vkpisnxslvgy"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("eudev" ,eudev) `(("eudev" ,eudev)
@ -749,8 +818,6 @@ allows for launching applications or shutting down the system.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:configure-flags
`("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -759,6 +826,15 @@ allows for launching applications or shutting down the system.")
"config/CMakeLists.txt") "config/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg")) "DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-config-session/CMakeLists.txt"
"lxqt-leave/CMakeLists.txt"
"lxqt-session/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))))) #t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Session manager for LXQt") (synopsis "Session manager for LXQt")
@ -769,14 +845,14 @@ for the LXQt desktop environment.")
(define-public lxqt-sudo (define-public lxqt-sudo
(package (package
(name "lxqt-sudo") (name "lxqt-sudo")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1j28wlw4rkzvr85yl78fqkvz7sv7dykm9ghm63xdkskfjbsas1cf")))) (base32 "0mbygp2kkppwk7sxvpnwavdwrx88mh7ldcg6xm3zw1ndp29danay"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)
@ -792,9 +868,15 @@ for the LXQt desktop environment.")
("lxqt-build-tools" ,lxqt-build-tools))) ("lxqt-build-tools" ,lxqt-build-tools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags #:phases
;; TODO: prefetch translations files from 'lxqt-l10n'. (modify-phases %standard-phases
'("-DPULL_TRANSLATIONS=NO"))) (add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "GUI frontend for sudo/su") (synopsis "GUI frontend for sudo/su")
(description "lxqt-sudo is a graphical front-end of commands sudo and su (description "lxqt-sudo is a graphical front-end of commands sudo and su
@ -805,14 +887,14 @@ permissions of other users including root.")
(define-public lxqt-themes (define-public lxqt-themes
(package (package
(name "lxqt-themes") (name "lxqt-themes")
(version "0.13.0") (version "0.14.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "13kkkzjx8bgnwckz79j273azvm4za66i4cp2qhxwdpxh0fwziklf")))) (base32 "0p7svdpp0z44hvgrp2aip6hym0gdhbanyxsz6iz8sjnn28c995ia"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("lxqt-build-tools" ,lxqt-build-tools))) `(("lxqt-build-tools" ,lxqt-build-tools)))
@ -843,20 +925,17 @@ for LXQt.")
(define-public libfm-qt (define-public libfm-qt
(package (package
(name "libfm-qt") (name "libfm-qt")
(version "0.13.1") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0p0lbz7dh5c38zq3yp1v1mm99ymg7mqr3h7yzniif2hipmgvxsv9")))) (base32 "06p3wqpc574v9f94wkq9hqmbbvb9q8phfpq301z55c5r939f4hrp"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f)) ; no tests
#:configure-flags
;; TODO : prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("libexif" ,libexif) ("libexif" ,libexif)
@ -879,14 +958,14 @@ components to build desktop file managers which belongs to LXDE.")
(define-public pcmanfm-qt (define-public pcmanfm-qt
(package (package
(name "pcmanfm-qt") (name "pcmanfm-qt")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "08jprkkk62pk34q9lxa207bh27xi86fj8jxfd5z3w2m5j5nim5mz")))) (base32 "0x3c25inlxll965xszx37mnl5gp3smm2h7x04f67z0qlh3vsbrjq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libfm-qt" ,libfm-qt) `(("libfm-qt" ,libfm-qt)
@ -898,9 +977,6 @@ components to build desktop file managers which belongs to LXDE.")
("lxqt-build-tools" ,lxqt-build-tools))) ("lxqt-build-tools" ,lxqt-build-tools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -921,14 +997,14 @@ LXDE.")
(define-public compton-conf (define-public compton-conf
(package (package
(name "compton-conf") (name "compton-conf")
(version "0.4.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0q3yx2a6wf8yahrwgvhmv9sd7gmrhid528vrqy04dg8m5cx1bjci")))) (base32 "11n8k59jd0q2x66cispc9dpk139mp6j99hq1yjccxvh21vhc7mbc"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libconfig" ,libconfig) `(("libconfig" ,libconfig)
@ -939,9 +1015,6 @@ LXDE.")
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -959,14 +1032,14 @@ manager Compton.")
(define-public lximage-qt (define-public lximage-qt
(package (package
(name "lximage-qt") (name "lximage-qt")
(version "0.7.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1mwjh6lrjayr9snsmabkl5qs4xm6d27mfz8k3jxfm5dk3pjj1b0w")))) (base32 "0iiq55rm4z2jp19q1pbd2whifwvxg052q324vrwp4p7nz0wh04za"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libexif" ,libexif) `(("libexif" ,libexif)
@ -979,10 +1052,7 @@ manager Compton.")
("lxqt-build-tools" ,lxqt-build-tools) ("lxqt-build-tools" ,lxqt-build-tools)
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f)) ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "The image viewer and screenshot tool for lxqt") (synopsis "The image viewer and screenshot tool for lxqt")
(description "LXImage-Qt is the Qt port of LXImage, a simple and fast (description "LXImage-Qt is the Qt port of LXImage, a simple and fast
@ -992,14 +1062,14 @@ image viewer.")
(define-public obconf-qt (define-public obconf-qt
(package (package
(name "obconf-qt") (name "obconf-qt")
(version "0.13.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1fbzn1p2mdvn8dcbavmd1imrvkph2jfssrlw8l26qz6qk8qlmhnf")))) (base32 "1kzb7364150b60qd3wcgnw78b9ia5k3b16kq8w3p1y7pg6pddy8m"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("imlib2" ,imlib2) `(("imlib2" ,imlib2)
@ -1017,10 +1087,7 @@ image viewer.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f)) ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Openbox configuration tool") (synopsis "Openbox configuration tool")
(description "ObConf-Qt is a Qt port of ObConf, a configuration editor for (description "ObConf-Qt is a Qt port of ObConf, a configuration editor for
@ -1030,14 +1097,14 @@ window manager OpenBox.")
(define-public pavucontrol-qt (define-public pavucontrol-qt
(package (package
(name "pavucontrol-qt") (name "pavucontrol-qt")
(version "0.4.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0pqvhhgw7d00wqw5v3ghm4l8250zy7bqpvhff6l7y1lw0z2fvcp6")))) (base32 "18mw5r8grfrf95vxjbqrr790kl5l59qdqcmlxmwa6rwbfgywj1fq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
@ -1050,10 +1117,7 @@ window manager OpenBox.")
("lxqt-build-tools" ,lxqt-build-tools) ("lxqt-build-tools" ,lxqt-build-tools)
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f)) ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Pulseaudio mixer in Qt") (synopsis "Pulseaudio mixer in Qt")
(description "@code{pavucontrol-qt} is the Qt port of volume control (description "@code{pavucontrol-qt} is the Qt port of volume control
@ -1063,21 +1127,22 @@ window manager OpenBox.")
(define-public qps (define-public qps
(package (package
(name "qps") (name "qps")
(version "1.10.18") (version "1.10.20")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0pzk83p7a9ax0893s9hp2qkmiilzrf8iqry5a0x1g73hdwm5hm44")))) (base32 "0dz7ricxg2rrmdyca6mc2d4lyy5bpksjk751hvn95wssr76y2w0m"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libxrender" ,libxrender) `(("libxrender" ,libxrender)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras))) ("qtx11extras" ,qtx11extras)))
(native-inputs (native-inputs
`(("qttools" ,qttools))) `(("lxqt-build-tools" ,lxqt-build-tools)
("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f)) ; no tests '(#:tests? #f)) ; no tests
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
@ -1089,14 +1154,14 @@ processes currently in existence, much like code{top} or code{ps}.")
(define-public qtermwidget (define-public qtermwidget
(package (package
(name "qtermwidget") (name "qtermwidget")
(version "0.9.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1c1qzbysxjbikp4bpgphphw4dgpl10gz8m06ccs2c48qxhpyd773")))) (base32 "0v1vvi8vf9y8nv8y0gzffaqji53s75ab5jypksih0ndcws8ryww4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)))
@ -1104,10 +1169,7 @@ processes currently in existence, much like code{top} or code{ps}.")
`(("lxqt-build-tools" ,lxqt-build-tools) `(("lxqt-build-tools" ,lxqt-build-tools)
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f)) ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "The terminal widget for QTerminal") (synopsis "The terminal widget for QTerminal")
(description "QTermWidget is a terminal emulator widget for Qt 5.") (description "QTermWidget is a terminal emulator widget for Qt 5.")
@ -1116,14 +1178,14 @@ processes currently in existence, much like code{top} or code{ps}.")
(define-public qterminal (define-public qterminal
(package (package
(name "qterminal") (name "qterminal")
(version "0.9.0") (version "0.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/" (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1vlza75br1ys62lgkdz26md729bfpbnasfzswp7hakmgaq1rhms1")))) (base32 "0cgyaskyqginmm85d11inbi0mmxrsrnvgyx6g4l4l4iqpphfq670"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -1133,10 +1195,7 @@ processes currently in existence, much like code{top} or code{ps}.")
`(("lxqt-build-tools" ,lxqt-build-tools) `(("lxqt-build-tools" ,lxqt-build-tools)
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f)) ; no tests
#:configure-flags
;; TODO: prefetch translations files from 'lxqt-l10n'.
'("-DPULL_TRANSLATIONS=NO")))
(home-page "https://lxqt.org/") (home-page "https://lxqt.org/")
(synopsis "Lightweight Qt-based terminal emulator") (synopsis "Lightweight Qt-based terminal emulator")
(description "QTerminal is a lightweight Qt terminal emulator based on (description "QTerminal is a lightweight Qt terminal emulator based on
@ -1146,14 +1205,14 @@ QTermWidget.")
(define-public screengrab (define-public screengrab
(package (package
(name "screengrab") (name "screengrab")
(version "1.99") (version "1.101")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/lxqt/screengrab/releases/download/" (uri (string-append "https://github.com/lxqt/screengrab/releases/download/"
version "/screengrab-" version ".tar.xz")) version "/screengrab-" version ".tar.xz"))
(sha256 (sha256
(base32 "17y8rsx9fixvxv2byq8d6c01vry10nv07f8jy85vz7zp4f0rgzz3")))) (base32 "05f81xjlmiykd7iwx5xns5vnynjq4js4x1bk8wd648frrksp44fa"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("kwindowsystem" ,kwindowsystem) `(("kwindowsystem" ,kwindowsystem)

View File

@ -39,10 +39,12 @@
#:use-module (guix build-system r) #:use-module (guix build-system r)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages adns)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -59,10 +61,14 @@
#:use-module (gnu packages onc-rpc) #:use-module (gnu packages onc-rpc)
#: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 protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages statistics) #:use-module (gnu packages statistics)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
@ -1002,9 +1008,23 @@ association studies (GWAS) on extremely large data sets.")
(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"))
(inc (string-append out "/include"))
(lib (string-append out "/lib"))) (lib (string-append out "/lib")))
(mkdir-p lib) (mkdir-p lib)
(install-file "gst-plugin/libgstonlinegmmdecodefaster.so" lib) ;; The build phase installed symlinks to the actual
;; libraries. Install the actual targets.
(for-each (lambda (file)
(let ((target (readlink file)))
(delete-file file)
(install-file target lib)))
(find-files lib "\\.so"))
;; Install headers
(for-each (lambda (file)
(let ((target-dir (string-append inc "/" (dirname file))))
(install-file file target-dir)))
(find-files "." "\\.h"))
(install-file "gst-plugin/libgstonlinegmmdecodefaster.so"
(string-append lib "/gstreamer-1.0"))
#t)))))) #t))))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -1027,3 +1047,205 @@ association studies (GWAS) on extremely large data sets.")
(description "Kaldi is an extensible toolkit for speech recognition (description "Kaldi is an extensible toolkit for speech recognition
written in C++.") written in C++.")
(license license:asl2.0)))) (license license:asl2.0))))
(define-public gst-kaldi-nnet2-online
(let ((commit "617e43e73c7cc45eb9119028c02bd4178f738c4a")
(revision "1"))
(package
(name "gst-kaldi-nnet2-online")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alumae/gst-kaldi-nnet2-online.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0xh3w67b69818s6ib02ara4lw7wamjdmh4jznvkpzrs4skbs9jx9"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are none
#:make-flags
(list (string-append "SHELL="
(assoc-ref %build-inputs "bash") "/bin/bash")
(string-append "KALDI_ROOT="
(assoc-ref %build-inputs "kaldi-src"))
(string-append "KALDILIBDIR="
(assoc-ref %build-inputs "kaldi") "/lib")
"KALDI_FLAVOR=dynamic")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _ (chdir "src") #t))
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((glib (assoc-ref inputs "glib")))
(setenv "CXXFLAGS" "-std=c++11 -fPIC")
(setenv "CPLUS_INCLUDE_PATH"
(string-append glib "/include/glib-2.0:"
glib "/lib/glib-2.0/include:"
(assoc-ref inputs "gstreamer")
"/include/gstreamer-1.0:"
(getenv "CPLUS_INCLUDE_PATH"))))
(substitute* "Makefile"
(("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "")
(("\\$\\(error Cannot find") "#"))))
(add-before 'build 'build-depend
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "depend" make-flags)))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib/gstreamer-1.0")))
(install-file "libgstkaldinnet2onlinedecoder.so" lib)
#t))))))
(inputs
`(("glib" ,glib)
("gstreamer" ,gstreamer)
("jansson" ,jansson)
("openfst" ,openfst)
("kaldi" ,kaldi)))
(native-inputs
`(("bash" ,bash)
("glib:bin" ,glib "bin") ; glib-genmarshal
("kaldi-src" ,(package-source kaldi))
("pkg-config" ,pkg-config)))
(home-page "https://kaldi-asr.org/")
(synopsis "Gstreamer plugin for decoding speech")
(description "This package provides a GStreamer plugin that wraps
Kaldi's @code{SingleUtteranceNnet2Decoder}. It requires iVector-adapted DNN
acoustic models. The iVectors are adapted to the current audio stream
automatically.")
(license license:asl2.0))))
(define-public kaldi-gstreamer-server
(let ((commit "1735ba49c5dc0ebfc184e45105fc600cd9f1f508")
(revision "1"))
(package
(name "kaldi-gstreamer-server")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alumae/kaldi-gstreamer-server.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0j701m7lbwmzqxsfanj882v7881hrbmpqybbczbxqpcbg8q34w0k"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are no tests that can be run automatically
#:modules ((guix build utils)
(guix build gnu-build-system)
(srfi srfi-26))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
;; Disable hash randomization to ensure the generated .pycs
;; are reproducible.
(setenv "PYTHONHASHSEED" "0")
(with-directory-excursion "kaldigstserver"
(for-each (lambda (file)
(apply invoke
`("python"
"-m" "compileall"
"-f" ; force rebuild
,file)))
(find-files "." "\\.py$")))
#t))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(share (string-append out "/share/kaldi-gstreamer-server/")))
;; Install Python files
(with-directory-excursion "kaldigstserver"
(for-each (cut install-file <> share)
(find-files "." ".*")))
;; Install sample configuration files
(for-each (cut install-file <> share)
(find-files "." "\\.yaml"))
;; Install executables
(mkdir-p bin)
(let* ((server (string-append bin "/kaldi-gst-server"))
(client (string-append bin "/kaldi-gst-client"))
(worker (string-append bin "/kaldi-gst-worker"))
(PYTHONPATH (getenv "PYTHONPATH"))
(GST_PLUGIN_PATH (string-append
(assoc-ref inputs "gst-kaldi-nnet2-online")
"/lib/gstreamer-1.0:${GST_PLUGIN_PATH}"))
(wrap (lambda (wrapper what)
(with-output-to-file wrapper
(lambda _
(format #t
"#!~a
export PYTHONPATH=~a
export GST_PLUGIN_PATH=~a
exec ~a ~a/~a \"$@\"~%"
(which "bash") PYTHONPATH GST_PLUGIN_PATH
(which "python") share what)))
(chmod wrapper #o555))))
(for-each wrap
(list server client worker)
(list "master_server.py"
"client.py"
"worker.py")))
#t))))))
(inputs
`(("gst-kaldi-nnet2-online" ,gst-kaldi-nnet2-online)
("python2" ,python-2)
("python2-futures" ,python2-futures)
("python2-pygobject" ,python2-pygobject)
("python2-pyyaml" ,python2-pyyaml)
("python2-tornado" ,python2-tornado)
("python2-ws4py" ,python2-ws4py-for-kaldi-gstreamer-server)))
(home-page "https://github.com/alumae/kaldi-gstreamer-server")
(synopsis "Real-time full-duplex speech recognition server")
(description "This is a real-time full-duplex speech recognition server,
based on the Kaldi toolkit and the GStreamer framework and implemented in
Python.")
(license license:bsd-2))))
(define-public grpc
(package
(name "grpc")
(version "1.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/grpc/grpc.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no test target
#:configure-flags
(list "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package")))
(inputs
`(("c-ares" ,c-ares)
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
`(("protobuf" ,protobuf-next)
("python" ,python-wrapper)))
(home-page "https://grpc.io")
(synopsis "High performance universal RPC framework")
(description "gRPC is a modern open source high performance @dfn{Remote
Procedure Call} (RPC) framework that can run in any environment. It can
efficiently connect services in and across data centers with pluggable support
for load balancing, tracing, health checking and authentication. It is also
applicable in last mile of distributed computing to connect devices, mobile
applications and browsers to backend services.")
(license license:asl2.0)))

View File

@ -15,14 +15,14 @@
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016, 2017 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016, 2017, 2018 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@ -84,6 +84,7 @@
#:use-module (gnu packages libcanberra) #:use-module (gnu packages libcanberra)
#: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 linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
@ -134,14 +135,14 @@
(define-public mailutils (define-public mailutils
(package (package
(name "mailutils") (name "mailutils")
(version "3.5") (version "3.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/mailutils/mailutils-" (uri (string-append "mirror://gnu/mailutils/mailutils-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1wx275w38fwni2abc8g7g3irbk332vr34byxd72zqfdiznsqgims")))) "07phzpwrnkdclx6jvirljk9zcavl8wh02kpx3mfba9msr99kpqj6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -213,7 +214,11 @@
("readline" ,readline) ("readline" ,readline)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("libltdl" ,libltdl) ("libltdl" ,libltdl)
("gdbm" ,gdbm))) ("gdbm" ,gdbm)
;; Required for SEARCH CHARSET.
("libiconv" ,libiconv)
("libunistring" ,libunistring)))
(home-page "https://mailutils.org") (home-page "https://mailutils.org")
(synopsis "Utilities and library for reading and serving mail") (synopsis "Utilities and library for reading and serving mail")
(description (description
@ -343,14 +348,14 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt (define-public mutt
(package (package
(name "mutt") (name "mutt")
(version "1.11.3") (version "1.11.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/"
"mutt-" version ".tar.gz")) "mutt-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5")) "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn"))
(patches (search-patches "mutt-store-references.patch")))) (patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -619,14 +624,14 @@ repository and Maildir/IMAP as LOCAL repository.")
(define-public emacs-mew (define-public emacs-mew
(package (package
(name "emacs-mew") (name "emacs-mew")
(version "6.7") (version "6.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://mew.org/Release/mew-" (uri (string-append "https://mew.org/Release/mew-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03fzky2kz73vgx4cbps2psbbnrgqgkk5q7jwfldisymkzr9iz03y")))) "0ixzyq33l6j34410kqav3lwn2wx171zvqd3irvns2jvhrbww8i6g"))))
(native-inputs (native-inputs
`(("emacs" ,emacs))) `(("emacs" ,emacs)))
(propagated-inputs (propagated-inputs
@ -1023,7 +1028,7 @@ useful features.")
(define-public libetpan (define-public libetpan
(package (package
(name "libetpan") (name "libetpan")
(version "1.9.2") (version "1.9.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1031,7 +1036,7 @@ useful features.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13jiy2ddxbp9f2mk1mip9sk8h97bva5m0pnq2mlvh5xhifs6gza4")))) (base32 "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf-wrapper) (native-inputs `(("autoconf" ,autoconf-wrapper)
("automake" ,automake) ("automake" ,automake)
@ -1122,7 +1127,8 @@ compresses it.")
("mime-info" ,shared-mime-info))) ("mime-info" ,shared-mime-info)))
(arguments (arguments
'(#:configure-flags '(#:configure-flags
'("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant") '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant"
"--enable-ldap")
#:make-flags #:make-flags
;; Disable updating icon cache since it's done by the profile hook. ;; Disable updating icon cache since it's done by the profile hook.
;; Conflict with other packages in the profile would be inevitable ;; Conflict with other packages in the profile would be inevitable
@ -1193,7 +1199,7 @@ delivery.")
(define-public exim (define-public exim
(package (package
(name "exim") (name "exim")
(version "4.90.1") (version "4.92")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1202,11 +1208,10 @@ delivery.")
(string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-" (string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-"
version ".tar.bz2"))) version ".tar.bz2")))
(sha256 (sha256
(base32 (base32 "127spqn009wa6irp6r1k7a24r8vdwb6mf0raamxn8lbxsnrwy7sl"))))
"1w6blvvrd87c649j8xpag034md2w1ib0db9c4ijqbzc5dh2i1xfq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("bdb" ,bdb) `(("bdb" ,bdb-5.3) ; #error Version 6 and later BDB API is not supported
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("gzip" ,gzip) ("gzip" ,gzip)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
@ -1242,7 +1247,7 @@ delivery.")
(("(EXIM_USER=).*" all var) (("(EXIM_USER=).*" all var)
(string-append var "nobody\n")) (string-append var "nobody\n"))
(("(FIXED_NEVER_USERS=).*" all var) (("(FIXED_NEVER_USERS=).*" all var)
(string-append var "\n")) ;XXX no root in build environment (string-append var "\n")) ; XXX no root in build environment
(("(COMPRESS_COMMAND=).*" all var) (("(COMPRESS_COMMAND=).*" all var)
(string-append var gzip "/bin/gzip\n")) (string-append var gzip "/bin/gzip\n"))
(("(ZCAT_COMMAND=).*" all var) (("(ZCAT_COMMAND=).*" all var)
@ -1482,15 +1487,14 @@ write simple, representation-independent mail handling code.")
(define-public perl-email-address (define-public perl-email-address
(package (package
(name "perl-email-address") (name "perl-email-address")
(version "1.909") (version "1.912")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/" (uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/"
"Email-Address-" version ".tar.gz")) "Email-Address-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"))))
"0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g"))))
(build-system perl-build-system) (build-system perl-build-system)
(home-page "https://metacpan.org/release/Email-Address") (home-page "https://metacpan.org/release/Email-Address")
(synopsis "Email address parsing and creation") (synopsis "Email address parsing and creation")
@ -1730,15 +1734,13 @@ compatibility shims for the @command{sendmail}, @command{mailq}, and
(define-public fdm (define-public fdm
(package (package
(name "fdm") (name "fdm")
(version "1.9") (version "2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/nicm/fdm/releases/download/" (uri (string-append "https://github.com/nicm/fdm/releases/download/"
version "/fdm-" version "/fdm-" version ".tar.gz"))
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "054rscijahiza5f9qha79rg3siji3bk5mk10f8c2vqx7m4w6qh8n")))) (base32 "196fs1z8y7p12wmqn1bylzz94szl58yv2aby3p30nmwjnyv8rch6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("tdb" ,tdb) `(("tdb" ,tdb)
@ -1844,24 +1846,24 @@ Khard can also be used from within the email client @command{mutt}.")
(define-public perl-mail-spf (define-public perl-mail-spf
(package (package
(name "perl-mail-spf") (name "perl-mail-spf")
(version "v2.9.0") (version "2.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-" "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v"
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0qk1rfgfm5drj4iyniiabrasrpqv570vzhgz66lwgb67y4amkjv1"))))
"0qk1rfgfm5drj4iyniiabrasrpqv570vzhgz66lwgb67y4amkjv1"))))
(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)
("perl-net-dns-resolver-programmable" ("perl-net-dns-resolver-programmable"
,perl-net-dns-resolver-programmable))) ,perl-net-dns-resolver-programmable)))
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases
(modify-phases %standard-phases
(add-before 'configure 'modify-Build.PL (add-before 'configure 'modify-Build.PL
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Build.PL" (substitute* "Build.PL"
@ -1874,10 +1876,8 @@ Khard can also be used from within the email client @command{mutt}.")
("perl-net-dns" ,perl-net-dns) ("perl-net-dns" ,perl-net-dns)
("perl-netaddr-ip" ,perl-netaddr-ip) ("perl-netaddr-ip" ,perl-netaddr-ip)
("perl-uri" ,perl-uri))) ("perl-uri" ,perl-uri)))
(home-page (home-page "https://metacpan.org/release/Mail-SPF")
"https://metacpan.org/release/Mail-SPF") (synopsis "Perl implementation of Sender Policy Framework")
(synopsis
"Perl implementation of Sender Policy Framework")
(description "Mail::SPF is the Sender Policy Framework implemented (description "Mail::SPF is the Sender Policy Framework implemented
in Perl.") in Perl.")
(license bsd-3))) (license bsd-3)))
@ -1930,15 +1930,14 @@ converts them to maildir format directories.")
(define-public mpop (define-public mpop
(package (package
(name "mpop") (name "mpop")
(version "1.4.2") (version "1.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://marlam.de/mpop/releases/" (uri (string-append "https://marlam.de/mpop/releases/"
name "-" version ".tar.xz")) "mpop-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "1di86frxv4gj8fasni409m87qmv0j0vmj13lawkz1pwv9hbynhjb"))))
"1rx5mhgqkm7swbynrhbsz32v85h0rydb4kqfgfs9jrznd9d14m2d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
@ -2842,3 +2841,27 @@ replacement for the @code{urlview} program.")
(synopsis "Debbugs web interface") (synopsis "Debbugs web interface")
(description "Mumi is a Debbugs web interface.") (description "Mumi is a Debbugs web interface.")
(license agpl3+)))) (license agpl3+))))
(define-public ytnef
(package
(name "ytnef")
(version "1.9.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Yeraze/ytnef.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(home-page "https://github.com/Yeraze/ytnef/")
(synopsis "TNEF stream reader for winmail.dat files")
(description "This package provides a TNEF stream reader library and
related tools to process winmail.dat files.")
(license gpl2+)))

View File

@ -2,7 +2,7 @@
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

View File

@ -16,11 +16,11 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2017, 2018 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Dave Love <me@fx@gnu.org> ;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
@ -612,15 +612,14 @@ singular value problems.")
(define-public gnuplot (define-public gnuplot
(package (package
(name "gnuplot") (name "gnuplot")
(version "5.2.4") (version "5.2.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
version "/gnuplot-" version "/gnuplot-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1vllgap08nhvdmc03idmkdnk9cfl2bp81hps50q1pqrr640qzp9m"))))
"1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("readline" ,readline) (inputs `(("readline" ,readline)
("cairo" ,cairo) ("cairo" ,cairo)
@ -1299,7 +1298,7 @@ online as well as original implementations of various other algorithms.")
(define-public ipopt (define-public ipopt
(package (package
(name "ipopt") (name "ipopt")
(version "3.12.5") (version "3.12.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1307,7 +1306,7 @@ online as well as original implementations of various other algorithms.")
version".tgz")) version".tgz"))
(sha256 (sha256
(base32 (base32
"09bk2hqy2vgi4yi76xng9zxakddwqy3wij9nx7wf2vfbxxpazrsk")) "07yn9rzdswjk8n246qq6ci9ssf2bcplkifcpsfz9j6cdxw9vgbkv"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure we don't use the bundled software. ;; Make sure we don't use the bundled software.
@ -1639,7 +1638,7 @@ September 2004}")
(define-public petsc (define-public petsc
(package (package
(name "petsc") (name "petsc")
(version "3.10.3") (version "3.10.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1647,9 +1646,9 @@ September 2004}")
(uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/"
"petsc-lite-" version ".tar.gz")) "petsc-lite-" version ".tar.gz"))
(sha256 (sha256
(base32 "10p9ap1rp6k8k2g8zdc505kdlsc3976fjymyp393sccjapm50dph")))) (base32 "0fk16944zh3473ra198kdkxdn08rq7b6ap838hxy1mh1i0hb488r"))))
(outputs '("out" ;libraries and headers (outputs '("out" ; libraries and headers
"examples")) ;~30MiB of examples "examples")) ; ~30MiB of examples
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("python" ,python-2))) `(("python" ,python-2)))
@ -1662,7 +1661,7 @@ September 2004}")
)) ))
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:parallel-build? #f ;build is parallel by default #:parallel-build? #f ; build is parallel by default
#:configure-flags #:configure-flags
`("--with-mpi=0" `("--with-mpi=0"
"--with-openmp=1" "--with-openmp=1"
@ -3358,7 +3357,7 @@ Failure to do so will result in a library with poor performance.")
(define-public glm (define-public glm
(package (package
(name "glm") (name "glm")
(version "0.9.9.3") (version "0.9.9.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3366,7 +3365,7 @@ Failure to do so will result in a library with poor performance.")
version "/glm-" version ".zip")) version "/glm-" version ".zip"))
(sha256 (sha256
(base32 (base32
"0yqk5r3qh60d4r2iab5q7wq0fryn8p3pz6s28y1i7amqj1aqavj9")))) "17vxbqzy4pxciq5i39bgpxz54f7ifqqmcqwwq7m6xfgikwqqqawp"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))

View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

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