Merge branch 'master' into core-updates

Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.

4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.

 Conflicts:
	gnu/local.mk
	gnu/packages/aidc.scm
	gnu/packages/boost.scm
	gnu/packages/curl.scm
	gnu/packages/nettle.scm
	gnu/packages/networking.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tls.scm
This commit is contained in:
Marius Bakke 2021-06-19 17:38:47 +02:00
commit 6f9a80b331
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
217 changed files with 13322 additions and 4178 deletions

View File

@ -587,7 +587,8 @@ check-system: $(GOBJECTS)
dist_pkgdata_DATA = \
etc/substitutes/berlin.guix.gnu.org.pub \
etc/substitutes/ci.guix.gnu.org.pub \
etc/substitutes/ci.guix.info.pub
etc/substitutes/ci.guix.info.pub \
etc/substitutes/bordeaux.guix.gnu.org.pub
# Bash completion file.
dist_bashcompletion_DATA = etc/completion/bash/guix \

View File

@ -5,8 +5,7 @@ set -e -x
# Generate stubs for translations.
langs=`find po/doc -type f -name 'guix-manual*.po' \
| sed -e 's,guix-manual\.,,' \
| xargs -n 1 -I{} basename {} .po`
| sed -e 's,.*/guix-manual\.,,;s,\.po$,,'`
for lang in ${langs}; do
if [ ! -e "doc/guix.${lang}.texi" ]; then
echo "@setfilename guix.${lang}.info" > "doc/guix.${lang}.texi"
@ -16,8 +15,7 @@ for lang in ${langs}; do
fi
done
langs=`find po/doc -type f -name 'guix-cookbook*.po' \
| sed -e 's,guix-cookbook\.,,' \
| xargs -n 1 -I{} basename {} .po`
| sed -e 's,.*/guix-cookbook\.,,;s,\.po$,,'`
for lang in ${langs}; do
if [ ! -e "doc/guix-cookbook.${lang}.texi" ]; then
echo "@setfilename guix-cookbook.${lang}.info" > "doc/guix-cookbook.${lang}.texi"

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -132,11 +132,8 @@ to 'make'."
(false-if-exception
(module-ref ui 'report-load-error)))))
(if report
;; In Guile <= 2.2.5, 'current-load-port' was not exported.
(let ((load-port ((module-ref (resolve-module '(ice-9 ports))
'current-load-port))))
(report (or (and=> load-port port-filename) "?.scm")
args frame))
(report (or (and=> (current-load-port) port-filename) "?.scm")
args frame)
(begin
(print-exception (current-error-port) frame
(car args) (cdr args))

View File

@ -117,7 +117,7 @@ if test "x$guix_build_daemon" = "xyes"; then
dnl Determine the appropriate default list of substitute URLs (GnuTLS
dnl is required so we can default to 'https'.)
guix_substitute_urls="https://ci.guix.gnu.org"
guix_substitute_urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org"
AC_MSG_CHECKING([for default substitute URLs])
AC_MSG_RESULT([$guix_substitute_urls])

View File

@ -376,12 +376,12 @@ Once your package builds correctly, please send us a patch
(@pxref{Submitting Patches}). Well, if you need help, we will be happy to
help you too. Once the patch is committed in the Guix repository, the
new package automatically gets built on the supported platforms by
@url{@value{SUBSTITUTE-URL}, our continuous integration system}.
@url{https://@value{SUBSTITUTE-SERVER-1}, our continuous integration system}.
@cindex substituter
Users can obtain the new package definition simply by running
@command{guix pull} (@pxref{Invoking guix pull}). When
@code{@value{SUBSTITUTE-SERVER}} is done building the package, installing the
@code{@value{SUBSTITUTE-SERVER-1}} is done building the package, installing the
package automatically downloads binaries from there
(@pxref{Substitutes}). The only place where human intervention is
needed is to review and apply the patch.
@ -532,9 +532,11 @@ It is a good idea to strip commit identifiers in the @code{version}
field to, say, 7 digits. It avoids an aesthetic annoyance (assuming
aesthetics have a role to play here) as well as problems related to OS
limits such as the maximum shebang length (127 bytes for the Linux
kernel). It is best to use the full commit identifiers in
@code{origin}s, though, to avoid ambiguities. A typical package
definition may look like this:
kernel). There are helper functions for doing this for packages using
@code{git-fetch} or @code{hg-fetch} (see below). It is best to use the
full commit identifiers in @code{origin}s, though, to avoid ambiguities.
A typical package definition may look like this:
@lisp
(define my-package
@ -553,6 +555,20 @@ definition may look like this:
)))
@end lisp
@deffn {Scheme Procedure} git-version @var{VERSION} @var{REVISION} @var{COMMIT}
Return the version string for packages using @code{git-fetch}.
@lisp
(git-version "0.2.3" "0" "93818c936ee7e2f1ba1b315578bde363a7d43d05")
@result{} "0.2.3-0.93818c9"
@end lisp
@end deffn
@deffn {Scheme Procedure} hg-version @var{VERSION} @var{REVISION} @var{CHANGESET}
Return the version string for packages using @code{hg-fetch}. It works
in the same way as @code{git-version}.
@end deffn
@node Synopses and Descriptions
@subsection Synopses and Descriptions
@ -1091,7 +1107,7 @@ changes). This branch is intended to be merged in @code{master} every
until late in its development process.
@end table
All these branches are @uref{@value{SUBSTITUTE-URL},
All these branches are @uref{https://@value{SUBSTITUTE-SERVER-1},
tracked by our build farm} and merged into @code{master} once
everything has been successfully built. This allows us to fix issues
before they hit users, and to reduce the window during which pre-built
@ -1125,7 +1141,7 @@ as timestamps or randomly-generated output in the build result.
Another option is to use @command{guix challenge} (@pxref{Invoking guix
challenge}). You may run it once the package has been committed and
built by @code{@value{SUBSTITUTE-SERVER}} to check whether it obtains the same
built by @code{@value{SUBSTITUTE-SERVER-1}} to check whether it obtains the same
result as you did. Better yet: Find another machine that can build it
and run @command{guix publish}. Since the remote build machine is
likely different from yours, this can catch non-determinism issues
@ -1259,8 +1275,19 @@ this nifty tool!
@section Commit Access
@cindex commit access, for developers
For frequent contributors, having write access to the repository is
convenient. When you deem it necessary, consider applying for commit
Everyone can contribute to Guix without having commit access
(@pxref{Submitting Patches}). However, for frequent contributors,
having write access to the repository can be convenient. Commit access
should not be thought of as a ``badge of honor'' but rather as a
responsibility a contributor is willing to take to help the project.
The following sections explain how to get commit access, how to be ready
to push commits, and the policies and community expectations for commits
pushed upstream.
@subsection Applying for Commit Access
When you deem it necessary, consider applying for commit
access by following these steps:
@enumerate
@ -1332,6 +1359,29 @@ review and merging system, which, as a consequence, may lead us to have
fewer people with commit access to the main repository. Stay tuned!
@end quotation
All commits that are pushed to the central repository on Savannah must
be signed with an OpenPGP key, and the public key should be uploaded to
your user account on Savannah and to public key servers, such as
@code{keys.openpgp.org}. To configure Git to automatically sign
commits, run:
@example
git config commit.gpgsign true
# Substitute the fingerprint of your public PGP key.
git config user.signingkey CABBA6EA1DC0FF33
@end example
You can prevent yourself from accidentally pushing unsigned commits to
Savannah by using the pre-push Git hook located at
@file{etc/git/pre-push}:
@example
cp etc/git/pre-push .git/hooks/pre-push
@end example
@subsection Commit Policy
If you get commit access, please make sure to follow
the policy below (discussions of the policy can take place on
@email{guix-devel@@gnu.org}).
@ -1350,25 +1400,6 @@ mailing list for commit notifications (@email{guix-commits@@gnu.org}),
so people can notice. Before pushing your changes, make sure to run
@code{git pull --rebase}.
All commits that are pushed to the central repository on Savannah must
be signed with an OpenPGP key, and the public key should be uploaded to
your user account on Savannah and to public key servers, such as
@code{keys.openpgp.org}. To configure Git to automatically sign
commits, run:
@example
git config commit.gpgsign true
git config user.signingkey CABBA6EA1DC0FF33
@end example
You can prevent yourself from accidentally pushing unsigned commits to
Savannah by using the pre-push Git hook called located at
@file{etc/git/pre-push}:
@example
cp etc/git/pre-push .git/hooks/pre-push
@end example
When pushing a commit on behalf of somebody else, please add a
@code{Signed-off-by} line at the end of the commit log message---e.g.,
with @command{git am --signoff}. This improves tracking of who did
@ -1390,12 +1421,76 @@ you're confident, it's OK to commit.
That last part is subject to being adjusted, allowing individuals to commit
directly on non-controversial changes on parts theyre familiar with.
@subsection Addressing Issues
Peer review (@pxref{Submitting Patches}) and tools such as
@command{guix lint} (@pxref{Invoking guix lint}) and the test suite
(@pxref{Running the Test Suite}) should catch issues before they are
pushed. Yet, commits that ``break'' functionality might occasionally
go through. When that happens, there are two priorities: mitigating
the impact, and understanding what happened to reduce the chance of
similar incidents in the future. The responsibility for both these
things primarily lies with those involved, but like everything this is
a group effort.
Some issues can directly affect all users---for instance because they
make @command{guix pull} fail or break core functionality, because they
break major packages (at build time or run time), or because they
introduce known security vulnerabilities.
@cindex reverting commits
The people involved in authoring, reviewing, and pushing such
commit(s) should be at the forefront to mitigate their impact in a
timely fashion: by pushing a followup commit to fix it (if possible),
or by reverting it to leave time to come up with a proper fix, and by
communicating with other developers about the problem.
If these persons are unavailable to address the issue in time, other
committers are entitled to revert the commit(s), explaining in the
commit log and on the mailing list what the problem was, with the goal
of leaving time to the original committer, reviewer(s), and author(s)
to propose a way forward.
Once the problem has been dealt with, it is the responsibility of
those involved to make sure the situation is understood. If you are
working to understand what happened, focus on gathering information
and avoid assigning any blame. Do ask those involved to describe what
happened, do not ask them to explain the situation---this would
implicitly blame them, which is unhelpful. Accountability comes from
a consensus about the problem, learning from it and improving
processes so that it's less likely to reoccur.
@subsection Commit Revocation
In order to reduce the possibility of mistakes, committers will have
their Savannah account removed from the Guix Savannah project and their
key removed from @file{.guix-authorizations} after 12 months of
inactivity; they can ask to regain commit access by emailing the
maintainers, without going through the vouching process.
Maintainers@footnote{See @uref{https://guix.gnu.org/en/about} for the
current list of maintainers. You can email them privately at
@email{guix-maintainers@@gnu.org}.} may also revoke an individual's
commit rights, as a last resort, if cooperation with the rest of the
community has caused too much friction---even within the bounds of the
project's code of conduct (@pxref{Contributing}). They would only do so
after public or private discussion with the individual and a clear
notice. Examples of behavior that hinders cooperation and could lead to
such a decision include:
@itemize
@item repeated violation of the commit policy stated above;
@item repeated failure to take peer criticism into account;
@item breaching trust through a series of grave incidents.
@end itemize
When maintainers resort to such a decision, they notify developers on
@email{guix-devel@@gnu.org}; inquiries may be sent to
@email{guix-maintainers@@gnu.org}. Depending on the situation, the
individual may still be welcome to contribute.
@subsection Helping Out
One last thing: the project keeps moving forward because committers not
only push their own awesome changes, but also offer some of their time
@emph{reviewing} and pushing other people's changes. As a committer,

View File

@ -17,8 +17,9 @@
@set BASE-URL https://ftp.gnu.org/gnu/guix
@c The official substitute server used by default.
@set SUBSTITUTE-SERVER ci.guix.gnu.org
@set SUBSTITUTE-URL https://@value{SUBSTITUTE-SERVER}
@set SUBSTITUTE-SERVER-1 ci.guix.gnu.org
@set SUBSTITUTE-SERVER-2 bordeaux.guix.gnu.org
@set SUBSTITUTE-URLS https://@value{SUBSTITUTE-SERVER-1} https://@value{SUBSTITUTE-SERVER-2}
@copying
Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès@*
@ -89,6 +90,7 @@ Copyright @copyright{} 2020 Jonathan Brielmaier@*
Copyright @copyright{} 2020 Edgar Vincent@*
Copyright @copyright{} 2021 Maxime Devos@*
Copyright @copyright{} 2021 B. Wilson@*
Copyright @copyright{} 2021 Xinglu Chen@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -228,7 +230,7 @@ Package Management
Substitutes
* Official Substitute Server:: One particular source of substitutes.
* Official Substitute Servers:: One particular source of substitutes.
* Substitute Server Authorization:: How to enable or disable substitutes.
* Getting Substitutes from Other Servers:: Substitute diversity.
* Substitute Authentication:: How Guix verifies substitutes.
@ -779,12 +781,15 @@ Info search path).
@item
@cindex substitutes, authorization thereof
To use substitutes from @code{@value{SUBSTITUTE-SERVER}} or one of its mirrors
(@pxref{Substitutes}), authorize them:
To use substitutes from @code{@value{SUBSTITUTE-SERVER-1}},
@code{@value{SUBSTITUTE-SERVER-2}} or a mirror (@pxref{Substitutes}),
authorize them:
@example
# guix archive --authorize < \
~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER}.pub
~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER-1}.pub
# guix archive --authorize < \
~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER-2}.pub
@end example
@quotation Note
@ -855,9 +860,7 @@ version 0.1.0 or later;
@item @uref{https://notabug.org/guile-lzlib/guile-lzlib, Guile-lzlib};
@item @uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi};
@item
@c FIXME: We need the #:fetch-options parameter of 'submodule-update',
@c which appeared in 0.5.0. Change below after string freeze.
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.3.0
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.5.0
or later;
@item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}
4.3.0 or later;
@ -1548,7 +1551,7 @@ remote procedure call (@pxref{The Store}).
@item --substitute-urls=@var{urls}
Consider @var{urls} the default whitespace-separated list of substitute
source URLs. When this option is omitted,
@indicateurl{https://@value{SUBSTITUTE-SERVER}} is used.
@indicateurl{@value{SUBSTITUTE-URLS}} is used.
This means that substitutes may be downloaded from @var{urls}, as long
as they are signed by a trusted signature (@pxref{Substitutes}).
@ -3688,7 +3691,7 @@ pre-built package binaries, but source tarballs, for instance, which
also result from derivation builds, can be available as substitutes.
@menu
* Official Substitute Server:: One particular source of substitutes.
* Official Substitute Servers:: One particular source of substitutes.
* Substitute Server Authorization:: How to enable or disable substitutes.
* Getting Substitutes from Other Servers:: Substitute diversity.
* Substitute Authentication:: How Guix verifies substitutes.
@ -3697,14 +3700,15 @@ also result from derivation builds, can be available as substitutes.
* On Trusting Binaries:: How can you trust that binary blob?
@end menu
@node Official Substitute Server
@subsection Official Substitute Server
@node Official Substitute Servers
@subsection Official Substitute Servers
@cindex build farm
The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm
that builds packages from Guix continuously for some
architectures, and makes them available as substitutes. This is the
default source of substitutes; it can be overridden by passing the
@code{@value{SUBSTITUTE-SERVER-1}} and
@code{@value{SUBSTITUTE-SERVER-2}} are both front-ends to official build
farms that build packages from Guix continuously for some architectures,
and make them available as substitutes. These are the default source of
substitutes; which can be overridden by passing the
@option{--substitute-urls} option either to @command{guix-daemon}
(@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}})
or to client tools such as @command{guix package}
@ -3717,7 +3721,7 @@ using HTTP makes all communications visible to an eavesdropper, who
could use the information gathered to determine, for instance, whether
your system has unpatched security vulnerabilities.
Substitutes from the official build farm are enabled by default when
Substitutes from the official build farms are enabled by default when
using Guix System (@pxref{GNU Distribution}). However,
they are disabled by default when using Guix on a foreign distribution,
unless you have explicitly enabled them via one of the recommended
@ -3733,27 +3737,28 @@ other substitute server.
@cindex substitutes, authorization thereof
@cindex access control list (ACL), for substitutes
@cindex ACL (access control list), for substitutes
To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER}} or a
mirror thereof, you
must add its public key to the access control list (ACL) of archive
To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER-1}}, @code{@value{SUBSTITUTE-SERVER-2}} or a mirror, you
must add the releavnt public key to the access control list (ACL) of archive
imports, using the @command{guix archive} command (@pxref{Invoking guix
archive}). Doing so implies that you trust @code{@value{SUBSTITUTE-SERVER}} to not
archive}). Doing so implies that you trust the substitute server to not
be compromised and to serve genuine substitutes.
@quotation Note
If you are using Guix System, you can skip this section: Guix System
authorizes substitutes from @code{@value{SUBSTITUTE-SERVER}} by default.
authorizes substitutes from @code{@value{SUBSTITUTE-SERVER-1}} and
@code{@value{SUBSTITUTE-SERVER-2}} by default.
@end quotation
The public key for @code{@value{SUBSTITUTE-SERVER}} is installed along with Guix, in
@code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, where @var{prefix} is
the installation prefix of Guix. If you installed Guix from source,
make sure you checked the GPG signature of
The public keys for each of the project maintained substitute servers
are installed along with Guix, in @code{@var{prefix}/share/guix/}, where
@var{prefix} is the installation prefix of Guix. If you installed Guix
from source, make sure you checked the GPG signature of
@file{guix-@value{VERSION}.tar.gz}, which contains this public key file.
Then, you can run something like this:
@example
# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub
# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER-1}.pub
# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER-2}.pub
@end example
Once this is in place, the output of a command like @code{guix build}
@ -3785,8 +3790,8 @@ $ guix build emacs --dry-run
@noindent
The text changed from ``The following derivations would be built'' to
``112.3 MB would be downloaded''. This indicates that substitutes from
@code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when
possible, for future builds.
the configured substitute servers are usable and will be downloaded,
when possible, for future builds.
@cindex substitutes, how to disable
The substitute mechanism can be disabled globally by running
@ -3820,8 +3825,9 @@ its configuration and add the URLs and substitute keys that you want
As an example, suppose you want to fetch substitutes from
@code{guix.example.org} and to authorize the signing key of that server,
in addition to the default @code{@value{SUBSTITUTE-SERVER}}. The
resulting operating system configuration will look something like:
in addition to the default @code{@value{SUBSTITUTE-SERVER-1}} and
@code{@value{SUBSTITUTE-SERVER-2}}. The resulting operating system
configuration will look something like:
@lisp
(operating-system
@ -3865,7 +3871,7 @@ line and list the URLs of interest (@pxref{daemon-substitute-urls,
@code{guix-daemon --substitute-urls}}):
@example
@dots{} --substitute-urls='https://guix.example.org https://@value{SUBSTITUTE-SERVER}'
@dots{} --substitute-urls='https://guix.example.org @value{SUBSTITUTE-URLS}'
@end example
@item
@ -3888,10 +3894,12 @@ Again this assumes @file{key.pub} contains the public key that
@end enumerate
Now you're all set! Substitutes will be preferably taken from
@code{https://guix.example.org}, using @code{@value{SUBSTITUTE-SERVER}}
as a fallback. Of course you can list as many substitute servers as you
like, with the caveat that substitute lookup can be slowed down if too
many servers need to be contacted.
@code{https://guix.example.org}, using
@code{@value{SUBSTITUTE-SERVER-1}} then
@code{@value{SUBSTITUTE-SERVER-2}} as fallback options. Of course you
can list as many substitute servers as you like, with the caveat that
substitute lookup can be slowed down if too many servers need to be
contacted.
Note that there are also situations where one may want to add the URL of
a substitute server @emph{without} authorizing its key.
@ -3979,12 +3987,12 @@ by a server.
Today, each individual's control over their own computing is at the
mercy of institutions, corporations, and groups with enough power and
determination to subvert the computing infrastructure and exploit its
weaknesses. While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be
convenient, we encourage users to also build on their own, or even run
their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an
interesting target. One way to help is by publishing the software you
build using @command{guix publish} so that others have one more choice
of server to download substitutes from (@pxref{Invoking guix publish}).
weaknesses. While using substitutes can be convenient, we encourage
users to also build on their own, or even run their own build farm, such
that the project run substitute servers are less of an interesting
target. One way to help is by publishing the software you build using
@command{guix publish} so that others have one more choice of server to
download substitutes from (@pxref{Invoking guix publish}).
Guix has the foundations to maximize build reproducibility
(@pxref{Features}). In most cases, independent builds of a given
@ -4948,11 +4956,11 @@ Read a single-item archive as served by substitute servers
low-level operation needed in only very narrow use cases; see below.
For example, the following command extracts the substitute for Emacs
served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:
served by @code{@value{SUBSTITUTE-SERVER-1}} to @file{/tmp/emacs}:
@example
$ wget -O - \
https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-emacs-24.5 \
https://@value{SUBSTITUTE-SERVER-1}/nar/gzip/@dots{}-emacs-24.5 \
| gunzip | guix archive -x /tmp/emacs
@end example
@ -4974,7 +4982,7 @@ this example:
@example
$ wget -O - \
https://@value{SUBSTITUTE-SERVER}/nar/lzip/@dots{}-emacs-26.3 \
https://@value{SUBSTITUTE-SERVER-1}/nar/lzip/@dots{}-emacs-26.3 \
| lzip -d | guix archive -t
@end example
@ -6659,7 +6667,8 @@ This is the data type representing a package recipe.
The name of the package, as a string.
@item @code{version}
The version of the package, as a string.
The version of the package, as a string. @xref{Version Numbers}, for
guidelines.
@item @code{source}
An object telling how the source code for the package should be
@ -7809,7 +7818,7 @@ MbedTLS package:
Some older packages that aren't using @file{Package.toml} yet, will require
this file to be created, too. The function @code{julia-create-package-toml}
helps creating the file. You need to pass the outputs and the source of the
package, it's name (the same as the @code{file-name} parameter), the package
package, its name (the same as the @code{file-name} parameter), the package
uuid, the package version, and a list of dependencies specified by their name
and their uuid.
@end defvr
@ -10935,7 +10944,7 @@ but you are actually on an @code{x86_64} machine:
@example
$ guix build --log-file gdb -s aarch64-linux
https://@value{SUBSTITUTE-SERVER}/log/@dots{}-gdb-7.10
https://@value{SUBSTITUTE-SERVER-1}/log/@dots{}-gdb-7.10
@end example
You can freely access a huge library of build logs!
@ -12588,7 +12597,7 @@ When @command{guix publish} runs, it spawns an HTTP server which allows
anyone with network access to obtain substitutes from it. This means
that any machine running Guix can also act as if it were a build farm,
since the HTTP interface is compatible with Cuirass, the software behind
the @code{@value{SUBSTITUTE-SERVER}} build farm.
the @code{@value{SUBSTITUTE-SERVER-1}} build farm.
For security, each substitute is signed, allowing recipients to check
their authenticity and integrity (@pxref{Substitutes}). Because
@ -12877,12 +12886,12 @@ any given store item.
The command output looks like this:
@smallexample
$ guix challenge --substitute-urls="https://@value{SUBSTITUTE-SERVER} https://guix.example.org"
updating list of substitutes from 'https://@value{SUBSTITUTE-SERVER}'... 100.0%
$ guix challenge --substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org"
updating list of substitutes from 'https://@value{SUBSTITUTE-SERVER-1}'... 100.0%
updating list of substitutes from 'https://guix.example.org'... 100.0%
/gnu/store/@dots{}-openssl-1.0.2d contents differ:
local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q
https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q
https://@value{SUBSTITUTE-SERVER-1}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q
https://guix.example.org/nar/@dots{}-openssl-1.0.2d: 1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim
differing files:
/lib/libcrypto.so.1.1
@ -12890,14 +12899,14 @@ updating list of substitutes from 'https://guix.example.org'... 100.0%
/gnu/store/@dots{}-git-2.5.0 contents differ:
local hash: 00p3bmryhjxrhpn2gxs2fy0a15lnip05l97205pgbk5ra395hyha
https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f
https://@value{SUBSTITUTE-SERVER-1}/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f
https://guix.example.org/nar/@dots{}-git-2.5.0: 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73
differing file:
/libexec/git-core/git-fsck
/gnu/store/@dots{}-pius-2.1.1 contents differ:
local hash: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax
https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax
https://@value{SUBSTITUTE-SERVER-1}/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax
https://guix.example.org/nar/@dots{}-pius-2.1.1: 1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs
differing file:
/share/man/man1/pius.1.gz
@ -12919,7 +12928,7 @@ the servers obtained a result different from the local build.
@cindex non-determinism, in package builds
As an example, @code{guix.example.org} always gets a different answer.
Conversely, @code{@value{SUBSTITUTE-SERVER}} agrees with local builds, except in the
Conversely, @code{@value{SUBSTITUTE-SERVER-1}} agrees with local builds, except in the
case of Git. This might indicate that the build process of Git is
non-deterministic, meaning that its output varies as a function of
various things that Guix does not fully control, in spite of building
@ -12935,7 +12944,7 @@ to run:
@example
guix challenge git \
--diff=diffoscope \
--substitute-urls="https://@value{SUBSTITUTE-SERVER} https://guix.example.org"
--substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org"
@end example
This automatically invokes @command{diffoscope}, which displays detailed
@ -12945,14 +12954,14 @@ Alternatively, we can do something along these lines (@pxref{Invoking guix
archive}):
@example
$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/lzip/@dots{}-git-2.5.0 \
$ wget -q -O - https://@value{SUBSTITUTE-SERVER-1}/nar/lzip/@dots{}-git-2.5.0 \
| lzip -d | guix archive -x /tmp/git
$ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git
@end example
This command shows the difference between the files resulting from the
local build, and the files resulting from the build on
@code{@value{SUBSTITUTE-SERVER}} (@pxref{Overview, Comparing and Merging Files,,
@code{@value{SUBSTITUTE-SERVER-1}} (@pxref{Overview, Comparing and Merging Files,,
diffutils, Comparing and Merging Files}). The @command{diff} command
works great for text files. When binary files differ, a better option
is @uref{https://diffoscope.org/, Diffoscope}, a tool that helps
@ -12967,7 +12976,7 @@ In the meantime, @command{guix challenge} is one tool to help address
the problem.
If you are writing packages for Guix, you are encouraged to check
whether @code{@value{SUBSTITUTE-SERVER}} and other substitute servers obtain the
whether @code{@value{SUBSTITUTE-SERVER-1}} and other substitute servers obtain the
same build result as you did with:
@example
@ -13248,14 +13257,14 @@ on @var{a} and @var{a} has no substitutes, only @var{a} is listed, even though
@var{b} usually lacks substitutes as well. The result looks like this:
@example
$ guix weather --substitute-urls=@value{SUBSTITUTE-URL} -c 10
$ guix weather --substitute-urls=@value{SUBSTITUTE-URLS} -c 10
computing 8,983 package derivations for x86_64-linux...
looking for 9,343 store items on @value{SUBSTITUTE-URL}...
updating substitutes from '@value{SUBSTITUTE-URL}'... 100.0%
@value{SUBSTITUTE-URL}
looking for 9,343 store items on @value{SUBSTITUTE-URLS}...
updating substitutes from '@value{SUBSTITUTE-URLS}'... 100.0%
@value{SUBSTITUTE-URLS}
64.7% substitutes available (6,047 out of 9,343)
@dots{}
2502 packages are missing from '@value{SUBSTITUTE-URL}' for 'x86_64-linux', among which:
2502 packages are missing from '@value{SUBSTITUTE-URLS}' for 'x86_64-linux', among which:
58 kcoreaddons@@5.49.0 /gnu/store/@dots{}-kcoreaddons-5.49.0
46 qgpgme@@1.11.1 /gnu/store/@dots{}-qgpgme-1.11.1
37 perl-http-cookiejar@@0.008 /gnu/store/@dots{}-perl-http-cookiejar-0.008
@ -13264,7 +13273,7 @@ updating substitutes from '@value{SUBSTITUTE-URL}'... 100.0%
What this example shows is that @code{kcoreaddons} and presumably the 58
packages that depend on it have no substitutes at
@code{@value{SUBSTITUTE-SERVER}}; likewise for @code{qgpgme} and the 46
@code{@value{SUBSTITUTE-SERVER-1}}; likewise for @code{qgpgme} and the 46
packages that depend on it.
If you are a Guix developer, or if you are taking care of this build farm,
@ -13485,12 +13494,12 @@ of a package:
(operating-system
;; ...
(packages (cons (list bind "utils")
(packages (cons (list isc-bind "utils")
%base-packages)))
@end lisp
@findex specification->package
Referring to packages by variable name, like @code{bind} above, has
Referring to packages by variable name, like @code{isc-bind} above, has
the advantage of being unambiguous; it also allows typos and such to be
diagnosed right away as ``unbound variables''. The downside is that one
needs to know which module defines which package, and to augment the
@ -15471,7 +15480,9 @@ Number of build user accounts to create.
@item @code{authorize-key?} (default: @code{#t})
@cindex substitutes, authorization thereof
Whether to authorize the substitute keys listed in
@code{authorized-keys}---by default that of @code{@value{SUBSTITUTE-SERVER}}
@code{authorized-keys}---by default that of
@code{@value{SUBSTITUTE-SERVER-1}} and
@code{@value{SUBSTITUTE-SERVER-2}}
(@pxref{Substitutes}).
When @code{authorize-key?} is true, @file{/etc/guix/acl} cannot be
@ -15492,8 +15503,9 @@ allowed for in-place modifications to @file{/etc/guix/acl}.
@item @code{authorized-keys} (default: @code{%default-authorized-guix-keys})
The list of authorized key files for archive imports, as a list of
string-valued gexps (@pxref{Invoking guix archive}). By default, it
contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes}).
See @code{substitute-urls} below for an example on how to change it.
contains that of @code{@value{SUBSTITUTE-SERVER-1}} and
@code{@value{SUBSTITUTE-SERVER-2}} (@pxref{Substitutes}). See
@code{substitute-urls} below for an example on how to change it.
@item @code{use-substitutes?} (default: @code{#t})
Whether to use substitutes.
@ -15502,7 +15514,7 @@ Whether to use substitutes.
The list of URLs where to look for substitutes by default.
Suppose you would like to fetch substitutes from @code{guix.example.org}
in addition to @code{@value{SUBSTITUTE-SERVER}}. You will need to do
in addition to @code{@value{SUBSTITUTE-SERVER-1}}. You will need to do
two things: (1) add @code{guix.example.org} to @code{substitute-urls},
and (2) authorize its signing key, having done appropriate checks
(@pxref{Substitute Server Authorization}). The configuration below does
@ -21785,7 +21797,7 @@ Available @code{getmail-options-configuration} fields are:
If set to @samp{0}, getmail will only print warnings and errors. A
value of @samp{1} means that messages will be printed about retrieving
and deleting messages. If set to @samp{2}, getmail will print messages
about each of it's actions.
about each of its actions.
Defaults to @samp{1}.
@ -25532,7 +25544,7 @@ directives} for comprehensive documentation on the acceptable
@deftp {Data type} php-fpm-dynamic-process-manager-configuration
Data Type for the @code{dynamic} php-fpm process manager. With the
@code{dynamic} process manager, spare worker processes are kept around
based on it's configured limits.
based on its configured limits.
@table @asis
@item @code{max-children} (default: @code{5})
Maximum of worker processes.
@ -31600,7 +31612,7 @@ notifications.
The kernel module loader service allows one to load loadable kernel
modules at boot. This is especially useful for modules that don't
autoload and need to be manually loaded, as it's the case with
autoload and need to be manually loaded, as is the case with
@code{ddcci}.
@deffn {Scheme Variable} kernel-module-loader-service-type
@ -33255,7 +33267,7 @@ below, which enables networking and requests 1@tie{}GiB of RAM for the
emulated machine:
@example
$ /gnu/store/@dots{}-run-vm.sh -m 1024 -smp 2 -net user,model=virtio-net-pci
$ /gnu/store/@dots{}-run-vm.sh -m 1024 -smp 2 -nic user,model=virtio-net-pci
@end example
The VM shares its store with the host system.

View File

@ -1,5 +1,6 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2021 Tobias Geerinck-Rice <me@tobias.gr>
#
# This file is part of GNU Guix.
#
@ -68,31 +69,29 @@ _guix_complete_installed_package ()
_guix_complete_option ()
{
local subcommand
case "${COMP_WORDS[2]}" in
-*) subcommand="";;
[a-z]*) subcommand="${COMP_WORDS[2]}";;
esac
local options="$(${COMP_WORDS[0]} ${COMP_WORDS[1]} $subcommand --help 2> /dev/null \
local command="${COMP_WORDS[$1]}"
local subcommand="${COMP_WORDS[$(($1 + 1))]}"
if _guix_is_option "$subcommand"
then
subcommand=""
fi
local options="$(${COMP_WORDS[0]} $command $subcommand --help 2> /dev/null \
| grep '^ \+-' \
| sed -e's/^.*--\([a-zA-Z0-9_-]\+\)\(=\?\).*/--\1\2/g')"
compopt -o nospace
COMPREPLY=($(compgen -W "$options" -- "${COMP_WORDS[${#COMP_WORDS[*]} - 1]}"))
COMPREPLY=($(compgen -W "$options" -- "$2"))
}
_guix_is_command ()
_guix_is_option ()
{
local word
local result="false"
for word in ${COMP_WORDS[*]}
do
if [ "$word" = "$1" ]
then
result=true
break
fi
done
$result
case "$1" in
-*)
true
;;
*)
false
;;
esac
}
_guix_is_removing ()
@ -183,22 +182,43 @@ _guix_complete ()
local word_count=${#COMP_WORDS[*]}
local word_at_point="${COMP_WORDS[$COMP_CWORD]}"
if [ "$COMP_CWORD" -gt 1 ]
then
case "$word_at_point" in
-*)
_guix_complete_option "$word_at_point"
return
;;
esac
fi
# Find the innermost command at point, e.g. "build" in the case of
# "guix time-machine OPTIONS -- build<Tab>" -- but "time-machine" if
# point is moved before "build".
local command_index=0
local command
local word_index=0
local word
local expect_command="true"
while [[ $((++word_index)) -le COMP_CWORD ]]
do
word="${COMP_WORDS[$word_index]}"
if $expect_command
then
command_index=$word_index
command="$word"
expect_command="false"
continue
fi
if [[ "$word" = "--" ]]
then
case "$command" in
environment)
break
;;
time-machine)
expect_command="true"
;;
esac
fi
done
case $COMP_CWORD in
1)
$command_index)
_guix_complete_command
;;
*)
if _guix_is_command "package"
if [[ "$command" = "package" ]]
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p || _guix_is_dash_f
then
@ -209,7 +229,7 @@ _guix_complete ()
else
_guix_complete_available_package "$word_at_point"
fi
elif _guix_is_command "install"
elif [[ "$command" = "install" ]]
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p
then
@ -217,7 +237,7 @@ _guix_complete ()
else
_guix_complete_available_package "$word_at_point"
fi
elif _guix_is_command "remove"
elif [[ "$command" = "remove" ]]
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p
then
@ -225,7 +245,7 @@ _guix_complete ()
else
_guix_complete_installed_package "$word_at_point"
fi
elif _guix_is_command "upgrade"
elif [[ "$command" = "upgrade" ]]
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p
then
@ -233,7 +253,7 @@ _guix_complete ()
else
_guix_complete_installed_package "$word_at_point"
fi
elif _guix_is_command "build"
elif [[ "$command" = "build" ]]
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_f
then
@ -241,51 +261,54 @@ _guix_complete ()
else
_guix_complete_available_package "$word_at_point"
fi
elif _guix_is_command "environment"
elif [[ "$command" = "environment" ]]
then
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p || _guix_is_dash_l
then
_guix_complete_file
elif _guix_is_option "$word_at_point"
then
_guix_complete_option "$command_index" "$word_at_point"
else
_guix_complete_available_package "$word_at_point"
fi
elif _guix_is_command "download"
elif [[ "$command" = "download" ]]
then
_guix_complete_file
elif _guix_is_command "system"
elif [[ "$command" = "system" ]]
then
case $COMP_CWORD in
2) _guix_complete_subcommand;;
*) _guix_complete_file;; # TODO: restrict to *.scm
esac
elif _guix_is_command "pull"
elif [[ "$command" = "pull" ]]
then
if _guix_is_dash_C || _guix_is_dash_p
then
_guix_complete_file
fi
elif _guix_is_command "time-machine"
elif [[ "$command" = "time-machine" ]]
then
if _guix_is_dash_C
then
_guix_complete_file
else
_guix_complete_command
_guix_complete_option "$command_index" "$word_at_point"
fi
elif _guix_is_command "container"
elif [[ "$command" = "container" ]]
then
case $COMP_CWORD in
2) _guix_complete_subcommand;;
3) _guix_complete_pid "$word_at_point";;
*) _guix_complete_file;;
esac
elif _guix_is_command "import"
elif [[ "$command" = "import" ]]
then
_guix_complete_subcommand
elif _guix_is_command "hash" || _guix_is_command "gc"
elif [[ "$command" = "hash" || "$command" = "gc" ]]
then
_guix_complete_file
elif _guix_is_command "weather"
elif [[ "$command" = "weather" ]]
then
if _guix_is_dash_m
then
@ -296,6 +319,12 @@ _guix_complete ()
fi
;;
esac
if [[ -z "$COMPREPLY" && COMP_CWORD -gt command_index ]] &&
_guix_is_option "$word_at_point"
then
_guix_complete_option "$command_index" "$word_at_point"
fi
}
complete -F _guix_complete guix

View File

@ -99,6 +99,8 @@
nil t)
(let ((indent-tabs-mode nil))
(beginning-of-defun)
(mark-sexp)
(untabify (point) (mark))
(indent-sexp)
(save-buffer)
(message "Done!"))
@ -108,6 +110,7 @@
;; Indent all of FILE-NAME.
(find-file file-name)
(let ((indent-tabs-mode nil))
(untabify (point-min) (point-max))
(indent-region (point-min) (point-max))
(save-buffer)
(message "Done!")))

View File

@ -50,7 +50,7 @@ Führen Sie @command{info \"(guix.de) Aufruf von guix import\"} aus, um mehr
Informationen zu bekommen.")
(zh "新的 @command{guix import egg} 命令能让贡献者从一个CHICKEN egg生
成一个包装或包装样板
x
@example
guix import egg sourcehut
@end example

View File

@ -0,0 +1,6 @@
(public-key
(ecc
(curve Ed25519)
(q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
)
)

View File

@ -585,6 +585,16 @@ upon error."
(unless (configure-qemu-networking)
(display "network interface is DOWN\n")))
;; A big ugly hammer, to be used only for debugging and in desperate
;; situations where no proper device synchonisation is possible.
(let ((root-delay (and=> (find-long-option "rootdelay" args)
string->number)))
(when root-delay
(format #t
"Pausing for rootdelay=~a seconds before mounting the root file system...\n"
root-delay)
(sleep root-delay)))
;; Prepare the real root file system under /root.
(unless (file-exists? "/root")
(mkdir "/root"))

View File

@ -709,6 +709,13 @@ by pressing the Exit button.~%~%")))
(run-error-page
(G_ "No root mount point found.")
(G_ "Missing mount point"))
#f)
((cannot-read-uuid? c)
(run-error-page
(format #f (G_ "Cannot read the ~a partition UUID.\
You may need to format it.")
(cannot-read-uuid-partition c))
(G_ "Wrong partition format"))
#f))
(check-user-partitions user-partitions))))
(if user-partitions-ok?
@ -789,6 +796,7 @@ by pressing the Exit button.~%~%")))
(format-user-partitions user-partitions-with-pass)
(syslog "formatted ~a user partitions~%"
(length user-partitions-with-pass))
(syslog "user-partitions: ~a~%" user-partitions)
(destroy-form-and-pop form)
user-partitions))

View File

@ -24,8 +24,13 @@
#:use-module (gnu installer newt page)
#:use-module (gnu system uuid)
#:use-module ((gnu build file-systems)
#:select (read-partition-uuid
#:select (canonicalize-device-spec
find-partition-by-label
read-partition-uuid
read-luks-partition-uuid))
#:use-module ((gnu build linux-boot)
#:select (linux-command-line
find-long-option))
#:use-module ((gnu build linux-modules)
#:select (missing-modules))
#:use-module ((gnu system linux-initrd)
@ -107,6 +112,9 @@
&no-root-mount-point
no-root-mount-point?
&cannot-read-uuid
cannot-read-uuid?
cannot-read-uuid-partition
check-user-partitions
set-user-partitions-file-name
@ -230,7 +238,7 @@ inferior to MAX-SIZE, #f otherwise."
(case fs-type
((ext4) "ext4")
((btrfs) "btrfs")
((fat16) "fat")
((fat16) "vfat")
((fat32) "vfat")
((jfs) "jfs")
((ntfs) "ntfs")))
@ -334,16 +342,35 @@ fail. See rereadpt function in wipefs.c of util-linux for an explanation."
(with-null-output-ports
(invoke "dmsetup" "remove_all")))
(define (installation-device)
"Return the installation device path."
(let* ((cmdline (linux-command-line))
(root (find-long-option "--root" cmdline)))
(and root
(canonicalize-device-spec (uuid root)))))
(define (non-install-devices)
"Return all the available devices, except the busy one, allegedly the
install device. DEVICE-IS-BUSY? is a parted call, checking if the device is
mounted."
;; FIXME: The install image uses an overlayfs so the install device does not
;; appear as mounted and won't be considered as busy.
(remove (lambda (device)
(let ((file-name (device-path device)))
(device-is-busy? device)))
(devices)))
"Return all the available devices, except the install device."
(define (read-only? device)
(dynamic-wind
(lambda ()
(device-open device))
(lambda ()
(device-read-only? device))
(lambda ()
(device-close device))))
;; If parted reports that a device is read-only it is probably the
;; installation device. However, as this detection does not always work,
;; compare the device path to the installation device path read from the
;; command line.
(let ((install-device (installation-device)))
(remove (lambda (device)
(let ((file-name (device-path device)))
(or (read-only? device)
(and install-device
(string=? file-name install-device)))))
(devices))))
;;
@ -1006,15 +1033,48 @@ exists."
(define-condition-type &no-root-mount-point &condition
no-root-mount-point?)
;; Cannot not read the partition UUID.
(define-condition-type &cannot-read-uuid &condition
cannot-read-uuid?
(partition cannot-read-uuid-partition))
(define (check-user-partitions user-partitions)
"Return #t if the USER-PARTITIONS lists contains one <user-partition> record
with a mount-point set to '/', raise &no-root-mount-point condition
otherwise."
(let ((mount-points
(map user-partition-mount-point user-partitions)))
(or (member "/" mount-points)
(raise
(condition (&no-root-mount-point))))))
"Check the following statements:
The USER-PARTITIONS list contains one <user-partition> record with a
mount-point set to '/'. Raise &no-root-mount-point condition otherwise.
All the USER-PARTITIONS with a mount point and that will not be formatted have
a valid UUID. Raise a &cannot-read-uuid condition specifying the faulty
partition otherwise.
Return #t if all the statements are valid."
(define (check-root)
(let ((mount-points
(map user-partition-mount-point user-partitions)))
(or (member "/" mount-points)
(raise
(condition (&no-root-mount-point))))))
(define (check-uuid)
(let ((mount-partitions
(filter user-partition-mount-point user-partitions)))
(every
(lambda (user-partition)
(let ((file-name (user-partition-file-name user-partition))
(need-formatting?
(user-partition-need-formatting? user-partition)))
(or need-formatting?
(read-partition-uuid file-name)
(raise
(condition
(&cannot-read-uuid
(partition file-name)))))))
mount-partitions)))
(and (check-root)
(check-uuid)
#t))
(define (set-user-partitions-file-name user-partitions)
"Set the partition file-name of <user-partition> records in USER-PARTITIONS

View File

@ -298,6 +298,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/installers.scm \
%D%/packages/ipfs.scm \
%D%/packages/irc.scm \
%D%/packages/irods.scm \
%D%/packages/iso-codes.scm \
%D%/packages/jami.scm \
%D%/packages/java.scm \
@ -819,6 +820,7 @@ dist_patch_DATA = \
%D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
%D%/packages/patches/atlas-gfortran-compat.patch \
%D%/packages/patches/audacity-build-with-system-portaudio.patch \
@ -855,6 +857,7 @@ dist_patch_DATA = \
%D%/packages/patches/bc-fix-cross-compilation.patch \
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/bear-disable-preinstall-tests.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \
%D%/packages/patches/bsd-games-add-wrapper.patch \
@ -924,13 +927,15 @@ dist_patch_DATA = \
%D%/packages/patches/collectd-5.11.0-noinstallvar.patch \
%D%/packages/patches/combinatorial-blas-awpm.patch \
%D%/packages/patches/combinatorial-blas-io-fix.patch \
%D%/packages/patches/connman-CVE-2021-33833.patch \
%D%/packages/patches/coreutils-ls.patch \
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/curl-7.77-tls-priority-string.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
@ -966,6 +971,7 @@ dist_patch_DATA = \
%D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \
%D%/packages/patches/ecl-16-libffi.patch \
%D%/packages/patches/efibootmgr-remove-extra-decl.patch \
%D%/packages/patches/efivar-gcc-compat.patch \
%D%/packages/patches/eigen-remove-openmp-error-counting.patch \
%D%/packages/patches/eigen-stabilise-sparseqr-test.patch \
%D%/packages/patches/einstein-build.patch \
@ -1064,6 +1070,7 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-7-cross-environment-variables.patch \
%D%/packages/patches/gcc-7-cross-toolexeclibdir.patch \
%D%/packages/patches/gcc-8-cross-environment-variables.patch \
%D%/packages/patches/gcc-8-sort-libtool-find-output.patch \
%D%/packages/patches/gcc-8-strmov-store-file-names.patch \
%D%/packages/patches/gcc-9-asan-fix-limits-include.patch \
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \
@ -1145,10 +1152,8 @@ dist_patch_DATA = \
%D%/packages/patches/grocsvs-dont-use-admiral.patch \
%D%/packages/patches/gromacs-tinyxml2.patch \
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/grub-cross-system-i686.patch \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/gst-libav-64channels-stack-corruption.patch \
%D%/packages/patches/gst-plugins-bad-fix-overflow.patch \
@ -1195,6 +1200,7 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/hexchat-add-libera-chat.patch \
%D%/packages/patches/http-parser-CVE-2020-8287.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-cross.patch \
@ -1215,11 +1221,13 @@ dist_patch_DATA = \
%D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
%D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/ipxe-reproducible-geniso.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isc-dhcp-gcc-compat.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/json-c-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
@ -1244,6 +1252,7 @@ dist_patch_DATA = \
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
%D%/packages/patches/jfsutils-add-sysmacros.patch \
%D%/packages/patches/jfsutils-gcc-compat.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
@ -1297,6 +1306,7 @@ dist_patch_DATA = \
%D%/packages/patches/libbonobo-activation-test-race.patch \
%D%/packages/patches/libcaca-CVE-2021-3410-pt1.patch \
%D%/packages/patches/libcaca-CVE-2021-3410-pt2.patch \
%D%/packages/patches/libcacard-unknown-variable.patch \
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
%D%/packages/patches/libcanberra-wayland-crash.patch \
%D%/packages/patches/libcroco-CVE-2020-12825.patch \
@ -1431,6 +1441,9 @@ dist_patch_DATA = \
%D%/packages/patches/netsurf-system-utf8proc.patch \
%D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \
%D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \
%D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \
%D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/network-manager-plugin-path.patch \
@ -1523,6 +1536,7 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.patch \
%D%/packages/patches/plotutils-spline-test.patch \
%D%/packages/patches/polkit-CVE-2021-3560.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
@ -1593,6 +1607,8 @@ dist_patch_DATA = \
%D%/packages/patches/pypy3-7.3.1-fix-tests.patch \
%D%/packages/patches/qemu-build-info-manual.patch \
%D%/packages/patches/qemu-CVE-2021-20203.patch \
%D%/packages/patches/qemu-meson-compat.patch \
%D%/packages/patches/qemu-sphinx-compat.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qemu-glibc-2.30.patch \
%D%/packages/patches/qpdfview-qt515-compat.patch \
@ -1632,6 +1648,7 @@ dist_patch_DATA = \
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
@ -1700,6 +1717,7 @@ dist_patch_DATA = \
%D%/packages/patches/tipp10-qt5.patch \
%D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/tla2tools-build-xml.patch \
%D%/packages/patches/tor-fix-build-with-gcc-7.patch \
%D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transmission-honor-localedir.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \
@ -1792,7 +1810,7 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
%D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
%D%/packages/patches/xpra-4.0.1-systemd-run.patch \
%D%/packages/patches/xpra-4.2-systemd-run.patch \
%D%/packages/patches/xsane-fix-memory-leak.patch \
%D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \

View File

@ -690,13 +690,13 @@ memory, disks, network and processes.")
(define-public bpytop
(package
(name "bpytop")
(version "1.0.65")
(version "1.0.67")
(source
(origin
(method url-fetch)
(uri (pypi-uri "bpytop" version))
(sha256
(base32 "1vq51vg2ygk2p738zi21v5chn908d4bd5zkb8s4fbgf4zqp425ny"))))
(base32 "1fwmiwvs8ax9az3hbp1p79x6m3wq73pn3vkbhcg9jvps4wv8wcwb"))))
(build-system python-build-system)
(inputs
`(("python-psutil" ,python-psutil)))
@ -711,7 +711,7 @@ memory, disks, network and processes.")
(package-version python))
"/site-packages/bpytop-themes")))
(mkdir-p themes)
(copy-recursively "bpytop-themes" themes)))))))
(copy-recursively "themes" themes)))))))
(home-page
"https://github.com/aristocratos/bpytop")
(synopsis "Resource monitor")
@ -1167,6 +1167,7 @@ connection alive.")
(method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/dhcp/"
version "/dhcp-" version ".tar.gz"))
(patches (search-patches "isc-dhcp-gcc-compat.patch"))
(sha256
(base32
"06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh"))))
@ -1601,7 +1602,7 @@ system administrator.")
(define-public sudo
(package
(name "sudo")
(version "1.9.7")
(version "1.9.7p1")
(source (origin
(method url-fetch)
(uri
@ -1611,7 +1612,7 @@ system administrator.")
version ".tar.gz")))
(sha256
(base32
"0jg5vf6hc0j2bh4vqwsb4jybhryrsh4kz97r1salvf4rcqnprgib"))
"1kyqj45nmykwj38sc5kx7mi0vf6x637hzvbd1jv22lg5aks3251r"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1878,7 +1879,7 @@ command.")
(package
(inherit wpa-supplicant)
(name "wpa-supplicant-gui")
(inputs `(("qtbase" ,qtbase)
(inputs `(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
,@(package-inputs wpa-supplicant)))
(native-inputs
@ -3645,7 +3646,7 @@ hard-coded.")
(define-public thermald
(package
(name "thermald")
(version "2.4.5")
(version "2.4.6")
(source
(origin
(method git-fetch)
@ -3654,7 +3655,7 @@ hard-coded.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1y8s0cpjm01bz4isp3ksvnrbhpp3phivdhsb0w2kxhv09sfxkc5g"))))
(base32 "1lgaky8cmxbi17zpymy2v9wgknx1g92bq50j6kfpsm8qgb7djjb6"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

View File

@ -211,7 +211,7 @@ C/C++ programs to use its capabilities without restrictions or overhead.")
;; These are in 'requires' field of .pc files.
`(("glib" ,glib)
("gtk+" ,gtk+)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(synopsis "Bar code reader")
(description
"ZBar can read barcodes from various sources, such as video streams,

View File

@ -341,7 +341,7 @@ precision.")
(define-public giac
(package
(name "giac")
(version "1.7.0-11")
(version "1.7.0-13")
(source
(origin
(method url-fetch)
@ -353,7 +353,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz"))
(sha256
(base32 "12njy2akcc3sj1fmq52v19m4qd1ysrdcpc9a3zslkxsnidjix81m"))))
(base32 "14ywcnk7q27fpd7cr3wixhnd51qb2h2wl2kj6zs6bw2yi6dharfk"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)

View File

@ -450,7 +450,7 @@ language.")
qt)))
#t))))))
(inputs
`(("qt" ,qtbase)
`(("qt" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("libsndfile" ,libsndfile)))
(native-inputs
@ -480,7 +480,7 @@ waveform until they line up with the proper sounds.")
"0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtxmlpatterns" ,qtxmlpatterns)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)))

View File

@ -412,7 +412,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(base32 "04vg2asj9gygwnrs32scqc8192ln2lyqa9v7cjqk8zd4frkwszwp"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtlocation" ,qtlocation)
("qtmultimedia" ,qtmultimedia)
("qtscript" ,qtscript)
@ -421,7 +421,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(native-inputs
`(("gettext" ,gettext-minimal) ; xgettext is used at compile time
("perl" ,perl) ; for pod2man
("qtbase" ,qtbase) ; Qt MOC is needed at compile time
("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time
("qttools" ,qttools)))
(arguments
`(#:test-target "test"

View File

@ -21,7 +21,7 @@
;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Christopher Lemmer Webber <cwebber@dustycloud.org>
@ -78,6 +78,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnunet) ; libmicrohttpd
#:use-module (gnu packages gperf)
#:use-module (gnu packages groff)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
@ -107,6 +108,7 @@
#:use-module (gnu packages serialization)
#:use-module (gnu packages telephony)
#:use-module (gnu packages linphone)
#:use-module (gnu packages linux)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages video)
@ -495,7 +497,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
("jack" ,jack-1)
("ladspa" ,ladspa)
("liblo" ,liblo)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
@ -2147,7 +2149,7 @@ synchronous execution of all clients, and low latency operation.")
("gtk2" ,gtk+-2)
("gtk3" ,gtk+)
("gtkmm" ,gtkmm-2)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("jack" ,jack-1)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -2739,7 +2741,7 @@ different audio devices such as ALSA or PulseAudio.")
`(("jack" ,jack-1)
("alsa-lib" ,alsa-lib)
("portaudio" ,portaudio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(native-inputs
`(("pkg-config" ,pkg-config)
@ -2773,11 +2775,11 @@ into various outputs and to start, stop and configure jackd")
(string-append "PREFIX="
(assoc-ref outputs "out"))))))))
(native-inputs
`(("qtbase" ,qtbase))) ; for qmake
`(("qtbase" ,qtbase-5))) ; for qmake
(inputs
`(("jack" ,jack-1)
("libsndfile" ,libsndfile)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://sourceforge.net/projects/qjackrcd/")
(synopsis "Stereo audio recorder for JACK")
(description "QJackRcd is a simple graphical stereo recorder for JACK
@ -2886,7 +2888,7 @@ link REQUIRED)"))
("boost" ,boost)
("boost-sync" ,boost-sync)
("yaml-cpp" ,yaml-cpp)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("qtwebchannel" ,qtwebchannel)
@ -3088,7 +3090,7 @@ the Turtle syntax.")
`(("lv2" ,lv2)
("gtk+" ,gtk+-2)
("gtk+" ,gtk+)
("qt" ,qtbase)))
("qt" ,qtbase-5)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://drobilla.net/software/suil/")
@ -3564,7 +3566,7 @@ interface.")
("pkg-config" ,pkg-config)))
(inputs
`(("fluidsynth" ,fluidsynth)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://qsynth.sourceforge.io")
(synopsis "Graphical user interface for FluidSynth")
@ -4740,7 +4742,7 @@ as is the case with audio plugins.")
;; (ModuleNotFoundError: No module named 'PyQt5')
("python-wrapper" ,python-wrapper)
("libx11" ,libx11)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zlib" ,zlib)
;; For WRAP-SCRIPT above.
@ -5098,7 +5100,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
`(("catch" ,catch-framework)
("python" ,python) ;for running tests
("portaudio" ,portaudio) ;for portaudio examples
("qtbase" ,qtbase) ;for Qt examples
("qtbase" ,qtbase-5) ;for Qt examples
("qtdeclarative" ,qtdeclarative)
("qttools" ,qttools)))
(inputs
@ -5225,3 +5227,50 @@ while still staying in time.")
(description "Butt is a tool to stream audio to a ShoutCast or
Icecast server.")
(license license:gpl2+)))
(define-public siggen
(package
(name "siggen")
(version "2.3.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bleskodev/siggen")
(commit "a407611b59d59c7770bbe62ba9b8e9a948cf3210")))
(file-name (git-file-name name version))
(sha256
(base32
"0szhgfd9kddr6qsz0imp0x66jjn6ry236f35vjl82ivc1v2bllcb"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "INSDIR=" %output "/bin")
(string-append "MANDIR=" %output "/share/man"))
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
;; Patch misc.c to prevent a segfault.
(add-after 'unpack 'patch-segfault
(lambda _
(substitute* "misc.c"
(("#include <stdio.h>\n" all)
(string-append all "#include <string.h>\n")))))
(delete 'configure)
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each (lambda (dir)
(mkdir-p (string-append out dir)))
(list "/bin" "/share/man/man1" "/share/man/man5"))
(apply invoke "make" "sysinstall" make-flags)))))))
(inputs
`(("ncurses" ,ncurses)))
(native-inputs
`(("groff" ,groff-minimal) ; for nroff
("util-linux" ,util-linux))) ; for col
(home-page "https://github.com/bleskodev/siggen")
(synopsis "Signal generation tools")
(description "siggen is a set of tools for imitating a laboratory signal
generator, generating audio signals out of Linux's /dev/dsp audio
device. There is support for mono and/or stereo and 8 or 16 bit samples.")
(license license:gpl2)))

View File

@ -1946,13 +1946,13 @@ microarrays.")
(define-public r-annotationdbi
(package
(name "r-annotationdbi")
(version "1.54.0")
(version "1.54.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationDbi" version))
(sha256
(base32
"117zh7iqa6phsrxrkv45kxraamm3vbfz5i1a8vkhyalhdbs5ssph"))))
"0fcammls431pgmp47r85k0zh3bz42bajbqdmafd31kpqncc1ijal"))))
(properties
`((upstream-name . "AnnotationDbi")))
(build-system r-build-system)
@ -2154,13 +2154,13 @@ on Bioconductor or which replace R functions.")
(define-public r-biomart
(package
(name "r-biomart")
(version "2.48.0")
(version "2.48.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "biomaRt" version))
(sha256
(base32
"1h8lzd63qvy1y75nlnhazpkyhl6g1hz80baqg20gpxbv38wkyf55"))))
"1a1lh0z1vk1q3wil85pi7v0f9miv070sjkbnwbw390zvncwakqxa"))))
(properties
`((upstream-name . "biomaRt")))
(build-system r-build-system)
@ -2172,7 +2172,8 @@ on Bioconductor or which replace R functions.")
("r-progress" ,r-progress)
("r-rappdirs" ,r-rappdirs)
("r-stringr" ,r-stringr)
("r-xml" ,r-xml)))
("r-xml" ,r-xml)
("r-xml2" ,r-xml2)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/biomaRt")
@ -2246,13 +2247,13 @@ objects.")
(define-public r-biostrings
(package
(name "r-biostrings")
(version "2.60.0")
(version "2.60.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Biostrings" version))
(sha256
(base32
"0xidh6wp0l47g1j9x8d4fs91ky6pi5nzf85ry801gqd2gqajh2zy"))))
"1a2vq4rram7chnccx0piccgi0mlblmjh26y51bch86lxr7qwlr22"))))
(properties
`((upstream-name . "Biostrings")))
(build-system r-build-system)
@ -4764,14 +4765,14 @@ signal in the input, that lead to spurious peaks during peak calling.")
(define-public r-diffbind
(package
(name "r-diffbind")
(version "3.2.1")
(version "3.2.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DiffBind" version))
(sha256
(base32
"12x80z1a8gihqrlaxmzk80nc5700la72lival58s4wjv4k2lhyf3"))))
"037z4mm8q5c50lwf63l1gmksd9fzfmyyp259jncpsxa3almf5jgh"))))
(properties `((upstream-name . "DiffBind")))
(build-system r-build-system)
(propagated-inputs
@ -5779,14 +5780,14 @@ missing values and weighting where appropriate.")
(define-public r-biocsingular
(package
(name "r-biocsingular")
(version "1.8.0")
(version "1.8.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BiocSingular" version))
(sha256
(base32
"1l0xgc3z5ci5sid198nsgg0k5i40rh877jybzmy0ify7rzv8carp"))))
"16gkwq8fb8jdchpnlzq2hz3i74a6pzbnc1bf93282h11mp7qr58l"))))
(properties `((upstream-name . "BiocSingular")))
(build-system r-build-system)
(propagated-inputs
@ -7162,14 +7163,14 @@ data.")
(define-public r-enrichplot
(package
(name "r-enrichplot")
(version "1.12.0")
(version "1.12.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "enrichplot" version))
(sha256
(base32
"0nvjwwzpmhsfkxqrn8v1a1wcrvr3xl1wn5dy89vsrdydyv31gdc6"))))
"116mwmpr06f4z60avdsfzdalbxn4119dbzk3jz1q5fp81qvw164d"))))
(build-system r-build-system)
(propagated-inputs
`(("r-cowplot" ,r-cowplot)
@ -9948,6 +9949,32 @@ each motif and gene-set, RcisTarget predicts the candidate target genes (i.e.
genes in the gene-set that are ranked above the leading edge).")
(license license:gpl3)))
(define-public r-chicago
(package
(name "r-chicago")
(version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Chicago" version))
(sha256
(base32
"0dkwy6pfvzd7g4qmhjl24ypn92l78w1zy0ajhcxgg39f7zsq883x"))))
(properties `((upstream-name . "Chicago")))
(build-system r-build-system)
(propagated-inputs
`(("r-data-table" ,r-data-table)
("r-delaporte" ,r-delaporte)
("r-hmisc" ,r-hmisc)
("r-mass" ,r-mass)
("r-matrixstats" ,r-matrixstats)))
(native-inputs `(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/Chicago")
(synopsis "Capture Hi-C analysis of genomic organization")
(description
"This package provides a pipeline for analysing Capture Hi-C data.")
(license license:artistic2.0)))
(define-public r-cicero
(package
(name "r-cicero")
@ -11389,13 +11416,13 @@ different graph related packages produced by Bioconductor.")
(define-public r-biocstyle
(package
(name "r-biocstyle")
(version "2.20.0")
(version "2.20.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocStyle" version))
(sha256
(base32
"062zhy33a2c70ibqghnjxcys0wbqc998aza8nnygk4zmpd4iyy1z"))))
"0gkprmilj6lwnyghpyfzkwmfl3gva75lgpn4ck8jgikqac8jcq0x"))))
(properties
`((upstream-name . "BiocStyle")))
(build-system r-build-system)
@ -12207,14 +12234,14 @@ block processing.")
(define-public r-rhdf5lib
(package
(name "r-rhdf5lib")
(version "1.14.0")
(version "1.14.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rhdf5lib" version))
(sha256
(base32
"1ypqmd4nz4hxlb2qsay7f5784dqdjhc3b19pckzkhb65bfycdn87"))
"0ld1p3rxsx47bdq2wz9110zvwhabsnn92wkhz8x7xzfr01cc9glm"))
(modules '((guix build utils)))
(snippet
'(begin
@ -12560,13 +12587,13 @@ of other packages.")
(define-public r-scater
(package
(name "r-scater")
(version "1.20.0")
(version "1.20.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "scater" version))
(sha256
(base32
"0rppbd0mfyi41wb56i499mk3nj2ljhgnv3bv0k2p31bngvmb03j5"))))
"1046fgf93dda3y2z5ilrjdczz7klj67ag63p4p1h03965wpj9vfn"))))
(build-system r-build-system)
(propagated-inputs
`(("r-beachmat" ,r-beachmat)
@ -13097,14 +13124,14 @@ family of feature/genome hypotheses.")
(define-public r-gviz
(package
(name "r-gviz")
(version "1.36.0")
(version "1.36.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Gviz" version))
(sha256
(base32
"19vjf4sdz5sxbcdilsqx7m57fq5a8xnxjf354zx2l5mgjrkzkk3h"))))
"1mljj70pg36dgrqhdfj643p39wbps66zz23xw6km150lq6fpgpg5"))))
(properties `((upstream-name . "Gviz")))
(build-system r-build-system)
(propagated-inputs

View File

@ -60,6 +60,7 @@
#:use-module (guix build-system trivial)
#:use-module (guix deprecation)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages algebra)
@ -106,6 +107,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages logging)
#:use-module (gnu packages lsof)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
@ -125,6 +127,7 @@
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
@ -4671,7 +4674,7 @@ experiments and provide highly stable thresholds based on reproducibility.")
(define-public jellyfish
(package
(name "jellyfish")
(version "2.2.10")
(version "2.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/gmarcais/Jellyfish/"
@ -4679,14 +4682,15 @@ experiments and provide highly stable thresholds based on reproducibility.")
"/jellyfish-" version ".tar.gz"))
(sha256
(base32
"1k4pc3fvv6w1km2yph4m5sd78fbxp21d6xyzgmy0gjihzc6mb249"))))
"0npa62wzasdibas5zp3n8j3armsci4kyvh0jw7jr0am4gg7vg5g1"))))
(build-system gnu-build-system)
(outputs '("out" ;for library
"ruby" ;for Ruby bindings
"python")) ;for Python bindings
(arguments
`(#:configure-flags
(list (string-append "--enable-ruby-binding="
(list "--without-sse" ; configure script probes for CPU features when SSE is enabled.
(string-append "--enable-ruby-binding="
(assoc-ref %outputs "ruby"))
(string-append "--enable-python-binding="
(assoc-ref %outputs "python")))
@ -4696,13 +4700,12 @@ experiments and provide highly stable thresholds based on reproducibility.")
(lambda _
;; generator_manager.hpp either uses /bin/sh or $SHELL
;; to run tests.
(setenv "SHELL" (which "bash"))
#t)))))
(setenv "SHELL" (which "bash")))))))
(native-inputs
`(("bc" ,bc)
("time" ,time)
("ruby" ,ruby)
("python" ,python-2)
("python" ,python-wrapper)
("pkg-config" ,pkg-config)))
(inputs
`(("htslib" ,htslib)))
@ -4718,9 +4721,8 @@ command, or queried for specific k-mers with @code{jellyfish query}.")
(home-page "http://www.genome.umd.edu/jellyfish.html")
;; JELLYFISH seems to be 64-bit only.
(supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux"))
;; The combined work is published under the GPLv3 or later. Individual
;; files such as lib/jsoncpp.cpp are released under the Expat license.
(license (list license:gpl3+ license:expat))))
;; One of these licenses may be picked
(license (list license:gpl3+ license:bsd-3))))
(define-public khmer
(package
@ -4833,7 +4835,7 @@ experiments.")
(define-public macs
(package
(name "macs")
(version "2.2.6")
(version "2.2.7.1")
(source (origin
;; The PyPi tarball does not contain tests.
(method git-fetch)
@ -4843,7 +4845,7 @@ experiments.")
(file-name (git-file-name name version))
(sha256
(base32
"1c5gxr0mk6hkd4vclf0k00wvyvzw2vrmk52c85338p7aqjwg6n15"))
"08zsgh65xbpv1md2s3wqmrk9g2mz6izmn59ryw5lbac54120p291"))
(modules '((guix build utils)))
;; Remove files generated by Cython
(snippet
@ -4854,8 +4856,7 @@ experiments.")
(when (file-exists? generated-file)
(delete-file generated-file))))
(find-files "." "\\.pyx$"))
(delete-file "MACS2/IO/CallPeakUnitPrecompiled.c")
#t))))
(delete-file "MACS2/IO/CallPeakUnitPrecompiled.c")))))
(build-system python-build-system)
(arguments
`(#:phases
@ -4864,8 +4865,7 @@ experiments.")
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-v"))
#t)))))
(invoke "pytest" "-v")))))))
(inputs
`(("python-numpy" ,python-numpy)))
(native-inputs
@ -8355,41 +8355,57 @@ replacement for strverscmp.")
(define-public multiqc
(package
(name "multiqc")
(version "1.5")
(version "1.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "multiqc" version))
(sha256
(base32
"02iihfl0w0hpnr4pa0sbd1y9qxrg3ycyhjp5lidkcrqh1lmzs3zy"))))
"0y9sgjca3bp0kk3ngry4zf4q2diyzp5bvzsx5l23nsysfbfkigm4"))))
(build-system python-build-system)
(propagated-inputs
`(("python-jinja2" ,python-jinja2)
("python-simplejson" ,python-simplejson)
("python-pyyaml" ,python-pyyaml)
("python-click" ,python-click)
("python-spectra" ,python-spectra)
("python-requests" ,python-requests)
("python-markdown" ,python-markdown)
("python-lzstring" ,python-lzstring)
("python-matplotlib" ,python-matplotlib)
("python-numpy" ,python-numpy)
;; MultQC checks for the presence of nose at runtime.
("python-nose" ,python-nose)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
;; MultiQC 1.5 requires a version of python-matplotlib older
;; than the one in Guix, but should work fine with 2.2.2.
;; See <https://github.com/ewels/MultiQC/issues/725> and
;; <https://github.com/ewels/MultiQC/issues/732> for details.
(("['\"]matplotlib.*?['\"]")
"'matplotlib'"))
#t)))))
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(setenv "HOME" "/tmp")
(let ((here (getcwd)))
(copy-recursively (assoc-ref inputs "tests") "/tmp/tests")
;; ModuleNotFoundError: No module named 'multiqc.modules.ccs'
(delete-file "/tmp/tests/unit_tests/test_ccs.py")
(with-directory-excursion "/tmp/tests"
(setenv "PYTHONPATH" (string-append here ":" (getenv "PYTHONPATH")))
(invoke "python" "-munittest" "discover")))))))))
(propagated-inputs
`(("python-click" ,python-click)
("python-coloredlogs" ,python-coloredlogs)
("python-future" ,python-future)
("python-jinja2" ,python-jinja2)
("python-lzstring" ,python-lzstring)
("python-markdown" ,python-markdown)
("python-matplotlib" ,python-matplotlib)
("python-networkx" ,python-networkx)
("python-numpy" ,python-numpy)
("python-pyyaml" ,python-pyyaml)
("python-requests" ,python-requests)
("python-rich" ,python-rich)
("python-simplejson" ,python-simplejson)
("python-spectra" ,python-spectra)))
(native-inputs
`(("python-pytest" ,python-pytest)
("tests"
,(let ((commit "02272d48a382beb27489fcf9e6308a0407dc3c2e"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ewels/MultiQC_TestData")
(commit commit)))
(file-name (git-file-name "multiqc-test-data" commit))
(sha256
(base32
"1bha64wanrigczw4yn81din56396n61j5gqdrkslhslmskcafi91")))))))
(home-page "https://multiqc.info")
(synopsis "Aggregate bioinformatics analysis reports")
(description
@ -9354,19 +9370,19 @@ accurate as existing quantification tools.")
(define-public libgff
(package
(name "libgff")
(version "1.0")
(version "2.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Kingsford-Group/libgff")
(url "https://github.com/COMBINE-lab/libgff")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0n6vfjnq7a2mianipscbshrvbncss8z4zkgkbjw754p9043nfkps"))))
"0ds9r22y8bl1rj7bhl0003kgmm6aam7g8l41mnjfrzw15d9zf9k4"))))
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; no tests included
(home-page "https://github.com/Kingsford-Group/libgff")
(home-page "https://github.com/COMBINE-lab/libgff")
(synopsis "Parser library for reading/writing GFF files")
(description "This is a simple \"libraryfication\" of the GFF/GTF parsing
code that is used in the Cufflinks codebase. The goal of this library is to
@ -9568,7 +9584,7 @@ The following file formats are supported:
(define-public salmon
(package
(name "salmon")
(version "0.13.1")
(version "1.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -9577,124 +9593,113 @@ The following file formats are supported:
(file-name (git-file-name name version))
(sha256
(base32
"1i2z4aivicmiixdz9bxalp7vmfzi3k92fxa63iqa8kgvfw5a4aq5"))
"1di7y2s8cjr9480lngcmaz3wcabc1lpkyanzbhir1nkhcjmj70h4"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled headers for eigen3.
(delete-file-recursively "include/eigen3/")
#t))))
;; Delete bundled headers for eigen3.
'(delete-file-recursively "include/eigen3/"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DBOOST_INCLUDEDIR="
(assoc-ref %build-inputs "boost")
"/include/")
(string-append "-DBOOST_LIBRARYDIR="
(assoc-ref %build-inputs "boost")
"/lib/")
(string-append "-DBoost_LIBRARIES="
"-lboost_iostreams "
"-lboost_filesystem "
"-lboost_system "
"-lboost_thread "
"-lboost_timer "
"-lboost_chrono "
"-lboost_program_options")
"-DBoost_FOUND=TRUE"
"-DTBB_LIBRARIES=tbb tbbmalloc"
;; Don't download RapMap---we already have it!
"-DFETCHED_RAPMAP=1")
(list (string-append "-Dlibgff_DIR="
(assoc-ref %build-inputs "libgff") "/lib")
"-Dlibgff_FOUND=TRUE"
"-DTBB_FOUND=TRUE"
"-DTBB_VERSION=2020.3"
"-DTBB_LIBRARIES=tbb -ltbbmalloc"
"-DFETCHED_PUFFERFISH=TRUE"
"-DUSE_SHARED_LIBS=TRUE")
#:phases
(modify-phases %standard-phases
;; Boost cannot be found, even though it's right there.
(add-after 'unpack 'do-not-look-for-boost
(add-after 'unpack 'prepare-pufferfish
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("find_package\\(Boost 1\\.59\\.0") "#"))
#t))
(copy-recursively (assoc-ref inputs "pufferfish")
"external/pufferfish")
;; This test isn't working correctly, so compilation aborts.
(substitute* "external/pufferfish/include/string_view.hpp"
(("#if __has_include\\(<string_view>\\)")
"#if 0"))
(let ((headers "external/install/pufferfish/include/pufferfish")
(source "external/install/src/pufferfish"))
(mkdir-p headers)
(mkdir-p source)
(for-each (lambda (file)
(install-file (string-append "external/pufferfish/include/" file)
headers))
(list "ProgOpts.hpp" "BooPHF.hpp" "SpinLock.hpp"
"Kmer.hpp" "CanonicalKmer.hpp" "string_view.hpp"
"CanonicalKmerIterator.hpp"
"PufferfishBaseIndex.hpp"
"PufferfishIndex.hpp"
"PufferfishSparseIndex.hpp"
"PufferfishLossyIndex.hpp"
"PufferfishTypes.hpp"
"rank9b.hpp" "rank9sel.hpp" "macros.hpp"
"select.hpp" "Util.hpp"
"PairedAlignmentFormatter.hpp"
"SelectiveAlignmentUtils.hpp"
"PuffAligner.hpp" "MemCollector.hpp"
"MemChainer.hpp" "CommonTypes.hpp"
"SAMWriter.hpp" "PufferfishConfig.hpp"
"BulkChunk.hpp" "BinWriter.hpp"))
(for-each (lambda (dir)
(copy-recursively
(string-append "external/pufferfish/include/" dir)
(string-append headers "/" dir)))
(list "libdivide"
"ksw2pp"
"compact_vector"
"metro"
"chobo"
"sparsepp"
"simde"
"tsl"))
(copy-recursively
(string-append "external/pufferfish/src/metro/")
(string-append source "/metro"))
(install-file
(string-append "external/pufferfish/src/rank9b.cpp")
source)
;; Do not complain about not having built libtbb
(substitute* "external/pufferfish/external/twopaco/CMakeLists.txt"
(("add_dependencies.*") "")))))
(add-after 'unpack 'do-not-phone-home
(lambda _
(substitute* "src/Salmon.cpp"
(("getVersionMessage\\(\\)") "\"\""))
#t))
(add-after 'unpack 'prepare-rapmap
(lambda* (#:key inputs #:allow-other-keys)
(let ((src "external/install/src/rapmap/")
(include "external/install/include/rapmap/")
(rapmap (assoc-ref inputs "rapmap")))
(mkdir-p src)
(mkdir-p include)
(copy-recursively (string-append rapmap "/src") src)
(copy-recursively (string-append rapmap "/include") include)
(for-each delete-file '("external/install/include/rapmap/xxhash.h"
"external/install/include/rapmap/FastxParser.hpp"
"external/install/include/rapmap/concurrentqueue.h"
"external/install/include/rapmap/FastxParserThreadUtils.hpp"
"external/install/src/rapmap/FastxParser.cpp"
"external/install/src/rapmap/xxhash.c"))
(delete-file-recursively "external/install/include/rapmap/spdlog"))
#t))
(("getVersionMessage\\(\\)") "\"\""))))
(add-after 'unpack 'use-system-libraries
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
;; Don't prefer static libs
(("SET\\(CMAKE_FIND_LIBRARY_SUFFIXES.*") "")
(("set\\(TBB_LIBRARIES") "message(")
;; Don't download anything
(("DOWNLOAD_COMMAND") "DOWNLOAD_COMMAND echo")
(("externalproject_add\\(libcereal") "message(")
(("externalproject_add\\(libgff") "message(")
(("externalproject_add\\(libtbb") "message(")
(("externalproject_add\\(libdivsufsort") "message(")
(("externalproject_add\\(libstadenio") "message(")
(("externalproject_add_step\\(") "message("))
(substitute* "src/CMakeLists.txt"
(("add_dependencies") "#")
(("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libstaden-read.a")
(string-append (assoc-ref inputs "libstadenio-for-salmon")
"/lib/libstaden-read.so"))
(("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libdivsufsort.a")
(string-append (assoc-ref inputs "libdivsufsort")
"/lib/libdivsufsort.so"))
(("\\$\\{GAT_SOURCE_DIR\\}/external/install/lib/libdivsufsort64.a")
(string-append (assoc-ref inputs "libdivsufsort")
"/lib/libdivsufsort64.so"))
(("lib/libdivsufsort.a") "/lib/libdivsufsort.so"))
;; Ensure that all headers can be found
(setenv "CPLUS_INCLUDE_PATH"
(string-append (or (getenv "CPLUS_INCLUDE_PATH") "")
":"
(getcwd) "/external/install/pufferfish/include:"
(assoc-ref inputs "eigen")
"/include/eigen3"))
#t))
;; CMAKE_INSTALL_PREFIX does not exist when the tests are
;; run. It only exists after the install phase.
(add-after 'unpack 'fix-tests
"/include/eigen3"))))
(add-after 'unpack 'fix-error-message-in-tests
(lambda _
(substitute* "src/CMakeLists.txt"
(("DTOPLEVEL_DIR=\\$\\{CMAKE_INSTALL_PREFIX")
"DTOPLEVEL_DIR=${GAT_SOURCE_DIR"))
#t)))))
(substitute* "cmake/TestSalmonQuasi.cmake"
(("SALMON_QUASI_INDEX_COMMAND")
"SALMON_QUASI_INDEX_CMD")))))))
(inputs
`(("boost" ,boost)
("bzip2" ,bzip2)
("cereal" ,cereal)
("curl" ,curl)
("eigen" ,eigen)
("rapmap" ,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/COMBINE-lab/RapMap")
(commit (string-append "salmon-v" version))))
(file-name (string-append "rapmap-salmon-v" version "-checkout"))
(sha256
(base32
"1biplxf0csc7a8h1wf219b0vmjkvw6wk2zylhdklb577kgmihdms"))))
("jemalloc" ,jemalloc)
("libgff" ,libgff)
("pufferfish" ,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/COMBINE-lab/pufferfish")
(commit (string-append "salmon-v" version))))
(file-name (git-file-name "pufferfish" version))
(sha256
(base32
"0qb4a2nl1d59qasr17sslgxnkjd5kbk5mns4cjshrmsvkrqp995n"))))
("tbb" ,tbb)
("libdivsufsort" ,libdivsufsort)
("libstadenio-for-salmon" ,libstadenio-for-salmon)
("xz" ,xz)
("zlib" ,zlib)))
@ -10293,7 +10298,7 @@ once. This package provides tools to perform Drop-seq analyses.")
(define-public pigx-rnaseq
(package
(name "pigx-rnaseq")
(version "0.0.13")
(version "0.0.17")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/"
@ -10301,18 +10306,26 @@ once. This package provides tools to perform Drop-seq analyses.")
"/pigx_rnaseq-" version ".tar.gz"))
(sha256
(base32
"0z9zid2c8q16lfzlnjd63nparknhv31qgv4h79algmvhkakm2pgk"))))
"0k9zj50bij3sjwq08v8l8waddcx8k66m3vdq8mx5vc23p19qz42s"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f ; not supported
#:phases
(modify-phases %standard-phases
;; "test.sh" runs STAR, which requires excessive amounts of memory.
;; "test.sh" runs the whole pipeline, which takes a long time and
;; might fail due to OOM. The MultiQC is also resource intensive.
(add-after 'unpack 'disable-resource-intensive-test
(lambda _
(substitute* "Makefile.in"
(("^ tests/test_multiqc/test.sh") "")
(("^ test.sh") "")))))))
(("^ test.sh") ""))))
(add-before 'check 'set-timezone
;; The readr package is picky about timezones.
(lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC+1")
(setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo")))))))
(inputs
`(("coreutils" ,coreutils)
("sed" ,sed)
@ -10327,8 +10340,9 @@ once. This package provides tools to perform Drop-seq analyses.")
("r-minimal" ,r-minimal)
("r-rmarkdown" ,r-rmarkdown)
("r-ggplot2" ,r-ggplot2)
("r-ggpubr" ,r-ggpubr)
("r-ggrepel" ,r-ggrepel)
("r-gprofiler" ,r-gprofiler)
("r-gprofiler2" ,r-gprofiler2)
("r-deseq2" ,r-deseq2)
("r-dt" ,r-dt)
("r-knitr" ,r-knitr)
@ -10346,7 +10360,10 @@ once. This package provides tools to perform Drop-seq analyses.")
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)
("python-wrapper" ,python-wrapper)
("python-deeptools" ,python-deeptools)
("python-pyyaml" ,python-pyyaml)))
(native-inputs
`(("tzdata" ,tzdata)))
(home-page "https://bioinformatics.mdc-berlin.de/pigx/")
(synopsis "Analysis pipeline for RNA sequencing experiments")
(description "PiGX RNAseq is an analysis pipeline for preprocessing and
@ -10437,7 +10454,7 @@ in an easily configurable manner.")
(define-public pigx-bsseq
(package
(name "pigx-bsseq")
(version "0.1.3")
(version "0.1.5")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_bsseq/"
@ -10445,7 +10462,7 @@ in an easily configurable manner.")
"/pigx_bsseq-" version ".tar.gz"))
(sha256
(base32
"0blm0bl5z3ng01n7hh2ffk4rkzvf7vb3nm0crgdzrxr5cahxdxql"))))
"05al5dacfp1vf1x3cq20jhd6w4xj5vaxslzaka6yrpg0av8sh3k3"))))
(build-system gnu-build-system)
(arguments
`(;; TODO: tests currently require 12+GB of RAM. See
@ -10459,8 +10476,7 @@ in an easily configurable manner.")
(setenv "TZ" "UTC+1")
(setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo"))
#t)))))
"/share/zoneinfo")))))))
(native-inputs
`(("tzdata" ,tzdata)))
(inputs
@ -10573,7 +10589,7 @@ based methods.")
(define-public pigx-sars-cov2-ww
(package
(name "pigx-sars-cov2-ww")
(version "0.0.1")
(version "0.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_sarscov2_ww/"
@ -10581,7 +10597,7 @@ based methods.")
"/pigx_sars-cov2-ww-" version ".tar.gz"))
(sha256
(base32
"1h1rfl3dyf7pid74xxgiyr4x1l5yj000wcz5crm1bdbaz8p7b7ic"))))
"0yrbza7lbzijjc8ifk06b646n959a4k7id94x3ndz795892f64l0"))))
(build-system gnu-build-system)
(inputs
`(("bash-minimal" ,bash-minimal)
@ -10608,7 +10624,8 @@ based methods.")
("r-stringr" ,r-stringr)
("r-tidyr" ,r-tidyr)
("samtools" ,samtools)
("snakemake" ,snakemake)))
("snakemake" ,snakemake)
("wget" ,wget)))
(home-page "https://bioinformatics.mdc-berlin.de/pigx/")
(synopsis "Analysis pipeline for wastewater sequencing")
(description "PiGx SARS-CoV-2 is a pipeline for analysing data from
@ -10859,6 +10876,28 @@ cases include:
@end enumerate\n")
(license license:expat)))
(define-public python-mappy
(package
(name "python-mappy")
(version "2.18")
(source (origin
(method url-fetch)
(uri (pypi-uri "mappy" version))
(sha256
(base32
"1a05p7rkmxa6qhm108na8flzj2v45jab06drk59kzk1ip2sgvzqq"))))
(build-system python-build-system)
(native-inputs
`(("python-cython" ,python-cython)))
(inputs
`(("zlib" ,zlib)))
(home-page "https://github.com/lh3/minimap2")
(synopsis "Python binding for minimap2")
(description "This package provides a convenient interface to minimap2,
a fast and accurate C program to align genomic and transcribe nucleotide
sequences.")
(license license:expat)))
(define-public miniasm
(package
(name "miniasm")
@ -10932,7 +10971,7 @@ Thus the per-base error rate is similar to the raw input reads.")
(install-file "Bandage" (string-append out "/bin"))
#t))))))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(native-inputs
`(("imagemagick" ,imagemagick)))
@ -11723,29 +11762,26 @@ such as Hi-C contact matrices.")
(define-public python-hicmatrix
(package
(name "python-hicmatrix")
(version "12")
(source
(origin
;; Version 12 is not available on pypi.
(method git-fetch)
(uri (git-reference
(url "https://github.com/deeptools/HiCMatrix")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1xhdyx16f3brgxgxybixdi64ki8nbbkq5vk4h9ahi11pzpjfn1pj"))))
(version "15")
(source
(origin
;;Pypi sources do not contain any test
(method git-fetch)
(uri (git-reference
(url "https://github.com/deeptools/HiCMatrix")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1dshjxgb16sdfg9k1bhw2yhyngac04k4ca7aqy8g3i3pprr068r5"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* '("requirements.txt"
"setup.py")
(("cooler *=+ *0.8.5")
"cooler==0.8.*"))
#t)))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "-m" "pytest" "-v")))))))
(propagated-inputs
`(("python-cooler" ,python-cooler)
("python-intervaltree" ,python-intervaltree)
@ -11753,6 +11789,8 @@ such as Hi-C contact matrices.")
("python-pandas" ,python-pandas)
("python-scipy" ,python-scipy)
("python-tables" ,python-tables)))
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/deeptools/HiCMatrix/")
(synopsis "HiCMatrix class for HiCExplorer and pyGenomeTracks")
(description
@ -11859,18 +11897,35 @@ pyGenomeTracks can make plots with or without Hi-C data.")
(define-public python-hic2cool
(package
(name "python-hic2cool")
(version "0.4.2")
(version "0.8.3")
;; pypi sources do not contain the test_data directory and no test can be
;; run
(source
(origin
(method url-fetch)
(uri (pypi-uri "hic2cool" version))
(method git-fetch)
(uri (git-reference
(url "https://github.com/4dn-dcic/hic2cool")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0xy6mhfns2lzib1kcr6419jjp6pmh0qx8z8na55lmiwn0ds8q9cl"))))
"0dlnf0qfcp4jrc1nyya32a035c13xicyq16bwfnwhbb9s47mz7gl"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; no tests included
(arguments
`(#:phases
(modify-phases %standard-phases
;; Two of the test-data files need to be writable.
(add-after 'unpack 'make-test-data-writable
(lambda _
(for-each make-file-writable
(list "test_data/hic2cool_0.4.2_single_res.cool"
"test_data/hic2cool_0.7.0_multi_res.mcool")))))))
(propagated-inputs
`(("python-cooler" ,python-cooler)))
`(("python-cooler" ,python-cooler)
("python-h5py" ,python-h5py)
("python-numpy" ,python-numpy)
("python-pandas" ,python-pandas)
("python-scipy" ,python-scipy)))
(home-page "https://github.com/4dn-dcic/hic2cool")
(synopsis "Converter for .hic and .cool files")
(description
@ -14064,6 +14119,62 @@ usually ignored by other methods or only used for filtering.")
coordinates between different assemblies.")
(license license:expat)))
(define-public python-cgatcore
(package
(name "python-cgatcore")
(version "0.6.7")
;; The version of pypi does not include test data.
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cgat-developers/cgat-core")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"17vk88v1bx7x02ibzkc9i7ir4b5p1hcjr38jpsfzyzxr68352d5k"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-references
(lambda _
(substitute* "cgatcore/pipeline/execution.py"
(("#!/bin/bash") (string-append "#!" (which "bash")))
(("executable=\"/bin/bash\"")
(string-append "executable=\"" (which "bash") "\""))
(("\\\\time") (which "time")))))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
;; Requires network access
(delete-file "tests/test_pipeline_execution.py")
(invoke "python" "-m" "pytest" "-v")))))))
(native-inputs
`(("python-pytest" ,python-pytest)
("lsof" ,lsof)
("hostname" ,inetutils)
("openssl" ,openssl)))
(inputs
`(("time" ,time)))
(propagated-inputs
`(("python-apsw" ,python-apsw)
("python-gevent" ,python-gevent)
("python-pandas" ,python-pandas)
("python-paramiko" ,python-paramiko)
("python-pyyaml" ,python-pyyaml)
("python-ruffus" ,python-ruffus)
("python-sqlalchemy" ,python-sqlalchemy)))
(home-page "https://github.com/cgat-developers/cgat-core")
(synopsis "Computational genomics analysis toolkit")
(description
"CGAT-core is a set of libraries and helper functions used to enable
researchers to design and build computational workflows for the analysis of
large-scale data-analysis.")
(license license:expat)))
(define-public ensembl-vep
(let* ((api-version "103")
(api-module

View File

@ -459,7 +459,7 @@ desktops.")
("libtorrent-rasterbar" ,libtorrent-rasterbar)
("openssl" ,openssl)
("python" ,python-wrapper)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("zlib" ,zlib)))
(home-page "https://www.qbittorrent.org/")

View File

@ -7,7 +7,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -46,6 +46,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages hurd)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages llvm)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
@ -193,6 +194,91 @@ across a broad spectrum of applications.")
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
"Some components have other similar licences."))))
;; Sadly, this is needed for irods. It won't link with 1.69 or later.
(define-public boost-for-irods
(package
(inherit boost)
(name "boost-for-irods")
(version "1.68.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/boost/boost/" version "/boost_"
(string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
".tar.bz2"))
(sha256
(base32
"1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz"))))
(build-system gnu-build-system)
(properties `((hidden? . #true)))
(inputs
`(("icu4c" ,icu4c)
("libcxx" ,libcxx+libcxxabi-6)
("libcxxabi" ,libcxxabi-6)
("zlib" ,zlib)))
(native-inputs
`(("clang" ,clang-6)
("perl" ,perl)
("tcsh" ,tcsh)))
(arguments
`(#:tests? #f
#:make-flags
(list "threading=multi" "link=shared"
"cxxflags=-stdlib=libc++"
"--without-python"
;; Set the RUNPATH to $libdir so that the libs find each other.
(string-append "linkflags=-stdlib=libc++ -Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))
#:phases
(modify-phases %standard-phases
(delete 'bootstrap)
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gcc (assoc-ref (or native-inputs inputs) "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons (string-append (assoc-ref inputs "libcxx")
"/include/c++/v1")
;; Hide GCC's C++ headers so that they do not interfere with
;; the Clang headers.
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((icu (assoc-ref inputs "icu4c"))
(out (assoc-ref outputs "out"))
(sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
(substitute* '("libs/config/configure"
"libs/spirit/classic/phoenix/test/runtest.sh"
"tools/build/src/engine/execunix.c"
"tools/build/src/engine/Jambase"
"tools/build/src/engine/jambase.c")
(("/bin/sh") sh))
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
(invoke "./bootstrap.sh"
(string-append "--prefix=" out)
;; Auto-detection looks for ICU only in traditional
;; install locations.
(string-append "--with-icu=" icu)
"--with-toolset=clang"))))
(replace 'build
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "./b2"
(format #f "-j~a" (parallel-job-count))
make-flags)))
(replace 'install
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "./b2" "install" make-flags))))))))
(define-public boost-with-python3
(deprecated-package "boost-with-python3" boost))

View File

@ -3,10 +3,10 @@
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017, 2018, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -88,18 +88,24 @@
(define-public grub
(package
(name "grub")
(version "2.04")
(version "2.06")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz"))
(sha256
(base32
"0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5"))
"1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp"))
(patches (search-patches
"grub-efi-fat-serial-number.patch"
"grub-setup-root.patch"
"grub-verifiers-Blocklist-fallout-cleanup.patch"
"grub-cross-system-i686.patch"))))
"grub-setup-root.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; Adjust QEMU invocation to not use a deprecated device
;; name that was removed in QEMU 6.0. Remove for >2.06.
(substitute* "tests/ahci_test.in"
(("ide-drive")
"ide-hd"))))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -296,7 +302,9 @@ menu to select one of the installed operating systems.")
,@(substitute-keyword-arguments (package-arguments grub)
((#:tests? _ #f) #f)
((#:configure-flags flags ''())
`(cons "--with-platform=efi" ,flags))
`(cons* "--with-platform=efi"
"--enable-stack-protector" ; EFI-only for now
,flags))
((#:phases phases)
`(modify-phases ,phases
(add-after 'patch-stuff 'use-absolute-efibootmgr-path
@ -426,7 +434,7 @@ menu to select one of the installed operating systems.")
(define-public dtc
(package
(name "dtc")
(version "1.6.0")
(version "1.6.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -434,7 +442,7 @@ menu to select one of the installed operating systems.")
"dtc-" version ".tar.xz"))
(sha256
(base32
"0bf8801z6fpd1gz9mxd5pqqj8nq101x393cyw8rpkc712w13nl0h"))))
"0wrl43rvd8nnm1v1wyfdr17vk8q7ymib62vli6da8n9ni4lwbkk5"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
@ -516,17 +524,17 @@ also initializes the boards (RAM etc).")
(define-public u-boot-2021.07
(package
(inherit u-boot)
(version "2021.07-rc1")
(version "2021.07-rc4")
(source (origin
(patches
(list %u-boot-rockchip-inno-usb-patch))
(patches
(list %u-boot-rockchip-inno-usb-patch))
(method url-fetch)
(uri (string-append
"https://ftp.denx.de/pub/u-boot/"
"u-boot-" version ".tar.bz2"))
(sha256
(base32
"12krpy85iwy40xlhqb61d0d4bzj0sbn9sdf8brn57m4cjh1svaya"))))))
"0bnsywgy2b0jxim5h9dc807lqk5kq8hvgf4lcsmffnc0hf4isv8p"))))))
(define-public u-boot-tools
(package
@ -866,6 +874,13 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(define-public u-boot-sifive-fu540
(make-u-boot-package "sifive_fu540" "riscv64-linux-gnu"))
(define-public u-boot-sifive-unmatched
(let ((base (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")))
(package
(inherit base)
(version (package-version u-boot-2021.07))
(source (package-source u-boot-2021.07)))))
(define-public u-boot-rock64-rk3328
(let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu")))
(package

View File

@ -347,7 +347,7 @@ and ruby. It includes two illustrative command-line programs, @code{hcal} and
(native-inputs
`(("perl" ,perl))) ; pod2man
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://www.toastfreeware.priv.at/confclerk")
(synopsis "Offline conference schedule application")
(description

View File

@ -80,7 +80,7 @@
("molequeue" ,molequeue)
("python" ,python)
("spglib" ,spglib)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
'(#:configure-flags (list "-DENABLE_TESTING=ON"
(string-append "-DSPGLIB_INCLUDE_DIR="
@ -116,7 +116,7 @@ bioinformatics, materials science, and related areas.")
`(("avogadrolibs" ,avogadrolibs)
("hdf5" ,hdf5)
("molequeue" ,molequeue)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
(arguments
'(#:tests? #f))
@ -301,7 +301,7 @@ biological structures.")
"1w1fgxzqrb5yxvpmnc3c9ymnvixy0z1nfafkd9whg9zw8nbgl998"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
'(#:configure-flags '("-DENABLE_TESTING=ON")
#:phases

View File

@ -322,11 +322,11 @@
(string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash))))
(define %chromium-version "91.0.4472.77")
(define %chromium-version "91.0.4472.106")
(define %debian-revision "debian/90.0.4430.85-1")
;; Note: use 'git describe --long' even for exact tags to placate the
;; custom version format for ungoogled-chromium.
(define %ungoogled-revision "91.0.4472.77-1-0-g6802c88")
(define %ungoogled-revision "91.0.4472.101-1-2-gbd0ffd1")
(define %debian-patches
(list (debian-patch "fixes/nomerge.patch"
@ -346,7 +346,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256
(base32
"1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0"))))
"0676wkk1zlccwwwk4hi8ifhrk2x5s66fi0amsj30b7lnydzwpfv9"))))
(define %guix-patches
(list (local-file
@ -488,7 +488,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5"))
"1fxy1l2dl0f6v8566lykcng18ma6fv4nlwxmdb0hh06fgp6khpjl"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)

View File

@ -73,11 +73,11 @@
(file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass
(let ((commit "21202760c0d15c99b69ef235ff129ab9cb478186")
(revision "25"))
(let ((commit "f9a5dbd54eaa7fa8ac173fd5e68209f937840d90")
(revision "1"))
(package
(name "cuirass")
(version (git-version "1.0.0" revision commit))
(version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
@ -87,7 +87,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"1bzzycz7jmmrph730p8d3q2h76ab6i8j72wblm3w0szf8vimcqfk"))))
"0wrx2bf1gdnbkfgmmqr46s1fhvv3568yi7hxb24plf4xx5jq5yg8"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)

View File

@ -4,7 +4,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
@ -78,6 +78,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl)
@ -857,22 +858,23 @@ time for compression ratio.")
(package
(name "squashfs-tools")
(version "4.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/squashfs/squashfs/"
"squashfs" version "/"
"squashfs" version ".tar.gz"))
(sha256
(base32
"0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix build with -fno-common (default in GCC 10).
;; Remove for squashfs-tools > 4.4.
(substitute* "squashfs-tools/mksquashfs.h"
(("struct cache \\*bwriter_buffer" all)
(string-append "extern " all)))))))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/plougher/squashfs-tools")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix build with -fno-common (default in GCC 10).
;; Remove for squashfs-tools > 4.4.
(substitute* "squashfs-tools/mksquashfs.h"
(("struct cache \\*bwriter_buffer" all)
(string-append "extern " all)))))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@ -881,18 +883,25 @@ time for compression ratio.")
"XZ_SUPPORT=1"
"LZO_SUPPORT=1"
"LZ4_SUPPORT=1"
"ZSTD_SUPPORT=1"
(string-append "INSTALL_DIR=" %output "/bin"))
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda _
(chdir "squashfs-tools")
#t)))))
(chdir "squashfs-tools")))
(add-after 'install 'install-documentation
;; Install what very little usage documentation is provided.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name)))
(install-file "../USAGE" doc)))))))
(inputs
`(("lz4" ,lz4)
("lzo" ,lzo)
("xz" ,xz)
("zlib" ,zlib)))
("zlib" ,zlib)
("zstd:lib" ,zstd "lib")))
(home-page "https://github.com/plougher/squashfs-tools")
(synopsis "Tools to create and extract squashfs file systems")
(description
@ -1172,6 +1181,54 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
100% bigger.")
(license license:asl2.0)))
;; We need this for irods.
(define-public snappy-with-clang6
(package
(inherit snappy)
(name "snappy-with-clang")
;; XXX 1.1.9 fails to build with clang with
;; error: invalid output constraint '=@ccz' in asm
(version "1.1.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/snappy")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv"))))
(arguments
`(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_CXX_COMPILER=clang++"
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCMAKE_EXE_LINKER_FLAGS=-lc++abi")
#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gcc (assoc-ref (or native-inputs inputs) "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons* (string-append (assoc-ref inputs "libcxx+libcxxabi")
"/include/c++/v1")
;; Hide GCC's C++ headers so that they do not interfere with
;; the Clang headers.
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(properties `((hidden? . #true)))
(native-inputs
`(("clang" ,clang-toolchain-6)))
(inputs
`(("libcxx+libcxxabi" ,libcxx+libcxxabi-6)
("libcxxabi" ,libcxxabi-6)))))
(define-public p7zip
(package
(name "p7zip")
@ -2134,7 +2191,7 @@ download times, and other distribution and storage costs.")
(native-inputs
`(("doxygen" ,doxygen)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("zlib" ,zlib)))
(home-page "https://stachenov.github.io/quazip/index.html")
(synopsis "Qt/C++ wrapper for Minizip")

View File

@ -50,8 +50,9 @@
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/network/connman/"
"connman-" version ".tar.xz"))
(sha256
(base32 "1wqs307vjphhh73qbqk25zxhhqwn1mdk6bpzl5qcd4blkcbafqlz"))))
(patches (search-patches "connman-CVE-2021-33833.patch"))
(sha256
(base32 "1wqs307vjphhh73qbqk25zxhhqwn1mdk6bpzl5qcd4blkcbafqlz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -148,7 +149,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(sha256
(base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq"))))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(native-inputs
`(("qttools" ,qttools)))
(build-system gnu-build-system)

View File

@ -6,6 +6,7 @@
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Robin Green <greenrd@greenrd.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -142,79 +143,76 @@ It is developed using Objective Caml and Camlp5.")
(license (list license:lgpl2.1 license:opl1.0+))))
(define-public proof-general
(package
(name "proof-general")
(version "4.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append
"https://github.com/ProofGeneral/PG"))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8"))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)
("emacs" ,emacs-minimal)
("texinfo" ,texinfo)))
(inputs
`(("host-emacs" ,emacs)
("perl" ,perl)
("coq" ,coq)))
(arguments
`(#:tests? #f ; no check target
#:make-flags (list (string-append "PREFIX=" %output)
(string-append "DEST_PREFIX=" %output))
#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'disable-byte-compile-error-on-warn
(lambda _
(substitute* "Makefile"
(("\\(setq byte-compile-error-on-warn t\\)")
"(setq byte-compile-error-on-warn nil)"))
#t))
(add-after 'unpack 'patch-hardcoded-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(coq (assoc-ref inputs "coq"))
(emacs (assoc-ref inputs "host-emacs")))
(define (coq-prog name)
(string-append coq "/bin/" name))
(substitute* "Makefile"
(("/sbin/install-info") "install-info"))
(substitute* "bin/proofgeneral"
(("^PGHOMEDEFAULT=.*" all)
(string-append all
"PGHOME=$PGHOMEDEFAULT\n"
"EMACS=" emacs "/bin/emacs")))
#t)))
(add-after 'unpack 'clean
(lambda _
;; Delete the pre-compiled elc files for Emacs 23.
(invoke "make" "clean")))
(add-after 'install 'install-doc
(lambda* (#:key make-flags #:allow-other-keys)
;; XXX FIXME avoid building/installing pdf files,
;; due to unresolved errors building them.
(substitute* "Makefile"
((" [^ ]*\\.pdf") ""))
(apply invoke "make" "install-doc" make-flags))))))
(home-page "https://proofgeneral.github.io/ ")
(synopsis "Generic front-end for proof assistants based on Emacs")
(description
"Proof General is a major mode to turn Emacs into an interactive proof
;; The latest release is from 2016 and there has been more than 450 commits
;; since then.
;; Commit from 2021-06-07.
(let ((commit "bc86736abb728ec0d28abc90ef0adae21d29a66a")
(revision "0"))
(package
(name "proof-general")
(version (git-version "4.4" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ProofGeneral/PG")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa"))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)
("emacs" ,emacs-minimal)
("texinfo" ,texinfo)))
(inputs
`(("host-emacs" ,emacs)
("perl" ,perl)
("coq" ,coq)))
(arguments
`(#:tests? #f ; no check target
#:make-flags (list (string-append "PREFIX=" %output)
(string-append "DEST_PREFIX=" %output)
(string-append "ELISP_START=" %output
"/share/emacs/site-lisp/ProofGeneral"))
#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'disable-byte-compile-error-on-warn
(lambda _
(substitute* "Makefile"
(("\\(setq byte-compile-error-on-warn t\\)")
"(setq byte-compile-error-on-warn nil)"))))
(add-after 'unpack 'patch-hardcoded-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(coq (assoc-ref inputs "coq"))
(emacs (assoc-ref inputs "host-emacs")))
(substitute* "Makefile"
(("/sbin/install-info") "install-info")))))
(add-after 'unpack 'clean
(lambda _
;; Delete the pre-compiled elc files for Emacs 23.
(invoke "make" "clean")))
(add-after 'install 'install-doc
(lambda* (#:key make-flags #:allow-other-keys)
;; XXX FIXME avoid building/installing pdf files,
;; due to unresolved errors building them.
(substitute* "Makefile"
((" [^ ]*\\.pdf") ""))
(apply invoke "make" "install-doc" make-flags))))))
(home-page "https://proofgeneral.github.io/")
(synopsis "Generic front-end for proof assistants based on Emacs")
(description
"Proof General is a major mode to turn Emacs into an interactive proof
assistant to write formal mathematical proofs using a variety of theorem
provers.")
(license license:gpl2+)))
(license license:gpl2+))))
(define-public coq-flocq
(package

View File

@ -587,7 +587,7 @@ tools:
(synopsis "Static code checker for C++")
(description "@code{cpplint} is a command-line tool to check C/C++ files
for style issues following Googles C++ style guide. While Google maintains
it's own version of the tool, this is a fork that aims to be more responsive
its own version of the tool, this is a fork that aims to be more responsive
and make @code{cpplint} usable in wider contexts.")
(license license:bsd-3)))

View File

@ -29157,6 +29157,34 @@ Xiaohui Yan, Jiafeng Guo, Yanyan Lan, Xueqi Cheng (2013)
BTM-WWW13.pdf}.")
(license license:asl2.0)))
(define-public r-delaporte
(package
(name "r-delaporte")
(version "8.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "Delaporte" version))
(sha256
(base32
"0ijhmwclpg5czs2sl2vykcw8qj2pxy26xf6knh62rqq6p6sm43f4"))))
(properties `((upstream-name . "Delaporte")))
(build-system r-build-system)
(native-inputs `(("gfortran" ,gfortran)))
(home-page "https://github.com/aadler/Delaporte")
(synopsis "Statistical functions for the Delaporte distribution")
(description
"This package provides probability mass, distribution, quantile,
random-variate generation, and method-of-moments parameter-estimation
functions for the Delaporte distribution with parameterization based on
Vose (2008). The Delaporte is a discrete probability distribution which can
be considered the convolution of a negative binomial distribution with a
Poisson distribution. Alternatively, it can be considered a counting
distribution with both Poisson and negative binomial components. It has been
studied in actuarial science as a frequency distribution which has more
variability than the Poisson, but less than the negative binomial.")
(license license:bsd-2)))
(define-public r-rjsonio
(package
(name "r-rjsonio")

File diff suppressed because it is too large Load Diff

View File

@ -52,7 +52,7 @@
"--enable-libargon2"
;; The default is OpenSSL which provides better PBKDF performance.
"--with-crypto_backend=gcrypt"
;; GRUB as of 2.04 still can't read LUKS2 containers.
;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…?
"--with-default-luks-format=LUKS1")))
(native-inputs
`(("pkg-config" ,pkg-config)))

View File

@ -857,7 +857,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(define-public epson-inkjet-printer-escpr
(package
(name "epson-inkjet-printer-escpr")
(version "1.7.10")
(version "1.7.11")
;; XXX: This currently works. But it will break as soon as a newer
;; version is available since the URLs for older versions are not
;; preserved. An alternative source will be added as soon as
@ -865,11 +865,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(source
(origin
(method url-fetch)
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/68/"
"34/82ca3e84f17410b5ec6818e5698524b1f42862cb/"
"epson-inkjet-printer-escpr-1.7.10-1lsb3.2.tar.gz"))
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/84/"
"42/69bb076469542fe702ada5ea53a4ea4773d407b0/"
"epson-inkjet-printer-escpr-1.7.11-1lsb3.2.tar.gz"))
(sha256
(base32 "0j31w85gbi2g3ad316vw7azns382m2di6wazdbiyv9vix5gvb60g"))))
(base32 "0m21qks68697x7k6z0i1c8lcf9l5ap4mwc5519a086cmy9whslzf"))))
(build-system gnu-build-system)
(arguments
`(#:modules

View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
@ -61,7 +61,8 @@
(sha256
(base32
"0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(patches (search-patches "curl-use-ssl-cert-env.patch"
"curl-7.77-tls-priority-string.patch"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages

View File

@ -69,7 +69,7 @@
(replace 'configure
(lambda _ (invoke "qmake"))))))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("quazip" ,quazip)
("zlib" ,zlib)))
(home-page "https://cvassistant.sourceforge.io/")

View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 c4droid <c4droid@foxmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,7 +23,14 @@
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system python)
#:use-module (gnu packages engineering))
#:use-module (gnu packages engineering)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages time)
#:use-module (gnu packages bioinformatics) ;python-intervaltree
#:use-module (gnu packages emulators))
(define-public ropgadget
(package
@ -44,3 +52,44 @@
gadgets in binaries. Some facilities are included for automatically generating
chains of gadgets to execute system calls.")
(license license:bsd-3)))
(define-public pwntools
(package
(name "pwntools")
(version "4.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pwntools" version))
(sha256
(base32
"1qw7j0wwm1878aia08gyw5xljjr26qsbp45w65n4qff672sha5n5"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ;XXX: needs a specific version of unicorn
(propagated-inputs
`(("capstone" ,capstone)
("python-dateutil" ,python-dateutil)
("python-intervaltree" ,python-intervaltree)
("python-mako" ,python-mako)
("python-packaging" ,python-packaging)
("python-paramiko" ,python-paramiko)
("python-psutil" ,python-psutil)
("python-pyelftools" ,python-pyelftools)
("python-pygments" ,python-pygments)
("python-pyserial" ,python-pyserial)
("python-pysocks" ,python-pysocks)
("python-requests" ,python-requests)
("ropgadget" ,ropgadget)
("python-six" ,python-six)
("python-sortedcontainers"
,python-sortedcontainers)
("unicorn" ,unicorn)))
(home-page "https://github.com/Gallopsled/pwntools")
(synopsis
"Capture-the-flag (CTF) framework and exploit development library")
(description
"Pwntools is a capture-the-flag (CTF) framework and exploit development library.
Written in Python, it is designed for rapid prototyping and development, and
intended to make exploit writing as simple as possible.")
(license license:expat)))

View File

@ -101,6 +101,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages llvm)
#:use-module (gnu packages logging)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
@ -2092,6 +2093,43 @@ a simpler and less verbose API for working with ODBC. Common tasks should be
easy, requiring concise and simple code.")
(license license:expat)))
(define-public nanodbc-for-irods
(package
(inherit nanodbc)
(arguments
`(#:tests? #false
#:configure-flags
'("-DBUILD_SHARED_LIBS=ON"
;; The tests require ODBC backends to be installed.
"-DNANODBC_DISABLE_TESTS=ON"
"-DCMAKE_CXX_COMPILER=clang++"
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCMAKE_EXE_LINKER_FLAGS=-lc++abi")
#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons (string-append (assoc-ref inputs "libcxx")
"/include/c++/v1")
;; Hide GCC's C++ headers so that they do not interfere with
;; the Clang headers.
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(properties `((hidden? . #true)))
(inputs
`(("unixodbc" ,unixodbc)
("libcxx" ,libcxx+libcxxabi-6)
("libcxxabi" ,libcxxabi-6)
("clang" ,clang-6)))))
(define-public unqlite
(package
(name "unqlite")

View File

@ -140,14 +140,14 @@ in between these sequences may be different in both content and length.")
(define-public liburcu
(package
(name "liburcu")
(version "0.12.2")
(version "0.13.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.lttng.org/files/urcu/"
"userspace-rcu-" version ".tar.bz2"))
(sha256
(base32
"0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf"))))
"085s437nig6bdiv9im4k4qwqbrbnc4qw9flqi16jlb493az0vcnb"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl))) ; for tests

View File

@ -438,12 +438,6 @@ intelligible and easily correctable.")
("ncurses" ,ncurses)
("readline" ,readline)
("zlib" ,zlib)))
;; If you use Guix to package and install dictionary data,
;; you need this variable to load them.
(native-search-paths
(list (search-path-specification
(variable "STARDICT_DATA_DIR")
(files '("share/stardict/dic")))))
(home-page "https://dushistov.github.io/sdcv/")
(synopsis "Console version of StarDict")
(description "sdcv is simple text-based utility for work with dictionaries

View File

@ -358,14 +358,14 @@ output without any plausibility checks.")
(define-public gptfdisk
(package
(name "gptfdisk")
(version "1.0.7")
(version "1.0.8")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
version "/gptfdisk-" version ".tar.gz"))
(sha256
(base32 "1h1871gwlq05gdc2wym98ghfmq6pn5lh8g5cqy3r49svz2vh8h3m"))))
(base32 "1py6klp1b7rni1qjj110snyyxafhx092carlii5vrnh4y1b9ilcm"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)

View File

@ -80,7 +80,7 @@
("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon)
("linux-pam" ,linux-pam)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
;; Some user-defined themes use QtQuick components internally. Adding

View File

@ -119,7 +119,7 @@ utilities.")
("glib" ,glib)
("libxt" ,libxt)
("libtiff" ,libtiff)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases

View File

@ -101,7 +101,7 @@
(base32 "0ac242n7996fswq1a3nlh1bbbhrsdwsq4mx7xq8ffq6aplb4rj4a"))
(patches
(search-patches
;; To create make-flag vairables,
;; To create make-flag variables,
;; for splitting installation of drill and examples.
"ldns-drill-examples.patch"))))
(build-system gnu-build-system)
@ -769,16 +769,16 @@ served by AS112. Stub and forward zones are supported.")
(define-public yadifa
(package
(name "yadifa")
(version "2.4.2")
(version "2.5.0")
(source
(let ((build "9997"))
(let ((build "10188"))
(origin
(method url-fetch)
(uri
(string-append "https://www.yadifa.eu/sites/default/files/releases/"
"yadifa-" version "-" build ".tar.gz"))
(sha256
(base32 "0f1by2c7l39qpsar5nh98f3xypmn2ikv7wr557wmva6m0lwbl3q0")))))
(base32 "05ps6fif3sqn6yzkprnp1cm81f3ja4vqc0r6vh7nvzl73gv4rp2w")))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)))
@ -803,7 +803,8 @@ served by AS112. Stub and forward zones are supported.")
(list "--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-shared" "--disable-static"
"--disable-build-timestamp"))) ; build reproducibly
"--disable-build-timestamp" ; build reproducibly
"--enable-tcp-manager")))
(home-page "https://www.yadifa.eu/")
(synopsis "Authoritative DNS name server")
(description "YADIFA is an authoritative name server for the @dfn{Domain
@ -1236,7 +1237,7 @@ known public suffixes.")
(define-public maradns
(package
(name "maradns")
(version "3.5.0007")
(version "3.5.0020")
(source
(origin
(method url-fetch)
@ -1244,7 +1245,7 @@ known public suffixes.")
(version-major+minor version) "/"
version "/maradns-" version ".tar.xz"))
(sha256
(base32 "0bc19xylg4whww9qaj5i4izwxcrh0c0ja7l1pfcn2la02hlvg1a6"))))
(base32 "1qgabw6y2bwy6y88dikis62k789i0xh7iwxan8jmqpzvksqwjfgw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; need to be root to run tests

View File

@ -382,12 +382,12 @@ built-in registry server of Docker.")
(("DefaultInitBinary = .*")
(string-append "DefaultInitBinary = \""
(assoc-ref inputs "tini")
"/bin/tini\"\n")))
"/bin/tini-static\"\n")))
(substitute* "daemon/config/config_common_unix_test.go"
(("expectedInitPath: \"docker-init\"")
(string-append "expectedInitPath: \""
(assoc-ref inputs "tini")
"/bin/tini\"")))
"/bin/tini-static\"")))
(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
(("var defaultCommandCandidates = .*")
(string-append "var defaultCommandCandidates = []string{\""
@ -716,7 +716,7 @@ defined in a per-project configuration file.")
(define-public tini
(package
(name "tini")
(version "0.18.0")
(version "0.19.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -725,19 +725,14 @@ defined in a per-project configuration file.")
(file-name (git-file-name name version))
(sha256
(base32
"1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"))))
"1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;tests require a Docker daemon
#:phases (modify-phases %standard-phases
(add-after 'unpack 'disable-static-build
;; Disable the static build as it fails to install, with
;; the error: "No valid ELF RPATH or RUNPATH entry exists
;; in the file".
(lambda _
(substitute* "CMakeLists.txt"
((".*tini-static.*") ""))
#t)))))
;; 'tini-static' is a static binary, which leads CMake to fail with
;; file RPATH_CHANGE could not write new RPATH: .... Clear
;; CMAKE_INSTALL_RPATH to avoid that problem.
#:configure-flags '("-DCMAKE_INSTALL_RPATH=")))
(home-page "https://github.com/krallin/tini")
(synopsis "Tiny but valid init for containers")
(description "Tini is an init program specifically designed for use with

View File

@ -334,7 +334,7 @@ local system.")
(inputs
`(("libarchive" ,libarchive)
("sqlite" ,sqlite)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)

View File

@ -55,6 +55,7 @@
#:use-module (gnu packages libusb)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages music)
#:use-module (gnu packages pantheon)
#:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@ -146,7 +147,7 @@ with Microsoft Compiled HTML (CHM) files")
(build-system python-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("qtbase" ,qtbase) ; for qmake
("qtbase" ,qtbase-5) ; for qmake
("python-flake8" ,python-flake8)
("python-pyqt-builder" ,python-pyqt-builder)
("xdg-utils" ,xdg-utils)))
@ -474,7 +475,7 @@ following formats:
(define-public cozy
(package
(name "cozy")
(version "0.9.4")
(version "1.0.3")
(source
(origin
(method git-fetch)
@ -483,7 +484,7 @@ following formats:
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "182y6mkr39qgwk1n33nhfngqjyadrijiyfkzxydx9hfch302i8wz"))))
(base32 "0m0xiqpb87pwr3fhy0a4qxg67yjhwchcxj3x2anyy0li4inryxag"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -530,12 +531,14 @@ following formats:
("python" ,python-wrapper)))
(inputs
`(("file" ,file)
("granite" ,granite)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gst-libav" ,gst-libav)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-ugly" ,gst-plugins-ugly)
("gtk+" ,gtk+)
("libgee" ,libgee)
("libhandy" ,libhandy)
("python-distro" ,python-distro)
("python-gst" ,python-gst)

View File

@ -191,7 +191,7 @@ of categories with some of the activities available in that category.
(inputs
`(("openssl" ,openssl)
("python" ,python-wrapper)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtmultimedia" ,qtmultimedia)
@ -260,7 +260,7 @@ Currently available boards include:
;; Recreate Makefile
(invoke "qmake")))))))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)))
(home-page "https://www.tipp10.com/")
(synopsis "Touch typing tutor")
@ -638,7 +638,7 @@ Portuguese, Spanish and Italian.")
(replace 'configure
(lambda _ (invoke "qmake" "fet.pro"))))))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://www.lalescu.ro/liviu/fet/")
(synopsis "Timetabling software")
(description
@ -654,14 +654,14 @@ hours.")
(define-public klavaro
(package
(name "klavaro")
(version "3.12")
(version "3.13")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/klavaro/klavaro-"
version ".tar.bz2"))
(sha256
(base32 "0ymrmgllyjk9wp1f1ayw51xc3myar8ld9a5531wdbrym0xzy4l64"))))
(base32 "0z6c3lqikk50mkz3ipm93l48qj7b98lxyip8y6ndg9y9k0z0n878"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -712,7 +712,7 @@ language and very flexible regarding to new or unknown keyboard layouts.")
("kxmlgui" ,kxmlgui)
("libxcb" ,libxcb)
("libxkbfile" ,libxkbfile)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtquickcontrols2" ,qtquickcontrols2)

View File

@ -277,7 +277,7 @@ format support.")
("glibmm" ,glibmm)
("libsigrok" ,libsigrok)
("libsigrokdecode" ,libsigrokdecode)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(home-page "https://www.sigrok.org/wiki/PulseView")
(synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")

View File

@ -78,7 +78,7 @@
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com>
;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2020, 2021 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2020 Marco Grassi <marco.au.grassi98@protonmail.com>
;;; Copyright © 2020 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
@ -405,7 +405,7 @@ a generic Scheme interaction mode for the GNU Emacs editor.")
(define-public emacs-vc-hgcmd
(package
(name "emacs-vc-hgcmd")
(version "1.13")
(version "1.14")
(source (origin
(method git-fetch)
(uri (git-reference
@ -414,7 +414,7 @@ a generic Scheme interaction mode for the GNU Emacs editor.")
(file-name (git-file-name name version))
(sha256
(base32
"14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria"))))
"1mm8lnwii53j32v54aahl8sf3ciwymrvc1rgy4nw2m7hcrnjsb78"))))
(build-system emacs-build-system)
(home-page "https://github.com/muffinmad/emacs-vc-hgcmd")
(synopsis "Version control (VC) backend for the Mercurial command server")
@ -532,6 +532,26 @@ buffers, directory trees, or the web.")
@command{hg histedit} for editing the commit history.")
(license license:gpl3+))))
(define-public emacs-package-build
(package
(name "emacs-package-build")
(version "2.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/melpa/package-build")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1412pjghyvzkdlsrrs0ql30vw591bhyk1wlbf49f15dzjbspx3w0"))))
(build-system emacs-build-system)
(home-page "https://github.com/melpa/package-build")
(synopsis "Tools for assembling en Emacs package archive")
(description "This package provides tools for assembling an @acronym{ELPA,
Emacs package archive}.")
(license license:gpl3+)))
(define-public emacs-paredit
(package
(name "emacs-paredit")
@ -2030,14 +2050,14 @@ incrementally confined in Isearch manner.")
(define emacs-emms-print-metadata
(package
(name "emacs-emms-print-metadata")
(version "7.2")
(version "7.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"emms-" version ".tar"))
(sha256
(base32 "11vqqh9rnzibsfw7wx62rgzl8i8ldpf0hv1sj43nhl5c6dlc8d5z"))))
(base32 "153j76jfnh01b4pkkpyxfh83rl975rx0mh7mx4nnf83qd4dzkkd4"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("emms-print-metadata")
@ -2524,14 +2544,14 @@ as a library for other Emacs packages.")
(define-public emacs-auctex
(package
(name "emacs-auctex")
(version "13.0.11")
(version "13.0.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar"))
(sha256
(base32 "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k"))))
(base32 "0fx3l6yyq63mlnapxiqpdhi5l314r3aj63404nly6hcdvc28g9nm"))))
(build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus).
@ -3913,7 +3933,7 @@ files and directories.")
(define-public emacs-fountain-mode
(package
(name "emacs-fountain-mode")
(version "3.4.1")
(version "3.5.0")
(source
(origin
(method git-fetch)
@ -3922,7 +3942,7 @@ files and directories.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14zhbcfqyp093kd1bxl7f2hf5l5995qmgpmnxfgw9qcc781crj73"))))
(base32 "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx"))))
(build-system emacs-build-system)
(home-page "https://github.com/rnkn/fountain-mode")
(synopsis "Major mode for screenwriting in Fountain markup")
@ -5554,6 +5574,31 @@ errors.")
the current Cargo project.")
(license license:gpl3+)))
(define-public emacs-flycheck-package
(package
(name "emacs-flycheck-package")
(version "0.14")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/purcell/flycheck-package")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-flycheck" ,emacs-flycheck)
("emacs-package-lint" ,emacs-package-lint)))
(home-page "https://github.com/purcell/flycheck-package")
(synopsis "Flycheck checker for elisp package metadata")
(description
"This library provides a flycheck checker for the metadata in Emacs Lisp
files which are intended to be packages.")
(license license:gpl3+)))
(define-public emacs-elisp-demos
(package
(name "emacs-elisp-demos")
@ -7570,28 +7615,25 @@ It is built on top of the custom theme support in Emacs 24 or later.")
(license license:gpl3+)))
(define-public emacs-moe-theme-el
(let ((commit "6e086d855d6bb446bbd1090742815589a81a915f")
(version "1.0")
(revision "1"))
(package
(name "emacs-moe-theme-el")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kuanyui/moe-theme.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0xj4wfd7h4jqnr193pizm9frf6lmwjr0dsdv2l9mqh9k691z1dnc"))))
(build-system emacs-build-system)
(home-page "https://github.com/kuanyui/moe-theme.el")
(synopsis "Anime-inspired color themes")
(description
"This package provides vibrant color schemes with light and dark
(package
(name "emacs-moe-theme-el")
(version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kuanyui/moe-theme.el")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14higsv6h0pka90gr25a3yxh95xn65l6qxb39mmdzkfdlnzsg664"))))
(build-system emacs-build-system)
(home-page "https://github.com/kuanyui/moe-theme.el")
(synopsis "Anime-inspired color themes")
(description
"This package provides vibrant color schemes with light and dark
variants.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-solarized-theme
(package
@ -8649,8 +8691,8 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled
;; pick a more recent snapshot of the repository, see
;; https://github.com/Yevgnen/ivy-rich/pull/80.
(define-public emacs-ivy-rich
(let ((commit "7b9b7b20c3ead81da90232cd6707dfad3c1f1eb3")
(revision "1"))
(let ((commit "600b8183ed0be8668dcc548cc2c8cb94b001363b")
(revision "2"))
(package
(name "emacs-ivy-rich")
(version (git-version "0.1.6" revision commit))
@ -8662,7 +8704,7 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "03p13z609ighdq4axls93alqfl7pclx12g4vdd7lwpcy0r0cgyf8"))))
(base32 "1dv6vr7fv32v5m04zdy02sdajpvrnpc4i3pbh2dwfv73ff8d8yxm"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)))
@ -12463,6 +12505,36 @@ snippets. When this package is installed, the extra snippets it provides are
automatically made available to YASnippet.")
(license license:gpl3+)))
(define-public emacs-doom-snippets
;; Use the latest commit, as there are no tagged releases. Version is
;; extracted from main file.
(let ((release "1.1.0")
(revision "0")
(commit "bc613f448eed1bd363e61c41691a61e9fd139534"))
(package
(name "emacs-doom-snippets")
(version (git-version release revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hlissner/doom-snippets")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0n4b2pr0gpn8vb2n1rckdq4jk9sj995a62yxk6z2ygw5ad7pkj8f"))))
(build-system emacs-build-system)
(arguments
`(#:include (cons* "^.*\\/" %default-include)))
(propagated-inputs
`(("emacs-yasnippet" ,emacs-yasnippet)))
(home-page "https://github.com/hlissner/doom-snippets")
(synopsis "Doom Emacs' snippet library")
(description
"This package provides Yasnippets snippets for Doom Emacs. It also
exposes a small API to assist in writing your own snippets.")
(license license:expat))))
(define-public emacs-helm-c-yasnippet
(let ((commit "65ca732b510bfc31636708aebcfe4d2d845b59b0")
(revision "1"))
@ -13279,13 +13351,13 @@ containing words from the Rime project.")
(define-public emacs-pyim
(package
(name "emacs-pyim")
(version "3.7.9")
(version "3.8.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar"))
(sha256
(base32 "00ff1izdwcy53dcwpdn18wwndnw2jsw4bhg8gkqaa60xm468xzkl"))))
(base32 "19rsy41l588aijyi81jmqz9icl8r7ifh46yyl2dl99qz5rw00hlp"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-async" ,emacs-async)
@ -13300,17 +13372,38 @@ containing words from the Rime project.")
shuangpin, wubi and cangjie.")
(license license:gpl2+)))
(define-public emacs-reverse-im
(package
(name "emacs-reverse-im")
(version "0.0.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/a13/reverse-im.el")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn"))))
(build-system emacs-build-system)
(home-page "https://github.com/a13/reverse-im.el")
(synopsis "Reverse mapping for non-default system layouts")
(description
"Reverse IM provides a minor mode that toggles translations for all input
methods from a given list.")
(license license:gpl3+)))
(define-public emacs-posframe
(package
(name "emacs-posframe")
(version "1.0.3")
(version "1.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"posframe-" version ".tar"))
(sha256
(base32 "0c3lnrydsysv8j25brgc0cckf1hz54yhkginncmw81y1ia43rqmx"))))
(base32 "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6"))))
(build-system emacs-build-system)
;; emacs-minimal does not include the function font-info.
(arguments
@ -13618,7 +13711,7 @@ on mouse-control.")
(define-public emacs-gnugo
(package
(name "emacs-gnugo")
(version "3.1.0")
(version "3.1.1")
(source
(origin
(method url-fetch)
@ -13626,7 +13719,7 @@ on mouse-control.")
version ".tar"))
(sha256
(base32
"0xpjvs250gg71qwapdsb1hlc61gs0gpkjds01srf784fvyxx2gf1"))))
"035rgiz42q042h41l4cvf0hr8igy2vyn3s1hsl2pgh2dq2jjylv6"))))
(build-system emacs-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -15344,7 +15437,7 @@ Features:
(define-public emacs-evil-matchit
(package
(name "emacs-evil-matchit")
(version "2.3.11")
(version "2.3.12")
(source
(origin
(method git-fetch)
@ -15353,7 +15446,7 @@ Features:
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1990g1b6v0i7jaiv35bdssdn601rjifzg4fy9s3sxk0drqm1xiss"))))
(base32 "0l4ash907d91vccqdxjz1v5spd8f4va0vrdri6h9y1qc67mjlsph"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-evil" ,emacs-evil)))
@ -16298,7 +16391,7 @@ official @command{sqlite3} executable to access SQL database.")
(define-public emacs-closql
(package
(name "emacs-closql")
(version "1.0.5")
(version "1.0.6")
(source
(origin
(method git-fetch)
@ -16308,7 +16401,7 @@ official @command{sqlite3} executable to access SQL database.")
(file-name (git-file-name name version))
(sha256
(base32
"01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih"))))
"1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-emacsql" ,emacs-emacsql)))
@ -16325,7 +16418,7 @@ add any additional instance slots.")
(define-public emacs-epkg
(package
(name "emacs-epkg")
(version "3.3.0")
(version "3.3.1")
(source
(origin
(method git-fetch)
@ -16335,7 +16428,7 @@ add any additional instance slots.")
(file-name (git-file-name name version))
(sha256
(base32
"03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3"))))
"0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-closql" ,emacs-closql)
@ -16827,7 +16920,7 @@ interactive commands and functions, such as @code{completing-read}.")
(define-public emacs-org-ql
(package
(name "emacs-org-ql")
(version "0.5")
(version "0.5.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -16835,7 +16928,7 @@ interactive commands and functions, such as @code{completing-read}.")
(commit version)))
(sha256
(base32
"14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn"))
"0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
@ -16864,8 +16957,7 @@ interactive commands and functions, such as @code{completing-read}.")
;; This test fails on Emacs 27.1 (see:
;; https://github.com/alphapapa/org-super-agenda/issues/183).
(("it \"Can search buffer containing the link\"" all)
(string-append "x" all)))
#t)))))
(string-append "x" all))))))))
(home-page "https://github.com/alphapapa/org-ql/")
(synopsis "Query language for Org buffers")
(description "This package provides a Lispy query language for Org
@ -21202,6 +21294,68 @@ youtube-dl backends are supported. It is possible to create download profiles
depending on the downloaded URL.")
(license license:gpl3+)))
(define-public emacs-ytel
;; No tagged releases. Using version from main file.
(let ((commit "d40bc7ead8d4d7e4d16b03b66a93d63bef51cc5f")
(revision "0"))
(package
(name "emacs-ytel")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/grastello/ytel")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0pxzfsxzrpv59dssrgx2mmwkm6rzk49ffjkgsa3wks7rdyfil3kf"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((curl (assoc-ref inputs "curl")))
(substitute* "ytel.el"
(("\"curl\"") (string-append "\"" curl "/bin/curl\"")))))))))
(inputs
`(("curl" ,curl)))
(home-page "https://github.com/grastello/ytel")
(synopsis "Youtube front-end for Emacs")
(description
"This package provides a major mode to search YouTube videos via an
Elfeed-like buffer. Information about videos displayed in this buffer can be
extracted and manipulated by user-defined functions to do various things such
as playing them in some video player, or downloading them.")
(license license:gpl3+))))
(define-public emacs-ytel-show
;; No tagged releases. Version extracted from main file.
(let ((commit "8b999484eb447ecdb741b24cbef2b5a7260a53e6")
(revision "0"))
(package
(name "emacs-ytel-show")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xFA25E/ytel-show")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0nhgzfzq1bgpbdbljx5z2hzr8ia7ybsyvvr66yj4klz0zj97rghj"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ytel" ,emacs-ytel)))
(home-page "https://github.com/xFA25E/ytel-show")
(synopsis "Browse YouTube in Emacs")
(description
"This package provides an Emacs interface for browsing YouTube videos
and comments.")
(license license:gpl3+))))
(define-public emacs-org-web-tools
(package
(name "emacs-org-web-tools")
@ -23237,7 +23391,7 @@ as Emacs Lisp.")
(define-public emacs-transient
(package
(name "emacs-transient")
(version "0.3.4")
(version "0.3.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -23246,7 +23400,7 @@ as Emacs Lisp.")
(file-name (git-file-name name version))
(sha256
(base32
"16z0j69sk7k51sd1vri3y2v0xjj0w7wpf5mmwnsxp8y6d3m0yjbv"))))
"0wzfnzv2304a737zwp163aajjhm8i3ix9v7palgg1r3jskvbghmw"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f ;no test suite
@ -23277,7 +23431,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
(define-public emacs-forge
(package
(name "emacs-forge")
(version "0.2.0")
(version "0.2.1")
(source
(origin
(method git-fetch)
@ -23287,7 +23441,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
(file-name (git-file-name name version))
(sha256
(base32
"139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0"))))
"0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9"))))
(build-system emacs-build-system)
(native-inputs
`(("texinfo" ,texinfo)))
@ -25963,7 +26117,7 @@ Telegram messaging platform.")
(define-public emacs-doom-modeline
(package
(name "emacs-doom-modeline")
(version "3.1.1")
(version "3.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -25971,7 +26125,7 @@ Telegram messaging platform.")
(commit (string-append "v" version))))
(sha256
(base32
"1dkgh87sv25mdlzdfihp6gp0asvwplx9yrn7nfsqzsfc3kpajkck"))
"1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@ -26290,14 +26444,14 @@ interface.")
(define-public emacs-ivy-posframe
(package
(name "emacs-ivy-posframe")
(version "0.6.0")
(version "0.6.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"ivy-posframe-" version ".tar"))
(sha256
(base32 "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf"))))
(base32 "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)

View File

@ -276,7 +276,7 @@ SuperCPU.")
("openal" ,openal)
("pugixml" ,pugixml)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sdl2" ,sdl2)
("sfml" ,sfml)
("soil" ,soil)
@ -376,7 +376,7 @@ older games.")
#:tests? #f)) ; test suite wants mips toolchain
(inputs
`(("elfutils" ,elfutils)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://github.com/cvut/QtMips")
(synopsis "MIPS CPU emulator")
(description "This package contains a MIPS CPU emulator. The simulator
@ -620,7 +620,7 @@ The following systems are supported:
("mesa" ,mesa)
("minizip" ,minizip)
("ncurses" ,ncurses)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("sdl2" ,sdl2)
("sqlite" ,sqlite)
@ -1379,7 +1379,7 @@ as RetroArch.")
("openal" ,openal)
("pulseaudio" ,pulseaudio)
("python" ,python)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sdl" ,sdl2)
("udev" ,eudev)
("vulkan-loader" ,vulkan-loader)
@ -1799,7 +1799,7 @@ This is a part of the TiLP project.")
("pugixml" ,pugixml)
("pulseaudio" ,pulseaudio)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("rapidjson" ,rapidjson)
("sdl" ,(sdl-union (list sdl2 sdl2-ttf)))
("sqlite" ,sqlite)
@ -1998,6 +1998,8 @@ from various forks of Gens, and improved platform portability.")
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "-C" "bsnes"
;; Remove march=native
"local=false"
(string-append "prefix=" (assoc-ref %outputs "out")))
#:tests? #f ; No tests.
#:phases (modify-phases %standard-phases

View File

@ -201,7 +201,7 @@
`(("boost" ,boost)
("muparser" ,muparser)
("freetype" ,freetype)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(native-inputs
`(("pkg-config" ,pkg-config)
@ -701,7 +701,7 @@ multipole-accelerated algorithm.")
(string-append "PREFIX=" out)
"phoenix.pro")))))))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtserialport" ,qtserialport)
("qtsvg" ,qtsvg)
("libgit2" ,libgit2)
@ -834,7 +834,7 @@ fonts to gEDA.")
(inputs
`(("boost" ,boost)
("libpng" ,libpng)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("eigen" ,eigen)
("guile" ,guile-3.0)))
(home-page "https://libfive.com")
@ -1683,31 +1683,18 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
(package
(name "libngspice")
(version "28")
(source (origin
(method url-fetch)
(uri (list
(string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
version "/ngspice-" version ".tar.gz")
(string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
"old-releases/" version
"/ngspice-" version ".tar.gz")))
(sha256
(base32
"0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l"))
(modules '((guix build utils)))
;; We remove the non-free cider and build without it.
(snippet
'(begin
(delete-file-recursively "src/ciderlib")
(delete-file "src/ciderinit")
(substitute* "configure"
(("src/ciderlib/Makefile") "")
(("src/ciderlib/input/Makefile") "")
(("src/ciderlib/support/Makefile") "")
(("src/ciderlib/oned/Makefile") "")
(("src/ciderlib/twod/Makefile") ""))
#t))))
(version "34")
(source
(origin
(method url-fetch)
(uri (list
(string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
version "/ngspice-" version ".tar.gz")
(string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
"old-releases/" version
"/ngspice-" version ".tar.gz")))
(sha256
(base32 "1dfpkgkwmgwhq8dnbb8dh28cfap6rw0yywkhmxr4jxclcvygyqr2"))))
(build-system gnu-build-system)
(arguments
`(;; No tests for libngspice exist.
@ -1718,14 +1705,12 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
(add-after 'unpack 'patch-timestamps
(lambda _
(substitute* "configure"
(("`date`") "Thu Jan 1 00:00:01 UTC 1970"))
#t))
(("`date`") "Thu Jan 1 00:00:01 UTC 1970"))))
(add-after 'unpack 'delete-program-manuals
(lambda _
(substitute* "man/man1/Makefile.in"
(("^man_MANS = ngspice\\.1 ngnutmeg\\.1 ngsconvert\\.1 ngmultidec\\.1")
"man_MANS = "))
#t))
"man_MANS = "))))
(add-after 'install 'delete-script-files
(lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively
@ -1733,6 +1718,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
"/share/ngspice/scripts")))))
#:configure-flags
(list "--enable-openmp"
"--enable-ciderlib"
"--enable-xspice"
"--with-ngshared"
"--with-readline=yes")))
@ -1752,6 +1738,7 @@ provides code modeling support and simulation of digital components through
an embedded event driven algorithm.")
(license (list license:lgpl2.0+ ; code in frontend/numparam
(license:non-copyleft "file:///COPYING") ; spice3 bsd-style
license:bsd-3 ; ciderlib
license:public-domain)))) ; xspice
(define-public ngspice
@ -1768,16 +1755,7 @@ an embedded event driven algorithm.")
(lambda _
(substitute* "src/Makefile.in"
(("^SUBDIRS = misc maths frontend spicelib include/ngspice")
"SUBDIRS = misc maths frontend spicelib"))
#t))
(add-after 'install 'delete-cmpp-dlmain
(lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (file)
(delete-file
(string-append (assoc-ref outputs "out")
file)))
'("/bin/cmpp" "/share/ngspice/dlmain.c"))
#t))
"SUBDIRS = misc maths frontend spicelib"))))
(delete 'delete-program-manuals)
(delete 'delete-script-files)))))
(inputs
@ -2047,7 +2025,7 @@ parallel computing platforms. It also supports serial execution.")
(base32 "1b5dkanz3q0y5ag80w0l85hn7axrachb5m9zvyv4zvzrfy09wa88"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("zlib" ,zlib)))
(native-inputs
@ -2209,7 +2187,7 @@ simulation.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("openssl" ,openssl)
;; Depends on radare2 4.5.1 officially, builds and works fine with
@ -2288,7 +2266,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
("mpfr" ,mpfr)
("opencsg" ,opencsg)
("qscintilla" ,qscintilla)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)))
(native-inputs
`(("bison" ,bison)
@ -2420,7 +2398,7 @@ comments.")))
("python-pyyaml" ,python-pyyaml)
("python-shiboken-2" ,python-shiboken-2)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
@ -2700,7 +2678,7 @@ export filters.")
(base32 "1cgx24wxh2ah5pff51rcrk6x8qcdjpkxcdak7s4cfzmxvjlshydd"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
("qtxmlpatterns" ,qtxmlpatterns)
("mesa" ,mesa)

View File

@ -88,7 +88,7 @@
("libintl" ,intltool)
("libxkbcommon" ,libxkbcommon)))
(propagated-inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(synopsis "Fcitx Qt5 Input Context")
(description "This package provides a Qt5 frontend for fcitx.")
(home-page "https://github.com/fcitx/fcitx-qt5/")

View File

@ -87,7 +87,7 @@ client.")
(define-public fcitx5
(package
(name "fcitx5")
(version "5.0.5")
(version "5.0.8")
(source
(origin
(method url-fetch)
@ -95,7 +95,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz"))
(sha256
(base32 "16j716xawbszkb3fxzpdza1a4czh0fvkysikjc9bfyvbwp72p6an"))))
(base32 "0536sjpgjlg0bf8imz4jf9bdsp7fhm09bkssddji56cc9mgdxx82"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -133,7 +133,8 @@ client.")
("xcb-util-wm" ,xcb-util-wm)
("xkeyboard-config" ,xkeyboard-config)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
`(("gcc" ,gcc-9) ; for #include <charconv>
("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(native-search-paths
(list (search-path-specification
@ -147,7 +148,7 @@ client.")
(define-public fcitx5-lua
(package
(name "fcitx5-lua")
(version "5.0.2")
(version "5.0.5")
(source
(origin
(method url-fetch)
@ -155,7 +156,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
version ".tar.xz"))
(sha256
(base32 "0y5yc9102bz681f4wj6xqjxmfdmrshz3fhf39pa61718hkyy9lih"))))
(base32 "0f3raxzkq0nwdfpc9hxvg65vga09gznjjgy9dr6jlkamzx8zlyw9"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
@ -172,14 +173,14 @@ client.")
(define-public libime
(package
(name "libime")
(version "1.0.6")
(version "1.0.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.xz"))
(sha256
(base32 "1s8gzpzyn16pg9gm7kw1nhl09drdndi6j4mjam14ymqsrfsdqr1r"))))
(base32 "06smx1kqq3qh0xra8070cjfhw79hcm0vksrswk05wq6jyhvrk5sd"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
@ -189,15 +190,15 @@ client.")
("extra-cmake-modules" ,extra-cmake-modules)
("python" ,python))) ;needed to run test
(home-page "https://github.com/fcitx/libime")
(synopsis "Library for implementing generic input method")
(description "Libime is a library for implementing various input methods
(synopsis "Library for implementing generic input methods")
(description "Libime is a library for implementing various input method
editors.")
(license license:lgpl2.1+)))
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
(version "5.0.3")
(version "5.0.7")
(source
(origin
(method url-fetch)
@ -205,7 +206,7 @@ editors.")
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz"))
(sha256
(base32 "18bwwj9a5v82c6ssc8560hd8vwykakvg6sfijwdb5jswk9mafvgj"))))
(base32 "0x9xwyb3hnb2xl47jkj8zs34fhyf7gshy3bv3jxd66sfkjrscr5v"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;No test
@ -228,6 +229,7 @@ editors.")
(string-append gtk2 "/lib")))))))))
(inputs
`(("fcitx5" ,fcitx5)
("fmt" ,fmt)
("libxkbcommon" ,libxkbcommon)
("gobject-introspection" ,gobject-introspection)
("gtk2" ,gtk+-2)
@ -250,7 +252,7 @@ for GTK+2/GTK+3 application.")
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
(version "5.0.5")
(version "5.0.6")
(source
(origin
(method url-fetch)
@ -258,7 +260,7 @@ for GTK+2/GTK+3 application.")
"/fcitx5-qt/fcitx5-qt-"
version ".tar.xz"))
(sha256
(base32 "0vsvrfv0b21pfrz5n0v6p458vfr8k7km50h9bhjp1bnssampjfsb"))))
(base32 "0wp88cmy0gn15gkfzl5z4q4qd9j1ssdmgp1rfsbw0cp3qh5x4m69"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -269,7 +271,7 @@ for GTK+2/GTK+3 application.")
`(("fcitx5" ,fcitx5)
("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("gettext" ,gettext-minimal)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@ -285,7 +287,7 @@ for Qt based application.")
(define-public fcitx5-chinese-addons
(package
(name "fcitx5-chinese-addons")
(version "5.0.3")
(version "5.0.6")
(source
(origin
(method url-fetch)
@ -293,7 +295,7 @@ for Qt based application.")
"/fcitx5-chinese-addons/fcitx5-chinese-addons-"
version "_dict.tar.xz"))
(sha256
(base32 "1kmzbllk0g86m2z3piwn9j84ihxixyxzv7rzj832xfvwqgk7gixk"))))
(base32 "11l76gpcfm0x1f6x5m9s37q7ffa7xcsdydlzjdz2s6kk45fvvq89"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -315,7 +317,7 @@ for Qt based application.")
("fmt" ,fmt)
("libpthread-stubs" ,libpthread-stubs)
("opencc" ,opencc)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("fcitx5-qt" ,fcitx5-qt)
("qtwebkit" ,qtwebkit)))
(native-inputs
@ -346,7 +348,7 @@ including input methods previous bundled inside Fcitx 4:
(define-public fcitx5-configtool
(package
(name "fcitx5-configtool")
(version "5.0.2")
(version "5.0.5")
(source
(origin
(method url-fetch)
@ -354,7 +356,7 @@ including input methods previous bundled inside Fcitx 4:
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256
(base32 "0rpk3yn572pcr29jak63x84g0qgj8hj011aw8gmxjah9311nxhpb"))))
(base32 "1diwiniqvsvcdwzcx1dqxbvwsr6ajbxs67my0cpn8n22asd5mx8i"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -363,7 +365,7 @@ including input methods previous bundled inside Fcitx 4:
(inputs
`(("fcitx5" ,fcitx5)
("fcitx5-qt" ,fcitx5-qt)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)

View File

@ -345,8 +345,8 @@ from a mounted file system.")
(license license:gpl2+)))
(define-public bcachefs-tools
(let ((commit "7942d5cab4f02bd4db12ee26a792a6012b4d7b07")
(revision "7"))
(let ((commit "fe1bb39aa52d9140981ba1e96f3c95ddf14006ce")
(revision "8"))
(package
(name "bcachefs-tools")
(version (git-version "0.1" revision commit))
@ -358,7 +358,7 @@ from a mounted file system.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0k8cnkjm0v9xs7w02sj5151y6h8bj0gxmc3fq8js1wzx6wip9w96"))))
(base32 "1ks6w2v76pfpp70cv1d6znxaw1g5alz1v6hf8z9gvj15r94vgpwz"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -576,6 +576,7 @@ single file can be mounted.")
(sha256
(base32 "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"))
(patches (search-patches "jfsutils-add-sysmacros.patch"
"jfsutils-gcc-compat.patch"
"jfsutils-include-systypes.patch"))))
(build-system gnu-build-system)
(inputs
@ -860,7 +861,7 @@ A simple @command{eatmydata} script is included that does this for you.")
(define-public libnfs
(package
(name "libnfs")
(version "3.0.0")
(version "4.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -869,7 +870,7 @@ A simple @command{eatmydata} script is included that does this for you.")
(file-name (git-file-name name version))
(sha256
(base32
"115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404"))))
"0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda"))))
(build-system gnu-build-system)
(home-page "https://github.com/sahlberg/libnfs")
(native-inputs

View File

@ -19,7 +19,7 @@
;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org>
;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 ZmnSCPxj jxPCSnmZ <ZmnSCPxj@protonmail.com>
@ -138,7 +138,7 @@
("libevent" ,libevent)
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:configure-flags
(list
@ -268,14 +268,14 @@ Accounting.")
(define-public homebank
(package
(name "homebank")
(version "5.4.3")
(version "5.5.2")
(source (origin
(method url-fetch)
(uri (string-append "http://homebank.free.fr/public/homebank-"
version ".tar.gz"))
(sha256
(base32
"02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"))))
"1lhyql94zx51vcw9hlc9r26wkm2bn6jdd4xvc95j7y69wiwg77lq"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -773,7 +773,7 @@ the Monero command line client and daemon.")
`(,@(package-inputs monero)
("libgcrypt" ,libgcrypt)
("monero" ,monero)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtquickcontrols" ,qtquickcontrols)
@ -1309,7 +1309,7 @@ Trezor wallet.")
("openssl" ,openssl)
("protobuf" ,protobuf)
("qrencode" ,qrencode)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zeromq" ,zeromq)
("zlib" ,zlib)))
(arguments
@ -1422,7 +1422,7 @@ following three utilities are included with the library:
("openssl" ,openssl)
("protobuf" ,protobuf)
("qrencode" ,qrencode)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zeromq" ,zeromq)
("zlib" ,zlib)))
(arguments
@ -1496,7 +1496,7 @@ a Qt GUI.")
`(("qttools" ,qttools)))
(inputs
`(("python" ,python)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("rocksdb" ,rocksdb)
("zlib" ,zlib)))
(home-page "https://gitlab.com/FloweeTheHub/fulcrum/")
@ -1561,7 +1561,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
("libevent" ,libevent)
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)

View File

@ -56,7 +56,8 @@
(base32
"16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23"))
(file-name (git-file-name name version))
(patches (search-patches "ath9k-htc-firmware-objcopy.patch"))))
(patches (search-patches "ath9k-htc-firmware-objcopy.patch"
"ath9k-htc-firmware-gcc-compat.patch"))))
(build-system gnu-build-system)
(arguments
'(#:phases

View File

@ -333,7 +333,7 @@ RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.")
#t))))))
(inputs
`(("libusb" ,libusb)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zlib" ,zlib)))
(home-page "https://glassechidna.com.au/heimdall/")
(synopsis "Flash firmware onto Samsung mobile devices")
@ -476,7 +476,7 @@ ME as far as possible (it only edits ME firmware image files).")
"/bin"))
#t)))))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://github.com/LongSoft/UEFITool/")
(synopsis "UEFI image editor")
(description "@code{uefitool} is a graphical image file editor for

View File

@ -40,6 +40,8 @@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Paul A. Patience <paul@apatience.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -414,14 +416,15 @@ The unified Libertinus family consists of:
(define-public font-terminus
(package
(name "font-terminus")
(version "4.48")
(version "4.49.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/terminus-font/terminus-font-"
version "/terminus-font-" version ".tar.gz"))
(version-major+minor version)
"/terminus-font-" version ".tar.gz"))
(sha256
(base32 "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"))))
(base32 "0yggffiplk22lgqklfmd2c0rw8gwchynjh5kz4bz8yv2h6vw2qfr"))))
(build-system gnu-build-system)
(outputs (list "out" "pcf-8bit"))
(arguments
@ -1211,11 +1214,55 @@ later hand-tweaked with the gbdfed(1) editor:
typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
(license license:silofl1.1)))
;; When updating the version (and hash) of font-iosevka, also update the hash
;; of the Iosevka variants further below.
;; The following script downloads all Iosevka variants to the store and prints
;; their hash at the end.
#|
guix repl <<EOF
(use-modules (guix base32)
(guix download)
(guix packages)
(guix store)
(gcrypt hash)
(ice-9 string-fun)
(gnu packages fonts))
(let ((new-version "7.0.3")
(iosevka-hashes #nil)
(iosevka-fails #nil))
(for-each (lambda (font)
(let ((file (download-to-store (open-connection)
(string-replace-substring
(origin-uri (package-source font))
(package-version font)
new-version))))
(if file
(set! iosevka-hashes
(acons file (bytevector->nix-base32-string
(file-sha256 file))
iosevka-hashes))
(set! iosevka-fails (cons font iosevka-fails)))))
(list font-iosevka
font-iosevka-slab
font-iosevka-term
font-iosevka-term-slab
font-iosevka-aile
font-iosevka-curly
font-iosevka-curly-slab
font-iosevka-etoile))
(for-each (lambda (hash)
(format #t "~a: ~a~%" (car hash) (cdr hash)))
iosevka-hashes)
(for-each (lambda (fail)
(format #t "~a: failed to download latest version~%" fail))
iosevka-fails))
EOF
|#
(define-public font-iosevka
(package
(name "font-iosevka")
;; When updating, also update the hash of the Iosevka variant(s) below.
(version "4.0.3")
(version "7.0.3")
(source
(origin
(method url-fetch/zipbomb)
@ -1223,7 +1270,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
"/releases/download/v" version
"/ttc-iosevka-" version ".zip"))
(sha256
(base32 "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb"))))
(base32 "08n1c2j38vd1qrf18ilgvq6rl7z9yrsyq9ljf037yiw6zlphx4da"))))
(build-system font-build-system)
(home-page "https://be5invis.github.io/Iosevka/")
(synopsis "Coders' typeface, built from code")
@ -1231,8 +1278,8 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
"Iosevka is a slender monospace sans-serif or slab-serif typeface inspired
by Pragmata Pro, M+, and PF DIN Mono, designed to be the ideal font for
programming. Iosevka is completely generated from its source code.")
(license (list license:silofl1.1 ; build artifacts (i.e. the fonts)
license:bsd-3)))) ; supporting code
(license (list license:silofl1.1 ;build artifacts (i.e., the fonts)
license:bsd-3)))) ;supporting code
(define-public font-iosevka-slab
(package
@ -1246,7 +1293,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-slab-" version ".zip"))
(sha256
(base32 "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh"))))))
(base32 "1ggrbl8gi2hv8yiw7vw8cajlv7nkz8i975165cayyzppjlrfs3nr"))))))
(define-public font-iosevka-term
(package
@ -1260,7 +1307,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttf-iosevka-term-" version ".zip"))
(sha256
(base32 "092ygzv24wbi8cjjsmq0jkxdf4cm7wqlfj7jkn0cip7nlbyskl3h"))))
(base32 "1jmbp3hni99l92653b356nbmj45kd54kbl6c6ws1k5jxydrjglrh"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1281,7 +1328,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/"
"ttf-iosevka-term-slab-" version ".zip"))
(sha256
(base32 "157kdxrxz981ympd2iww66v50vm2cxd7z98vvb36rii94hf30k7x"))))
(base32 "19fc6jbkv0aif6ds9ddxaarz2ambzln7y6k2qjsczwlbznr8cf09"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1302,7 +1349,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-aile-" version ".zip"))
(sha256
(base32 "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc"))))))
(base32 "1bkrk4dqkj45fbaac2n61a5kwxs3bk6sdm5hanw7g2h4xb83fi8d"))))))
(define-public font-iosevka-curly
(package
@ -1316,7 +1363,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/"
"ttc-iosevka-curly-" version ".zip"))
(sha256
(base32 "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn"))))))
(base32 "12jdb38dlbwa58q0b0sf9sp1dcafzp9dcf71jf1wrlnn8047vxyx"))))))
(define-public font-iosevka-curly-slab
(package
@ -1330,7 +1377,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/"
"ttc-iosevka-curly-slab-" version ".zip"))
(sha256
(base32 "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws"))))))
(base32 "0zn21bxyj0ni4vbdarwam2piixzvkdk769vg3k4fl3h03q56cj24"))))))
(define-public font-iosevka-etoile
(package
@ -1344,21 +1391,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-etoile-" version ".zip"))
(sha256
(base32 "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx"))))))
(define-public font-iosevka-sparkle
(package
(inherit font-iosevka)
(name "font-iosevka-sparkle")
(version (package-version font-iosevka))
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/be5invis/Iosevka"
"/releases/download/v" version
"/ttc-iosevka-sparkle-" version ".zip"))
(sha256
(base32 "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx"))))))
(base32 "0lnpdvv20g2bg6rwl0gv83bkbgfmkbyfxshhpw9vprfs2g8k6lil"))))))
(define-public font-sarasa-gothic
(package
@ -2175,3 +2208,32 @@ neighborhood of Buenos Aires inspired Julieta Ulanovsky to design this
typeface and rescue the beauty of urban typography that emerged in the first
half of the twentieth century.")
(license license:silofl1.1)))
(define-public font-overpass
(package
(name "font-overpass")
(version "3.0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/RedHatOfficial/Overpass")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1pl7zpwlx0j2xv23ahnpmbb4a5d6ib2cjck5mxqzi3jjk25rk9kb"))))
(build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-webfonts
(lambda _
(delete-file-recursively "webfonts"))))))
(home-page "https://overpassfont.org")
(synopsis "Sans serif font family inspired by Highway Gothic")
(description
"Overpass is a sans-serif typeface based on the U.S. interstate highway
road signage typefaces, adapted for on-screen display and user interfaces.
Overpass includes proprotional and monospace variants.")
(license (list license:silofl1.1
license:lgpl2.1))))

View File

@ -289,7 +289,7 @@ Includes the actual FTDI connector.")
("eigen" ,eigen)
("icestorm" ,icestorm)
("python" ,python)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("yosys" ,yosys)))
(build-system cmake-build-system)
(arguments

View File

@ -2297,7 +2297,7 @@ fallback to generic Systray support if none of those are available.")
(define-public xdg-desktop-portal
(package
(name "xdg-desktop-portal")
(version "1.7.2")
(version "1.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2306,7 +2306,7 @@ fallback to generic Systray support if none of those are available.")
(file-name (git-file-name name version))
(sha256
(base32
"0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm"))))
"0pq0kmvzk56my396vh97pzw4wizwmlmzvv2kr2xv047x3044mr5n"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -2326,6 +2326,21 @@ fallback to generic Systray support if none of those are available.")
("geoclue" ,geoclue)
("pipewire" ,pipewire-0.3)
("fuse" ,fuse)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'po-chmod
(lambda _
;; Make sure 'msgmerge' can modify the PO files.
(for-each (lambda (po)
(chmod po #o666))
(find-files "po" "\\.po$"))
#t)))))
(native-search-paths
(list (search-path-specification
(variable "XDG_DESKTOP_PORTAL_DIR")
(separator #f)
(files '("share/xdg-desktop-portal/portals")))))
(home-page "https://github.com/flatpak/xdg-desktop-portal")
(synopsis "Desktop integration portal for sandboxed apps")
(description
@ -2394,7 +2409,7 @@ interfaces.")
(define-public xdg-desktop-portal-wlr
(package
(name "xdg-desktop-portal-wlr")
(version "0.3.0")
(version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2403,8 +2418,12 @@ interfaces.")
(file-name (git-file-name name version))
(sha256
(base32
"18nlkqqxgxh7k0r2nk867wnp2nmaiinl6z67lrfv7rmiym0x82p8"))))
"13fbzh8bjnhk4xs8j9bpc01q3hy27zpbf0gkk1fnh3hm5pnyfyiv"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
'("-Dsystemd=disabled"
"-Dsd-bus-provider=libelogind")))
(native-inputs
`(("cmake" ,cmake)
("pkg-config" ,pkg-config)))
@ -2412,6 +2431,7 @@ interfaces.")
`(("elogind" ,elogind)
("iniparser" ,iniparser)
("pipewire" ,pipewire-0.3)
("inih" ,libinih)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(home-page "https://github.com/emersion/xdg-desktop-portal-wlr")

View File

@ -66,6 +66,7 @@
#:use-module (gnu packages fribidi)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
@ -460,7 +461,7 @@ support.")
"1prajkx1xpp3csa0xpkrn3c2cnzvmwzxgrqb9d3gqszp3sllr2dg"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("zlib" ,zlib)))
@ -493,7 +494,7 @@ clone.")
(define-public tsukundere
(package
(name "tsukundere")
(version "0.3.0")
(version "0.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -502,7 +503,7 @@ clone.")
(file-name (git-file-name name version))
(sha256
(base32
"06jiaylbnx8khicsaq2gwnd8wspjhjymbb5z6x5445krklk0jx18"))))
"13p9inz7jj3hm2lmx4p0lhva4ng1m148pjzhq12ybc4kk139i75b"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 match)
@ -546,6 +547,7 @@ clone.")
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
@ -1106,7 +1108,7 @@ to create fully featured games and multimedia programs in the python language.")
(define-public python2-pygame-sdl2
(let ((real-version "2.1.0")
(renpy-version "7.4.4"))
(renpy-version "7.4.5"))
(package
(inherit python2-pygame)
(name "python2-pygame-sdl2")
@ -1116,7 +1118,7 @@ to create fully featured games and multimedia programs in the python language.")
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz"))
(sha256 (base32 "1lj5c3kfnl8s824j3hs47dg3g5rlabscmwrbb0lgpyy4633pv9ka"))
(sha256 (base32 "03jqg4lniazqrm40v2fy4z1a16qzs037r22qavzb6bh7kcmg1ydy"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1159,13 +1161,13 @@ developed mainly for Ren'py.")
(define-public python2-renpy
(package
(name "python2-renpy")
(version "7.4.4")
(version "7.4.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" version
"/renpy-" version "-source.tar.bz2"))
(sha256 (base32 "1cbbvsk1snjrsh59blb8q2h86555gi23pylmwlnk9dx0jxckdi21"))
(sha256 (base32 "0a7lwijmj9l3sjdmxgwvvlx28byws3z9cq94l417bi6r7f6pcxam"))
(modules '((guix build utils)))
(patches
(search-patches
@ -1609,7 +1611,7 @@ of use.")
("mygui" ,mygui-gl) ; OpenMW does not need Ogre.
("openal" ,openal)
("openscenegraph" ,openmw-openscenegraph)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sdl" ,sdl2)
("unshield" ,unshield)))
(synopsis "Re-implementation of the RPG Morrowind engine")
@ -2428,7 +2430,7 @@ utilities frequently used in roguelikes.")
("mesa" ,mesa)
("openal" ,openal)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("sdl2" ,sdl2)
("uuid.h" ,util-linux "lib")

View File

@ -928,7 +928,7 @@ want what you have.")
("pkg-config" ,pkg-config)))
(inputs
`(("protobuf" ,protobuf)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)
("qttools" ,qttools)
@ -2414,7 +2414,7 @@ and defeat them with your bubbles!")
("luajit" ,luajit)
("openal" ,openal)
("physfs" ,physfs)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf)))))
(home-page "https://www.solarus-games.org/")
(synopsis "Lightweight game engine for Action-RPGs")
@ -5179,7 +5179,7 @@ in-window at 640x480 resolution or fullscreen.")
("miniupnpc" ,miniupnpc)
("openal" ,openal)
("physfs" ,physfs)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
("openssl" ,openssl)
("sdl2" ,sdl2)
@ -7139,7 +7139,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(mkdir-p (string-append out "/lib"))
(mkdir-p (string-append out "/bin"))
;; The yamagi-quake2 binary must be in the same directory
;; as it's engine libraries, but symlinking it to /bin is okay
;; as its engine libraries, but symlinking it to /bin is okay.
;; https://github.com/yquake2/yquake2/blob/master/stuff/packaging.md
(copy-recursively "release"
(string-append out "/lib/yamagi-quake2"))
@ -7233,7 +7233,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
;; with multiple "QPainter:: ... Painter not active" warnings.
#:tests? #f))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(native-inputs
`(("cmake" ,cmake-minimal)
@ -8950,7 +8950,7 @@ a fortress beyond the forbidden swamp.")
("mesa" ,mesa)
("miniupnpc" ,miniupnpc)
("openal" ,openal)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("readline" ,readline)
("sdl" ,sdl2)
("tinyxml" ,tinyxml)
@ -9284,7 +9284,7 @@ and also provides the base for the FlightGear Flight Simulator.")
("openal" ,openal)
("openscenegraph" ,openscenegraph-3.4)
("plib" ,plib)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("simgear" ,simgear)
@ -9411,7 +9411,7 @@ play with up to four players simultaneously. It has network support.")
("libpng" ,libpng)
("lua" ,lua-5.1)
("physfs" ,physfs)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sdl" ,(sdl-union
(list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))))
(native-inputs
@ -10096,7 +10096,7 @@ remake of that series or any other game.")
("ocl-icd" ,ocl-icd)
("openblas" ,openblas)
("opencl-headers" ,opencl-headers)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zlib" ,zlib)))
(arguments
'(#:configure-flags '("-DUSE_BLAS=YES")
@ -10139,7 +10139,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)))
(arguments
@ -10231,7 +10231,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("python" ,python-wrapper)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
@ -10279,7 +10279,7 @@ This package is part of the KDE games module.")
("knewstuff" ,knewstuff)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10318,7 +10318,7 @@ This package is part of the KDE games module.")
("kxmlgui" ,kxmlgui)
("ktextwidgets" ,ktextwidgets)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Miniature golf game")
@ -10362,7 +10362,7 @@ This package is part of the KDE games module.")
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
(synopsis "Shared library for kmahjongg and kshisen")
@ -10395,7 +10395,7 @@ other Mah Jongg like games.")
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("libkmahjongg" ,libkmahjongg)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10438,7 +10438,7 @@ This package is part of the KDE games module.")
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("libkmahjongg" ,libkmahjongg)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Shisen-Sho solitaire game")
@ -10483,7 +10483,7 @@ This package is part of the KDE games module.")
("python" ,python)
("python-twisted" ,python-twisted)
("python-pyqt" ,python-pyqt)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
(synopsis "Classical Mah Jongg game for 4 players")
@ -10526,7 +10526,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Breakout like game")
@ -10565,7 +10565,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Classical mine sweeper game")
@ -10602,7 +10602,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10642,7 +10642,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10681,7 +10681,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10725,7 +10725,7 @@ This package is part of the KDE games module.")
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("glu" ,glu)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10782,7 +10782,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Place 5 equal pieces together, but wait, there are 3 new ones")
@ -10826,7 +10826,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Action and puzzle solving game")
@ -10870,7 +10870,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Three-in-a-row game")
@ -10906,7 +10906,7 @@ This package is part of the KDE games module.")
("ki18n" ,ki18n)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10946,7 +10946,7 @@ This package is part of the KDE games module.")
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -10988,7 +10988,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Turn the board pieces to get all computers connected")
@ -11027,7 +11027,7 @@ This package is part of the KDE games module.")
("ki18n" ,ki18n)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Arcade bombing game")
@ -11072,7 +11072,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11109,7 +11109,7 @@ This package is part of the KDE games module.")
("libkdegames" ,libkdegames)
("phonon" ,phonon)
("qca" ,qca)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("zlib" ,zlib)))
@ -11171,7 +11171,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("shared-mime-info" ,shared-mime-info)))
@ -11213,7 +11213,7 @@ This package is part of the KDE games module.")
("kiconthemes" ,kiconthemes)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Yahtzee dice game")
@ -11253,7 +11253,7 @@ This package is part of the KDE games module.")
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11299,7 +11299,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11340,7 +11340,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11379,7 +11379,7 @@ This package is part of the KDE games module.")
("ki18n" ,ki18n)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11419,7 +11419,7 @@ This package is part of the KDE games module.")
("ki18n" ,ki18n)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11453,7 +11453,7 @@ This package is part of the KDE games module.")
("ki18n" ,ki18n)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11493,7 +11493,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Port of the classic BSD console game robots")
@ -11535,7 +11535,7 @@ This package is part of the KDE games module.")
("ki18n" ,ki18n)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11573,7 +11573,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Simple ball dodging game")
@ -11614,7 +11614,7 @@ This package is part of the KDE games module.")
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Battleship board game with built-in game server")
@ -11654,7 +11654,7 @@ This package is part of the KDE games module.")
("kio" ,kio)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11696,7 +11696,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://games.kde.org/")
(synopsis "Dots and Boxes game")
@ -11733,7 +11733,7 @@ This package is part of the KDE games module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("libkdegames" ,libkdegames)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -11896,7 +11896,7 @@ and chess engines.")
(native-inputs
`(("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("qtspeech" ,qtspeech)
("qtsvg" ,qtsvg)
@ -12227,7 +12227,7 @@ game.") ;thanks to Debian for description
("libgcrypt" ,libgcrypt)
("libircclient" ,libircclient)
("protobuf" ,protobuf-2) ; remove package when no longer needed
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sdl" ,(sdl-union (list sdl sdl-mixer)))
("sqlite" ,sqlite)
("tinyxml" ,tinyxml)

View File

@ -551,7 +551,8 @@ It also includes runtime support libraries for these languages.")))
(base32
"0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"))
(patches (search-patches "gcc-8-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))))))
"gcc-5.0-libvtv-runpath.patch"
"gcc-8-sort-libtool-find-output.patch"))))))
(define-public gcc-9
(package

View File

@ -1247,7 +1247,7 @@ map display. Downloads map data from a number of websites, including
("libpng" ,libpng)
("openjpeg" ,openjpeg)
("proj.4" ,proj.4)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zlib" ,zlib)))
(synopsis "Weather Forecast Visualization")
(description
@ -1663,7 +1663,7 @@ using the dataset of topographical information collected by
`(("gdal" ,gdal)
("libjpeg-turbo" ,libjpeg-turbo)
("proj" ,proj)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtlocation" ,qtlocation)
("qtwebchannel" ,qtwebchannel)
@ -2282,7 +2282,7 @@ growing set of geoscientific methods.")
("python-urllib3" ,python-urllib3)
("qca" ,qca)
("qscintilla" ,qscintilla)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtkeychain" ,qtkeychain)
("qtlocation" ,qtlocation)

View File

@ -2721,7 +2721,7 @@ and how they are displayed (View).")
(define-public gtg
(package
(name "gtg")
(version "0.4")
(version "0.5")
(source
(origin
(method git-fetch)
@ -2730,7 +2730,7 @@ and how they are displayed (View).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0r28vyr88rj3kd3cg4gj7sd29wadjchi92wzmbx67d4hlg25h8kk"))))
(base32 "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -2757,10 +2757,13 @@ and how they are displayed (View).")
("gtk+:bin" ,gtk+ "bin")
("pkg-config" ,pkg-config)))
(inputs
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
`(("gdk-pixbuf" ,gdk-pixbuf+svg)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("pango" ,pango)
("python-dbus" ,python-dbus)
("python-liblarch" ,python-liblarch)
("python-lxml" ,python-lxml)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
("python-pyxdg" ,python-pyxdg)))
@ -4084,14 +4087,14 @@ Hints specification (EWMH).")
(define-public goffice
(package
(name "goffice")
(version "0.10.49")
(version "0.10.50")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/goffice/"
(version-major+minor version) "/"
"goffice-" version ".tar.xz"))
(sha256
(base32 "1s87ngs3g3nfvcn96aq4lgzx5cscbfg4n9f6ns2zpvc5ngdiiz2z"))))
(base32 "1p5zbj7cbcfcxd6l8pnph54p6ah1bwf146y810j4bcq8ggf3sp1c"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 4.0 MiB of gtk-doc
@ -4148,7 +4151,7 @@ Hints specification (EWMH).")
(define-public gnumeric
(package
(name "gnumeric")
(version "1.12.49")
(version "1.12.50")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnumeric/"
@ -4156,7 +4159,7 @@ Hints specification (EWMH).")
"gnumeric-" version ".tar.xz"))
(sha256
(base32
"0mzdhhpa7kwkc51l344g6vgqwaxkjdf03s7zasqh0bn3jpn75h4i"))))
"1f0lrj5msg80pgjp38jj6rddf352gwddgip7z4lki66n3fx1k23m"))))
(build-system glib-or-gtk-build-system)
(arguments
`(;; The gnumeric developers don't worry much about failing tests.
@ -4209,7 +4212,7 @@ engineering.")
(define-public drawing
(package
(name "drawing")
(version "0.6.5")
(version "0.8.0")
(source
(origin
(method git-fetch)
@ -4218,7 +4221,7 @@ engineering.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1kfgmalakifcvzhzss9zhmqjbdk24zr22c5xwkkahlvfcafp13wn"))))
(base32 "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -11956,7 +11959,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(define-public komikku
(package
(name "komikku")
(version "0.29.0")
(version "0.29.2")
(source
(origin
(method git-fetch)
@ -11966,7 +11969,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version))
(sha256
(base32
"1sirwgny1s6jv9rb0lildqv4p7nfa15rvw957pwxnvrjasxyf6bq"))))
"0g1whk0y3k1cy6ix20gz226ww1vzpb9hinn5d24z6j38mdgqqa5l"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -11999,6 +12002,7 @@ integrated profiler via Sysprof, debugging support, and more.")
("libsecret" ,libsecret)
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-brotli" ,python-brotli)
("python-cloudscraper" ,python-cloudscraper)
("python-dateparser" ,python-dateparser)
("python-keyring" ,python-keyring)
("python-lxml" ,python-lxml)

View File

@ -410,7 +410,7 @@ and every application benefits from this.")
,@(package-native-inputs gpgme)))
(inputs
`(("gpgme" ,gpgme)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
,@(package-inputs gpgme)))
(synopsis "Qt API bindings for gpgme")
(description "QGpgme provides a very high level Qt API around GpgMEpp.
@ -863,7 +863,7 @@ software.")))
(arguments
`(#:configure-flags '("--enable-fallback-curses")))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
,@(package-inputs pinentry-tty)))
(description
"Pinentry provides a console and a Qt GUI that allows users to enter a

View File

@ -1276,14 +1276,19 @@ from forcing GEXP-PROMISE."
(pulseaudio (assoc-ref inputs "pulseaudio"))
(pulseaudio-lib (string-append pulseaudio "/lib"))
(libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
(libxscrnsaver-lib (string-append libxscrnsaver "/lib")))
(libxscrnsaver-lib (string-append libxscrnsaver "/lib"))
(mit-krb5 (assoc-ref inputs "mit-krb5"))
(mit-krb5-lib (string-append mit-krb5 "/lib")))
(wrap-program (car (find-files lib "^icecat$"))
`("XDG_DATA_DIRS" prefix (,gtk-share))
;; The following line is commented out because the icecat
;; package on guix has been observed to be unstable when
;; using wayland, and the bundled extensions stop working.
;; `("MOZ_ENABLE_WAYLAND" = ("1"))
`("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,mesa-lib ,libxscrnsaver-lib)))
`("LD_LIBRARY_PATH" prefix (,pulseaudio-lib
,mesa-lib
,libxscrnsaver-lib
,mit-krb5-lib)))
#t))))))
(home-page "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox")

View File

@ -141,7 +141,7 @@ locally for later listening.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("qt" ,qtbase)))
`(("qt" ,qtbase-5)))
(arguments
`(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON")
;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446

View File

@ -85,7 +85,7 @@
(inputs
`(("expat" ,expat)
("libusb" ,libusb)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zlib" ,zlib)))
(native-inputs
`(("which" ,which)
@ -207,7 +207,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
(string-append "PREFIX="
(assoc-ref outputs "out"))))))))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(native-inputs
`(("qttools" ,qttools)))
(home-page "https://www.gpxsee.org")
@ -246,7 +246,7 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.")
("python-pygobject" ,python-pygobject)
("python-pyserial" ,python-pyserial)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:scons-flags
(list (string-append "prefix=" %output)

View File

@ -826,8 +826,8 @@ exception-handling library.")
(define-public lib2geom
;; Use the latest master commit, as the 1.0 release suffer build problems.
(let ((revision "3")
(commit "17e0d21f0afc8489656f9184bff7ad024a42394a"))
(let ((revision "4")
(commit "b29d60e49a58f4e8069544b44863b1a623e4ee59"))
(package
(name "lib2geom")
(version (git-version "1.0" revision commit))
@ -839,7 +839,7 @@ exception-handling library.")
(file-name (git-file-name name version))
(sha256
(base32
"0waskrmdrrdjw8pr5cvlkrxywgf376viggpc2jzdqxxpy2k78fpr"))
"0xd8f3cgfnipdav4w8j54r7hzy9f3m7xk42ppcfhdjz2hriggyk6"))
(patches
;; Patch submitted to upstream (see:
;; https://gitlab.com/inkscape/lib2geom/-/merge_requests/32).
@ -1500,7 +1500,7 @@ exec -a \"$0\" ~a/.brdf-real~%"
(native-inputs
`(("qttools" ,qttools))) ;for 'qmake'
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("mesa" ,mesa)
("glew" ,glew)
("freeglut" ,freeglut)
@ -1936,7 +1936,7 @@ Automated palette selection is supported.")
("libvpx" ,libvpx)
("libxi" ,libxi)
;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtkeychain" ,qtkeychain)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)

View File

@ -767,7 +767,7 @@ model to base your own plug-in on, here it is.")
("openssl" ,openssl)
("opus" ,opus)
("orc" ,orc)
;("qtbase" ,qtbase)
;("qtbase" ,qtbase-5)
;("qtdeclarative" ,qtdeclarative)
;("qtx11extras" ,qtx11extras)
("soundtouch" ,soundtouch)

View File

@ -1370,7 +1370,7 @@ microblogging service.")
(define-public guile-parted
(package
(name "guile-parted")
(version "0.0.4")
(version "0.0.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1379,7 +1379,7 @@ microblogging service.")
(file-name (git-file-name name version))
(sha256
(base32
"0b7h8psfm9gmmwb65pp5zwzglvwnfmw5j40g09hhf3f7kwxc0mv2"))
"1ar6n38br3h1jm54yy6d54rpqdgsy7pmnj3nqdzqrfk8z0kx0rm9"))
(modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments

View File

@ -707,7 +707,7 @@ including 2D color images.")
("qttools" ,qttools)))
(inputs
`(("gmic" ,gmic)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
,@(package-inputs gmic)))
(synopsis "Qt frontend for the G'MIC image processing framework")
(license license:gpl3+)))
@ -1035,7 +1035,7 @@ combine the information contained in both.")
;; not with 4.13. It really needs to be 4.12.
("itk" ,insight-toolkit-4.12)
("vtk" ,vtk-6)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("vxl" ,vxl-1)
("zlib" ,zlib)))
@ -1162,7 +1162,7 @@ substituted by matching images.")
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("zlib" ,zlib)))
(arguments

View File

@ -358,7 +358,7 @@ It supports JPEG, PNG and GIF formats.")
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit)
@ -527,7 +527,7 @@ For PDF support, install the @emph{mupdf} package.")
(("updateText\\(\\);") ""))
#t)))))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("qtimageformats" ,qtimageformats)))
(home-page "https://interversehq.com/qview/")
@ -733,7 +733,7 @@ to set X desktop background.")
("opencv" ,opencv)
("python" ,python-wrapper)
("quazip" ,quazip)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(native-inputs
`(("pkg-config" ,pkg-config)

View File

@ -1834,7 +1834,7 @@ parsing, viewing, modifying, and saving this metadata.")
(native-inputs
`(("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(arguments
`(#:tests? #f)) ;no tests
@ -2177,7 +2177,7 @@ by AOM, including with alpha.")
(define-public libheif
(package
(name "libheif")
(version "1.11.0")
(version "1.12.0")
(source
(origin
(method git-fetch)
@ -2186,7 +2186,7 @@ by AOM, including with alpha.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "036n63vlk4sk7y25q2kzyvvw4r5vv323ysbmbrcaprg9hdyjqgf5"))))
(base32 "0cp2d216hp7gw3n56x3g5q5n8jb9ganyanrlibxw8fw16il8nca6"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no test target although there is a tests folder

View File

@ -117,19 +117,20 @@ apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
as the native format.")
(license license:gpl2+)))
(define-public inkscape-1.0
(define-public inkscape-1.1
(package
(name "inkscape")
(version "1.0.2")
(version "1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://media.inkscape.org/dl/"
"resources/file/"
"inkscape-" version ".tar.xz"))
(patches (search-patches "inkscape-1.1-fix-build-witch-gcc7.5.patch"))
(sha256
(base32
"12krl97a00gdcxxibsb7g2lgx5458mhx2437x0hvz350242j6gns"))
"1rlm2wqg8bgdxkdvnadh49wfp0mrbrk7d8n4vdcjyw6z7z7firki"))
(modules '((guix build utils)
(ice-9 format)))
(snippet
@ -188,7 +189,7 @@ endif()~%~%"
(string-append "#include " quote
(basename source-dir)))
...))))))
(unbundle ("2geom" "src/2geom" #t)
(unbundle ("2geom" "src/3rdparty/2geom" #t)
;; libcroco cannot be unbundled as it is heavily
;; modified (see:
;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904).

View File

@ -7,7 +7,7 @@
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 20172021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2021 WinterHound <winterhound@yandex.com>
@ -35,8 +35,8 @@
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (gnu packages)
@ -74,6 +74,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages regex)
#:use-module (gnu packages ruby)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages qt)
#:use-module (gnu packages tcl)
@ -130,7 +131,7 @@
`(("inxi" ,inxi-minimal)
("libdbusmenu-qt" ,libdbusmenu-qt)
("qca" ,qca)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("qtscript" ,qtscript)
("qtsvg" ,qtsvg)
@ -189,14 +190,14 @@ SILC and ICB protocols via plugins.")
(define-public weechat
(package
(name "weechat")
(version "3.1")
(version "3.2")
(source (origin
(method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz"))
(sha256
(base32
"1xx4fx7785yw3ml3k1z08h3qvrizvcypwl0j6jc7d7qim9sjjnm5"))))
"1a47knznlm9f2f83d71s3c4fm50m6iq6iq1bvp4m61p8fkrsva1r"))))
(build-system cmake-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -241,7 +242,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(define-public srain
(package
(name "srain")
(version "1.1.3")
(version "1.2.2")
(source
(origin
(method git-fetch)
@ -250,22 +251,17 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1vqjjsxzc4601dpc8lf9k25rp2c7sjab7l5a6cbfygpr8dqvm6vq"))))
(base32 "04bgfyrl5swppsqmhzmjnnj2q7844k99f3894ank8v8fr3y6x78p"))))
(build-system meson-build-system)
(arguments
`(#:tests? #f ;there are no tests
#:phases
(modify-phases %standard-phases
(add-before 'install 'fix-permissions
;; Make po folder writable for gettext to install translations.
(lambda _
(for-each make-file-writable
(find-files "po" "." #:directories? #t)))))))
(build-system glib-or-gtk-build-system)
#:glib-or-gtk? #t))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
("python" ,python-wrapper)
("python-sphinx" ,python-sphinx)))
(inputs
`(("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)

271
gnu/packages/irods.scm Normal file
View File

@ -0,0 +1,271 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; 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 irods)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages databases)
#:use-module (gnu packages gcc)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages logging)
#:use-module (gnu packages man)
#:use-module (gnu packages networking)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages serialization)
#:use-module (gnu packages tls)
#:use-module (srfi srfi-1))
(define-public irods
(package
(name "irods")
(version "4.2.8")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/irods/irods/releases/download/"
version "/irods-" version ".tar.gz"))
(sha256
(base32
"0ny54c3r0j692rvbr4iibg7xgd2i7g9x8yyrw04j889bywix14rc"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list
"-DCMAKE_BUILD_TYPE=Release"
(string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
(string-append "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
(string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
;; Configuration aborts if no generator format is set
"-DCPACK_GENERATOR=TGZ"
;; Configuration attempts to guess the distribution with Python.
"-DIRODS_LINUX_DISTRIBUTION_NAME=guix"
"-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1"
(string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG="
(assoc-ref %build-inputs "clang"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME="
(assoc-ref %build-inputs "clang-runtime"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ="
(assoc-ref %build-inputs "cppzmq"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE="
(assoc-ref %build-inputs "libarchive"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_AVRO="
(assoc-ref %build-inputs "avro-cpp"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_BOOST="
(assoc-ref %build-inputs "boost"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_ZMQ="
(assoc-ref %build-inputs "zeromq"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_JSON="
(assoc-ref %build-inputs "json"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_CATCH2="
(assoc-ref %build-inputs "catch2"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_NANODBC="
(assoc-ref %build-inputs "nanodbc"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_FMT="
(assoc-ref %build-inputs "fmt")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unset-Werror
(lambda _
;; -Werror kills the build due to a comparison REQUIRE(errs.size() == err->len);
;; in unit_tests/src/test_irods_lifetime_manager.cpp
(substitute* "CMakeLists.txt"
(("-Werror") ""))))
(add-after 'unpack 'remove-FHS-and-prefix-assumptions
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("CMakeLists.txt"
"cmake/server.cmake"
"cmake/development_library.cmake"
"cmake/runtime_library.cmake")
(("usr/") ""))
(substitute* "lib/core/src/irods_default_paths.cpp"
(("path.append\\(\"usr\"\\)") "path")
(("path.remove_filename\\(\\).remove_filename\\(\\).remove_filename\\(\\)")
"path.remove_filename().remove_filename()"))
(substitute* "scripts/irods/paths.py"
(("'usr', 'lib', 'irods'") "'lib', 'irods'"))
(substitute* "scripts/irods/pypyodbc.py"
(("\"/usr/lib/libodbc.so\"")
(string-append (assoc-ref inputs "unixodbc") "/lib/libodbc.so")))))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons* (string-append (assoc-ref inputs "libcxx+libcxxabi")
"/include/c++/v1")
(string-append (assoc-ref inputs "catch2")
"/include/catch2")
(string-append (assoc-ref inputs "json")
"/include/nlohmann")
;; Hide GCC's C++ headers so that they do not interfere with
;; the Clang headers.
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(inputs
`(("avro-cpp" ,avro-cpp-1.9-for-irods)
("boost" ,boost-for-irods)
("cppzmq" ,cppzmq)
("fmt" ,fmt-for-irods)
("json" ,json-modern-cxx)
("libarchive" ,libarchive)
("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi
("linux-pam" ,linux-pam)
("mit-krb5" ,mit-krb5)
("nanodbc" ,nanodbc-for-irods)
("openssl" ,openssl)
("python" ,python-wrapper)
("unixodbc" ,unixodbc)
("zeromq" ,zeromq)))
(native-inputs
`(("catch2" ,catch-framework2)
("clang" ,clang-toolchain-6)
("clang-runtime" ,clang-runtime-6)
("libcxx+libcxxabi" ,libcxx+libcxxabi-6)))
(home-page "https://irods.org")
(synopsis "Data management software")
(description "The Integrated Rule-Oriented Data System (iRODS) is data
management software. iRODS virtualizes data storage resources, so users can
take control of their data, regardless of where and on what device the data is
stored.")
(license license:bsd-3)))
(define-public irods-client-icommands
(package
(name "irods-client-icommands")
(version "4.2.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/irods/irods_client_icommands")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"069n647p5ypf44gim8z26mwayg5lzgk7r9qyyqd8f9n7h0p4jxpn"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #false ; not clear how to run tests
#:configure-flags
(list
"-DCMAKE_BUILD_TYPE=Release"
;; Configuration attempts to guess the distribution with Python.
"-DIRODS_LINUX_DISTRIBUTION_NAME=guix"
"-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1"
(string-append "-DIRODS_DIR="
(assoc-ref %build-inputs "irods")
"/lib/irods/cmake")
(string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG="
(assoc-ref %build-inputs "clang"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME="
(assoc-ref %build-inputs "clang-runtime"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ="
(assoc-ref %build-inputs "cppzmq"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE="
(assoc-ref %build-inputs "libarchive"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_AVRO="
(assoc-ref %build-inputs "avro-cpp"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_BOOST="
(assoc-ref %build-inputs "boost"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_ZMQ="
(assoc-ref %build-inputs "zeromq"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_JSON="
(assoc-ref %build-inputs "json"))
(string-append "-DIRODS_EXTERNALS_FULLPATH_FMT="
(assoc-ref %build-inputs "fmt")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unset-Werror ;
(lambda _ ;
;; -Werror kills the build due to a deprecation warning
(substitute* "CMakeLists.txt" ;
(("-Werror") ""))))
(add-after 'unpack 'remove-/usr-prefix
(lambda _
(substitute* "CMakeLists.txt"
(("usr/") ""))))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons* (string-append (assoc-ref inputs "libcxx+libcxxabi")
"/include/c++/v1")
(string-append (assoc-ref inputs "json")
"/include/nlohmann")
;; Hide GCC's C++ headers so that they do not interfere with
;; the Clang headers.
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(inputs
`(("avro-cpp" ,avro-cpp-1.9-for-irods)
("boost" ,boost-for-irods)
("cppzmq" ,cppzmq)
("fmt" ,fmt-for-irods)
("irods" ,irods)
("json" ,json-modern-cxx)
("libarchive" ,libarchive)
("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi
("mit-krb5" ,mit-krb5)
("openssl" ,openssl)
("zeromq" ,zeromq)))
(native-inputs
`(("clang" ,clang-toolchain-6)
("clang-runtime" ,clang-runtime-6)
("libcxx+libcxxabi" ,libcxx+libcxxabi-6)
("help2man" ,help2man)
("which" ,which)))
(home-page "https://irods.org")
(synopsis "Data management software")
(description "The Integrated Rule-Oriented Data System (iRODS) is data
management software. iRODS virtualizes data storage resources, so users can
take control of their data, regardless of where and on what device the data is
stored.")
(license license:bsd-3)))

View File

@ -62,13 +62,11 @@
#:use-module (guix packages)
#:use-module (guix utils))
(define %jami-version "20210326.1.cfba013")
(define %jami-version "20210606.1.e2f9490")
(define* (jami-source #:key keep-contrib-patches?)
"Return an origin object of the tarball release sources archive of Jami.
When KEEP-CONTRIB-PATCHES? is #t, do not completely remove the contrib
subdirectory, which contains patches to be applied to some of the dependencies
of Jami."
(define %jami-sources
;; Return an origin object of the tarball release sources archive of the
;; Jami project.
(origin
(method url-fetch)
(uri (string-append "https://dl.jami.net/release/tarballs/jami_"
@ -79,11 +77,9 @@ of Jami."
`(begin
;; Delete multiple MiBs of bundled tarballs. The contrib directory
;; contains the custom patches for pjproject and other libraries used
;; by Savoir-faire Linux.
(if ,keep-contrib-patches?
(delete-file-recursively "daemon/contrib/tarballs")
(delete-file-recursively "daemon/contrib"))
;; Remove code from unused Jami clients.
;; by Jami.
(delete-file-recursively "daemon/contrib/tarballs")
;; Remove the git submodule directories of unused Jami clients.
(for-each delete-file-recursively '("client-android"
"client-electron"
"client-ios"
@ -91,20 +87,16 @@ of Jami."
"client-uwp"))))
(sha256
(base32
"1h0avma8bdzyznkz39crjyv2888bii4f49md15jg7970dyp5pdyz"))))
"1vpxv2dk3l9cahv6mxd2754pxs9mzrid5bgwvl6k1byzpq8y4smr"))))
(define %sfl-patches (jami-source #:keep-contrib-patches? #t))
(define %jami-sources (jami-source))
;; Savoir-faire Linux maintains a set of patches for some key dependencies
;; (currently pjproject and ffmpeg) of Jami that haven't yet been integrated
;; upstream. This procedure simplifies the process of applying these patches.x
(define jami-apply-dependency-patches
;; Jami maintains a set of patches for some key dependencies (currently
;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream.
;; This procedure simplifies the process of applying them.
(define jami-apply-custom-patches
'(lambda* (#:key inputs dep-name patches)
(let ((patches-directory "sfl-patches"))
(let ((patches-directory "patches"))
(mkdir-p patches-directory)
(invoke "tar" "-xvf" (assoc-ref inputs "sfl-patches")
(invoke "tar" "-xvf" (assoc-ref inputs "jami-sources")
"-C" patches-directory
"--strip-components=5"
(string-append "ring-project/daemon/contrib/src/"
@ -136,7 +128,7 @@ of Jami."
"pjproject-correct-the-cflags-field.patch"
"pjproject-fix-pkg-config-ldflags.patch"))))
(native-inputs
`(("sfl-patches" ,%sfl-patches)
`(("jami-sources" ,%jami-sources)
,@(package-native-inputs pjproject)))
(arguments
(substitute-keyword-arguments (package-arguments pjproject)
@ -144,7 +136,7 @@ of Jami."
`(modify-phases ,phases
(add-after 'make-source-files-writable 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
(,jami-apply-dependency-patches
(,jami-apply-custom-patches
#:inputs inputs
#:dep-name "pjproject"
#:patches
@ -166,7 +158,8 @@ of Jami."
"0015-update-local-preference-for-peer-reflexive-candidate"
"0016-use-addrinfo-instead-CFHOST"
"0017-CVE-2020-15260"
"0018-CVE-2021-21375"))))))))))
"0018-CVE-2021-21375"
"0019-ignore-down-interfaces"))))))))))
;; The following variables are configure flags used by ffmpeg-jami. They're
;; from the ring-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to
@ -387,7 +380,7 @@ of Jami."
(package/inherit ffmpeg
(name "ffmpeg-jami")
(native-inputs
`(("sfl-patches" ,%sfl-patches)
`(("jami-sources" ,%jami-sources)
("libiconv" ,libiconv)
,@(package-native-inputs ffmpeg)))
(supported-systems '("x86_64-linux" "i686-linux"
@ -405,19 +398,15 @@ of Jami."
(for-each make-file-writable (find-files "."))))
(add-after 'unpack 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
(let ((jami-apply-dependency-patches
,jami-apply-dependency-patches))
;; These patches come from:
;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak".
(jami-apply-dependency-patches
#:inputs inputs
#:dep-name "ffmpeg"
#:patches
'("remove-mjpeg-log"
"change-RTCP-ratio"
"rtp_ext_abs_send_time"
"libopusdec-enable-FEC"
"libopusenc-enable-FEC"))))))))))))
;; These patches come from:
;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak".
(,jami-apply-custom-patches
#:inputs inputs #:dep-name "ffmpeg"
#:patches '("remove-mjpeg-log"
"change-RTCP-ratio"
"rtp_ext_abs_send_time"
"libopusdec-enable-FEC"
"libopusenc-enable-FEC")))))))))))
(define-public libring
(package
@ -486,7 +475,7 @@ protocols, as well as decentralized calling using P2P-DHT.")
`(("libring" ,libring)
("network-manager" ,network-manager)))
(propagated-inputs
`(("qtbase" ,qtbase))) ; Qt is included in several installed headers.
`(("qtbase" ,qtbase-5))) ; Qt is included in several installed headers.
(arguments
`(#:tests? #f ; There is no testsuite.
#:configure-flags
@ -579,28 +568,16 @@ decentralized calling using P2P-DHT.")
(package
(name "jami-qt") ;to be renamed 'jami' at some point
(version %jami-version)
;; The Qt client code is not yet part of the release tarball; fetch it
;; from git for now.
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.jami.net/savoirfairelinux/jami-client-qt.git")
(commit "ae21c17da5e8f730ae3895ccbc4da8047e3be1eb")))
(file-name (git-file-name name version))
(sha256
(base32
"1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp"))))
(source %jami-sources)
(build-system qt-build-system)
(outputs '("out" "debug"))
(arguments
`(#:tests? #f ;no test suite
;; TODO: Uncomment after switching back to the tarball source.
;; #:phases
;; (modify-phases %standard-phases
;; (add-after 'unpack 'change-directory
;; (lambda _
;; (chdir "client-qt"))))
))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "client-qt"))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)

View File

@ -16,6 +16,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2432,14 +2433,16 @@ new Date();"))
(package
(inherit openjdk12)
(name "openjdk")
(version "13.0")
(version "13.0.7")
(source (origin
(method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2")
(file-name (string-append name "-" version ".tar.bz2"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/openjdk/jdk13u")
(commit (string-append "jdk-" version "-ga"))))
(file-name (git-file-name name version))
(sha256
(base32
"0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq"))
"0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
(modules '((guix build utils)))
(snippet
`(begin
@ -2474,14 +2477,16 @@ new Date();"))
(package
(inherit openjdk13)
(name "openjdk")
(version "14.0")
(version "14.0.2")
(source (origin
(method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2")
(file-name (string-append name "-" version ".tar.bz2"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/openjdk/jdk14u")
(commit (string-append "jdk-" version "-ga"))))
(file-name (git-file-name name version))
(sha256
(base32
"0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch"))
"07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"))
(modules '((guix build utils)))
(snippet
`(begin
@ -2516,6 +2521,67 @@ new Date();"))
("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/14")))
(define-public openjdk15
(package
(inherit openjdk14)
(name "openjdk")
(version "15.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openjdk/jdk15u")
(commit (string-append "jdk-" version "-ga"))))
(file-name (git-file-name name version))
(sha256
(base32
"168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"))))
(native-inputs
`(("autoconf" ,autoconf)
("openjdk14:jdk" ,openjdk14 "jdk")
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/15")))
(define-public openjdk16
(package
(inherit openjdk15)
(name "openjdk")
(version "16.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openjdk/jdk16u")
(commit (string-append "jdk-" version "-ga"))))
(file-name (git-file-name name version))
(sha256
(base32
"1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f"))))
(native-inputs
`(("autoconf" ,autoconf)
("openjdk15:jdk" ,openjdk15 "jdk")
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(arguments
(substitute-keyword-arguments (package-arguments openjdk15)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'make-templates-writable
(lambda _
;; The build system copies a few .template files from the
;; source directory into the build directory and then modifies
;; them in-place. So these files have to be writable.
(for-each
(lambda (file)
(invoke "chmod" "u+w" file))
(find-files "src/java.base/share/classes/jdk/internal/misc/"
"\\.template$"))
#t))))))
(home-page "https://openjdk.java.net/projects/jdk/16")))
(define-public icedtea icedtea-8)

View File

@ -1512,7 +1512,7 @@ build tree Yggdrasil.")
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$")))))))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(propagated-inputs
`(("julia-jllwrappers" ,julia-jllwrappers)
("julia-libglvnd-jll" ,julia-libglvnd-jll)

File diff suppressed because it is too large Load Diff

View File

@ -98,7 +98,7 @@
"10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3"))))
(build-system cmake-build-system)
(native-inputs
`(("qtbase" ,qtbase))) ; For tests (needs qmake)
`(("qtbase" ,qtbase-5))) ; For tests (needs qmake)
(arguments
`(#:phases
(modify-phases %standard-phases
@ -165,7 +165,7 @@ common build settings used in software produced by the KDE community.")
("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:configure-flags
'("-DCMAKE_CXX_FLAGS=-fPIC"
@ -204,9 +204,9 @@ common build settings used in software produced by the KDE community.")
("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
@ -252,7 +252,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Open Collaboration Service client library")
(description "Attica is a Qt library that implements the Open
@ -286,7 +286,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
;; TODO: qtdeclarative (yields one failing test)
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:configure-flags
(list (string-append
@ -319,7 +319,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
("fdupes" ,fdupes)
("libxml2" ,libxml2)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Default KDE Plasma 5 icon theme")
(description "Breeze provides a freedesktop.org compatible icon theme.
@ -356,7 +356,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
("python-jinja2" ,python-jinja2)
("python-pyyaml" ,python-pyyaml)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Doxygen Tools")
(description "This framework contains scripts and data for building API
@ -389,7 +389,7 @@ documentation.")
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("bzip2" ,bzip2)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("xz" ,xz)
("zlib" ,zlib)))
(home-page "https://community.kde.org/Frameworks")
@ -425,7 +425,7 @@ GZip format, via a subclass of QIODevice.")
("tzdata" ,tzdata-for-tests)))
(inputs
`(("libical" ,libical)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -485,7 +485,7 @@ and the older vCalendar.")
("gperf" ,gperf)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "String encoding and manipulating library")
(description "KCodecs provide a collection of methods to manipulate
@ -523,7 +523,7 @@ Internet).")
("qttools" ,qttools)
("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -588,7 +588,7 @@ propagate their changes to their respective configuration files.")
;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
("xorg-server" ,xorg-server-for-tests))) ; for the tests
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -644,7 +644,7 @@ many more.")
("dbus" ,dbus)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("kinit" ,kinit-bootstrap))) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
(arguments
@ -688,7 +688,7 @@ as well as an API to create KDED modules.")
("qttools" ,qttools)))
(inputs
`(("avahi" ,avahi) ; alternativly dnssd could be used
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Network service discovery using Zeroconf")
(description "KDNSSD is a library for handling the DNS-based Service
@ -711,7 +711,7 @@ infrastructure.")
"1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("boost" ,boost)
("graphviz" ,graphviz)
("kiconthemes" ,kiconthemes)
@ -749,7 +749,7 @@ replace the other outdated Graphviz tools.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Utilities for graphical user interfaces")
@ -784,7 +784,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://invent.kde.org/frameworks/kholidays")
(synopsis "Library for regional holiday information")
@ -812,7 +812,7 @@ other special events for a geographical region.")
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)))
(arguments
@ -854,7 +854,7 @@ translation scripting.")
("pkg-config" ,pkg-config)))
(inputs
`(("libxscrnsaver" ,libxscrnsaver) ; X-Screensaver based poller, fallback mode
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Reporting of idle time of user and system")
@ -889,7 +889,7 @@ or user activity.")
;; TODO: Find a way to activate this optional include without
;; introducing a recursive dependency.
;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols2" ,qtquickcontrols2)
("qtsvg" ,qtsvg)
@ -919,7 +919,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Set of item models extending the Qt model-view framework")
@ -971,7 +971,7 @@ model to observers
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Set of item views extending the Qt model-view framework")
(description "KItemViews includes a set of views, which can be used with
@ -997,7 +997,7 @@ to flat and hierarchical lists.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Data plotting library")
(description "KPlotWidget is a QWidget-derived class that provides a virtual
@ -1028,7 +1028,7 @@ pixel units.")
;; Optional, for compile-time validation of syntax definition files:
("qtxmlpatterns" ,qtxmlpatterns)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1074,7 +1074,7 @@ integration with a custom editor as well as a ready-to-use
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtwayland" ,qtwayland)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
@ -1116,7 +1116,7 @@ represented by a QPoint or a QSize.")
("qttools" ,qttools)
("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1157,7 +1157,7 @@ configuration pages, message boxes, and password requests.")
("xorg-server" ,xorg-server-for-tests))) ; for the tests
(inputs
`(("libxrender" ,libxrender)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("xcb-utils-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm)))
@ -1219,7 +1219,7 @@ lower level classes for interaction with the X Windowing System.")
;; Headers contain #include <ModemManager/ModemManager.h>
`(("modem-manager" ,modem-manager)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1258,7 +1258,7 @@ messages.")
;; #include <libnm/NetworkManager.h>
`(("network-manager" ,network-manager)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1292,7 +1292,7 @@ which are used in DBus communication.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("fdupes" ,fdupes)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Oxygen provides the standard icon theme for the KDE desktop")
(description "Oxygen icon theme for the KDE desktop")
@ -1317,7 +1317,7 @@ which are used in DBus communication.")
(inputs
`(("libdmtx" ,libdmtx)
("qrencode" ,qrencode)
("qtbase" ,qtbase))) ;; TODO: rethink: nix propagates this
("qtbase" ,qtbase-5))) ;; TODO: rethink: nix propagates this
(home-page "https://api.kde.org/frameworks/prison/html/index.html")
(synopsis "Barcode generation abstraction layer")
(description "Prison is a Qt-based barcode abstraction layer/library and
@ -1343,7 +1343,7 @@ provides uniform access to generation of barcodes with data.")
`(("glib" ,glib)
("pulseaudio" ,pulseaudio)
("qtdeclarative" ,qtdeclarative)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/libraries/pulseaudio-qt/")
(synopsis "Qt bindings for PulseAudio")
(description
@ -1378,7 +1378,7 @@ libpulse.")
("kcoreaddons" ,kcoreaddons)
("kiconthemes" ,kiconthemes) ; optional
("kirigami" ,kirigami)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols2" ,qtquickcontrols2)))
(home-page "https://community.kde.org/Frameworks")
@ -1417,7 +1417,7 @@ feel.")
("flex" ,flex)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("udev" ,eudev)))
;; TODO: Add runtime-only dependency MediaPlayerInfo
@ -1449,7 +1449,7 @@ system.")
(inputs
`(("hunspell" ,hunspell)
;; TODO: hspell (for Hebrew), Voikko (for Finish)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Multi-language spell checker")
(description "Sonnet is a plugin-based spell checking library for Qt-based
@ -1474,7 +1474,7 @@ ASpell and HUNSPELL.")
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Helper for multithreaded programming")
(description "ThreadWeaver is a helper for multithreaded programming. It
@ -1519,7 +1519,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)))
(home-page "https://community.kde.org/Frameworks")
@ -1553,7 +1553,7 @@ with other frameworks.")
(inputs
`(("kcoreaddons" ,kcoreaddons)
("polkit-qt" ,polkit-qt)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1599,7 +1599,7 @@ utilities.")
(inputs
`(("kconfig" ,kconfig)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Powerful autocompletion framework and widgets")
(description "This framework helps implement autocompletion in Qt-based
@ -1625,7 +1625,7 @@ integrated it into your application's other widgets.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("xorg-server" ,xorg-server))) ; for the tests
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(propagated-inputs
`(;; As required by KF5ContactsConfig.cmake.
("kcodecs" ,kcodecs)
@ -1672,7 +1672,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
(inputs
`(("kcoreaddons" ,kcoreaddons)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Graceful handling of application crashes")
@ -1705,7 +1705,7 @@ application crashes.")
("libxslt" ,libxslt)
("perl" ,perl)
("perl-uri" ,perl-uri)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1775,7 +1775,7 @@ from DocBook files.")
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("qtmultimedia" ,qtmultimedia)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
;; Required run-time packages
("catdoc" ,catdoc)
;; Optional run-time packages
@ -1811,7 +1811,7 @@ by applications to write metadata.")
(inputs
`(("karchive" ,karchive) ; for Krita and OpenRaster images
("openexr" ,openexr) ; for OpenEXR high dynamic-range images
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1865,7 +1865,7 @@ formats.")
(inputs
`(("kcoreaddons" ,kcoreaddons)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Widgets for showing progress of asynchronous jobs")
@ -1897,7 +1897,7 @@ asynchronous jobs.")
("kcoreaddons" ,kcoreaddons)
("kwindowsystem" ,kwindowsystem)
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtspeech" ,qtspeech)
;; TODO: Think about adding dbusmenu-qt5 from
;; https://launchpad.net/libdbusmenu-qt
@ -1945,7 +1945,7 @@ covers feedback and persistent events.")
("kcoreaddons" ,kcoreaddons)
("kdoctools" ,kdoctools)
("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -2001,7 +2001,7 @@ were traditional plugins.")
`(("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
;; TODO: utempter, for managing UTMP entries
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f ; FIXME: 1/1 tests fail.
#:phases
@ -2046,7 +2046,7 @@ and communicating with them using a pty.")
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Converting physical units")
(description "KUnitConversion provides functions to convert values in
@ -2073,7 +2073,7 @@ gallons).")
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("kcodecs" ,kcodecs)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "RSS/Atom parser library")
(description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and
@ -2123,7 +2123,7 @@ between feed formats.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("lmdb" ,lmdb)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)))
(arguments
@ -2182,7 +2182,7 @@ maintaining an index of the contents of your files.")
`(("boost" ,boost)
("kactivities" ,kactivities)
("kconfig" ,kconfig)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Access usage statistics collected by the activity manager")
@ -2219,7 +2219,7 @@ by which applications, and what documents have been linked to which activity.")
("kcoreaddons" ,kcoreaddons)
("kiconthemes" ,kiconthemes)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -2281,7 +2281,7 @@ using the XBEL format.")
("kpackage" ,kpackage)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Utilities for KDE System Settings modules")
@ -2316,7 +2316,7 @@ KCModules can be created with the KConfigWidgets framework.")
("kguiaddons" ,kguiaddons)
("ki18n" ,ki18n)
;; todo: PythonModuleGeneration
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qttools" ,qttools)))
(arguments
`(#:phases
@ -2376,7 +2376,7 @@ their settings.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libepoxy" ,libepoxy)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)))
(arguments
@ -2423,7 +2423,7 @@ that offer bindings to some of the Frameworks.")
("kdoctools" ,kdoctools)
("kinit" ,kinit)
("kservice" ,kservice)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Central daemon of KDE work spaces")
(description "KDED stands for KDE Daemon. KDED runs in the background and
@ -2453,7 +2453,7 @@ started on demand.")
`(("kconfig" ,kconfig)
("kcoreaddons" ,kcoreaddons)
("kdoctools" ,kdoctools)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
;; optional:
("kcompletion" ,kcompletion)
("kconfigwidgets" ,kconfigwidgets)
@ -2498,7 +2498,7 @@ ini-style description files.")
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kservice" ,kservice)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "User interface for running shell commands with root privileges")
(description "KDESU provides functionality for building GUI front ends for
@ -2531,7 +2531,7 @@ with su and ssh respectively.")
("kparts" ,kparts)
("kservice" ,kservice)
("kwallet" ,kwallet)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtwebkit" ,qtwebkit)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Integration for QtWebKit")
@ -2561,7 +2561,7 @@ engine WebKit via QtWebKit.")
`(("karchive" ,karchive)
("kconfig" ,kconfig)
("kcoreaddons" ,kcoreaddons)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -2605,7 +2605,7 @@ emoticons coming from different providers.")
("kservice" ,kservice)
("kwindowsystem" ,kwindowsystem)
("libxcb" ,libxcb)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("xcb-util-keysyms" ,xcb-util-keysyms)))
(home-page "https://community.kde.org/Frameworks")
@ -2643,7 +2643,7 @@ window does not need focus for them to be activated.")
("ki18n" ,ki18n)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(arguments
`(#:phases
@ -2721,7 +2721,7 @@ in applications using the KDE Frameworks.")
("kxmlgui" ,kxmlgui)
("libcap" ,libcap) ; to install start_kdeinit with CAP_SYS_RESOURCE
("plasma-framework" ,plasma-framework)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Library to speed up start of applications on KDE workspaces")
@ -2781,7 +2781,7 @@ consumption.")
("kwidgetsaddons" ,kwidgetsaddons)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
("qtx11extras" ,qtx11extras)
("sonnet" ,sonnet)))
@ -2863,7 +2863,7 @@ KIO enabled infrastructure.")
("kjobwidgets" ,kjobwidgets)
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)
("sonnet" ,sonnet)))
@ -2916,7 +2916,7 @@ specification.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Configuration dialog for desktop notifications")
@ -2970,7 +2970,7 @@ notifications which can be embedded in your application.")
("kjobwidgets" ,kjobwidgets)
("kservice" ,kservice)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)
("sonnet" ,sonnet)))
(home-page "https://community.kde.org/Frameworks")
@ -3002,7 +3002,7 @@ widgets with a user-interface defined in terms of actions.")
("ki18n" ,ki18n)
("kservice" ,kservice)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(arguments
`(#:tests? #f)) ; FIXME: 1/3 tests fail.
@ -3053,7 +3053,7 @@ to easily extend the contacts collection.")
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)
("threadweaver" ,threadweaver)))
@ -3117,7 +3117,7 @@ typed.")
("kdbusaddons" ,kdbusaddons)
("kdoctools" ,kdoctools)
("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f ; FIXME: 6/10 tests fail.
#:phases
@ -3192,7 +3192,7 @@ types or handled by application specific code.")
("kxmlgui" ,kxmlgui)
("libgit2" ,libgit2)
("perl" ,perl)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
("qtxmlpatterns" ,qtxmlpatterns)
@ -3262,7 +3262,7 @@ library.")
("kservice" ,kservice)
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtspeech" ,qtspeech)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Text editing widgets")
@ -3305,7 +3305,7 @@ It supports rich text as well as plain text.")
("libgcrypt" ,libgcrypt)
("phonon" ,phonon)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Safe desktop-wide storage for passwords")
(description "This framework contains an interface to KWallet, a safe
@ -3345,7 +3345,7 @@ the passwords on KDE work spaces.")
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sonnet" ,sonnet)))
(arguments
`(#:tests? #f ; FIXME: 1/5 tests fail.
@ -3398,7 +3398,7 @@ descriptions for integrating actions from plugins.")
("kservice" ,kservice)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "XML-RPC client")
@ -3457,7 +3457,7 @@ setUrl, setUserAgent and call.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols2" ,qtquickcontrols2)
("qtsvg" ,qtsvg)
@ -3504,7 +3504,7 @@ script engines.")
("ki18n" ,ki18n)
("kio" ,kio)
("kirigami" ,kirigami)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(arguments
`(#:tests? #f ;; seem to require network; don't find QTQuick components
@ -3582,7 +3582,7 @@ need.")
("knotificantions" ,knotifications)
("kpackage" ,kpackage)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(arguments
`(#:phases
@ -3656,7 +3656,7 @@ workspace.")
("ktextwidgets" ,ktextwidgets)
("kunitconversion" ,kunitconversion)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(inputs
`(("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
@ -3764,7 +3764,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
("libpng" ,libpng)
("openssl" ,openssl)
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("sonnet" ,sonnet)))
(home-page "https://community.kde.org/Frameworks")
@ -3798,7 +3798,7 @@ technology and using KJS for JavaScript support.")
("pkg-config" ,pkg-config)))
(inputs
`(("pcre" ,pcre)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 support for Javascript scripting in Qt
applications")
@ -3831,7 +3831,7 @@ support.")
(inputs
`(("ki18n" ,ki18n)
("kjs" ,kjs)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 embedded Javascript engine for Qt")
@ -3866,7 +3866,7 @@ QObjects, so you can script your applications.")
("kparts" ,kparts)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 plugin interface for media player features")
(description "KMediaPlayer builds on the KParts framework to provide a
@ -3903,7 +3903,7 @@ KParts instead.")
("kparts" ,kparts)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 solution for application scripting")

View File

@ -90,7 +90,7 @@
("purpose" ,purpose)
("qca" ,qca)
("qoauth" ,qoauth)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtnetworkauth" ,qtnetworkauth)
("qtwebkit" ,qtwebkit)
("sonnet" ,sonnet)))
@ -162,7 +162,7 @@ Other notable features include:
("oxygen-icons" ,oxygen-icons) ; default icon set
("qca" ,qca)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
))
(home-page "http://www.kde.org/")
(synopsis "Versatile and user-friendly download manager")
@ -213,7 +213,7 @@ This package is part of the KDE networking module.")
("kwindowsystem" ,kwindowsystem)
("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qca" ,qca)
("solid" ,solid)
("sonnet" ,sonnet)))
@ -302,7 +302,7 @@ Features are:
("phonon" ,phonon)
("qca" ,qca)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("speex" ,speex)
("v4l-utils" ,v4l-utils)
;; TODO: Xmms
@ -358,7 +358,7 @@ This package is part of the KDE networking module.")
("libssh2" ,libssh)
;; TODO: libvnc{server,client} - is not tigervnc-{server,client}
("oxygen-icons" ,oxygen-icons) ; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/internet/org.kde.krdc")
(synopsis "Remote desktop client")
(description "KRDC is a client application that allows you to view or even
@ -412,7 +412,7 @@ This package is part of the KDE networking module.")
;; TODO: LibKWorkspace -> plasma-workspace?
("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
("qtwebkit" ,qtwebkit)
("solid" ,solid)
@ -447,7 +447,7 @@ a full-featured client for BitTorrent.")
("kpimcommon" ,kpimcommon)
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
(home-page "https://invent.kde.org/pim/libgravatar")
@ -482,7 +482,7 @@ unnecessary network operations.")
("kio" ,kio)
("libgcrypt" ,libgcrypt)
("qca" ,qca)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://invent.kde.org/network/libktorrent")
(synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks")

View File

@ -71,7 +71,7 @@
("libkcompactdisc" ,libkcompactdisc)
("libvorbis" ,libvorbis)
("phonon" ,phonon)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/multimedia/org.kde.kio_audiocd")
(synopsis "Transparent audio CD integration for applications using the KDE
Platform")
@ -117,7 +117,7 @@ This package is part of the KDE multimedia module.")
("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://kde.org/applications/multimedia/org.kde.dragonplayer")
(synopsis "Simple video player")
@ -169,7 +169,7 @@ This package is part of the KDE multimedia module.")
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency
("qtmultimedia" ,qtmultimedia)
@ -226,7 +226,7 @@ its own database. You can build and play your own playlist.")
("kconfig" ,kconfig)
("ki18n" ,ki18n)
("kio" ,kio)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/multimedia/org.kde.ffmpegthumbs")
(synopsis "Video thumbnail generator for KDE using ffmpeg")
(description "
@ -272,7 +272,7 @@ This package is part of the KDE multimedia module.")
("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("taglib" ,taglib)))
(home-page "https://kde.org/applications/multimedia/org.kde.juk")
@ -368,7 +368,7 @@ This package is part of the KDE multimedia module.")
("libsndfile" ,libsndfile)
("libvorbis" ,libvorbis)
("oxygen-icons" ,oxygen-icons) ; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtwebkit" ,qtwebkit)
("shared-mime-info" ,shared-mime-info)
("solid" ,solid)
@ -414,7 +414,7 @@ available CD drives.")
("kxmlgui" ,kxmlgui)
("libxscrnsaver" ,libxscrnsaver)
("oxygen-icons" ,oxygen-icons) ; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("solid" ,solid)
("v4l-utils" ,v4l-utils) ; libdvbv5
@ -468,7 +468,7 @@ autoloading of subtitle files for use while playing video.")
("kparts" ,kparts)
("oxygen-icons" ,oxygen-icons) ; default icon set
("purpose" ,purpose)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtquickcontrols" ,qtquickcontrols)
@ -523,7 +523,7 @@ camera. Use it to take pictures and make videos to share.")
("oxygen-icons" ,oxygen-icons) ; default icon set
("plasma-framework" ,plasma-framework)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://kde.org/applications/multimedia/org.kde.kmix")
(synopsis "Volume control and mixer")
@ -566,7 +566,7 @@ This package is part of the KDE multimedia module.")
("libxcb" ,libxcb) ;; FIXME: why does cmake not find XEVIE and XPRINT?
("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("cairo" ,cairo)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
@ -642,7 +642,7 @@ Some features:
("opus" ,opus)
("oxygen-icons" ,oxygen-icons) ; default icon set
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("zlib" ,zlib)))
(home-page "https://kde.org/applications/multimedia/org.kde.kwave")
@ -699,7 +699,7 @@ Its features include:
("kio" ,kio)
("kwidgetsaddons" ,kwidgetsaddons)
("libmusicbrainz" ,libmusicbrainz)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ; Most tests require network
(home-page "https://invent.kde.org/multimedia/libkcddb")
@ -727,7 +727,7 @@ Its features include:
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(home-page "https://invent.kde.org/multimedia/libkcompactdisc")
(synopsis "KDE library for playing & ripping CDs")

View File

@ -79,7 +79,7 @@
;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries
;; and wrapped files will refer to them, even if the user choices none
;; of these. Executables are searched on $PATH then.
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("sqlite" ,sqlite)))
(arguments
`(#:tests? #f ;; TODO 135/167 tests fail
@ -151,7 +151,7 @@ programs.")
("ksmtp" ,ksmtp)
("ktextwidgets" ,ktextwidgets)
("kwallet" ,kwallet)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: 1/1 test fails
(home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
@ -196,7 +196,7 @@ collection and item views.")
("kxmlgui" ,kxmlgui)
("prison" ,prison)
("kio" ,kio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)
("sonnet" ,sonnet)))
(home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
@ -240,7 +240,7 @@ to list and filter contacts.")
("kmime" ,kmime)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
(arguments
`(#:phases
@ -283,7 +283,7 @@ with emails through Akonadi easier.")
("kcodecs" ,kcodecs)
("ki18n" ,ki18n)
("kmime" ,kmime)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
(synopsis "Akonadi notes access library")
(description "Akonadi Notes is a library that effectively bridges the
@ -325,7 +325,7 @@ wrapping notes into KMime::Message objects.")
("kmime" ,kmime)
("krunner" ,krunner)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("xapian" ,xapian)))
(arguments
`(#:phases (modify-phases %standard-phases
@ -390,7 +390,7 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
("ktextwidgets" ,ktextwidgets)
("kwallat" ,kwallet)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/incidenceeditor")
(synopsis "KDE PIM library for editing incidences")
(description "This library provides an incidence editor for KDE PIM.")
@ -445,7 +445,7 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
("prison" ,prison)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kontact.kde.org/components/kaddressbook.html")
(synopsis "Address Book application to manage your contacts")
(description "KAddressBook stores all the personal details of your family,
@ -486,7 +486,7 @@ CalDAV server.")
("kpimtextedit" ,kpimtextedit)
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: TZ setup
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@ -515,7 +515,7 @@ calendar data.")
("ki18n" ,ki18n)
("kio" ,kio)
("kxmlrpcclient" ,kxmlrpcclient)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("syndication" ,syndication)))
;; Note: Some tests take up to 90 sec.
(home-page "https://invent.kde.org/pim/kblog")
@ -567,7 +567,7 @@ one of the APIs mentioned above.")
("kpimtextedit" ,kpimtextedit)
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/stable/calendarsupport/")
(synopsis "Calendar Support library for KDE PIM")
(description "The Calendar Support library provides helper utilities for
@ -604,7 +604,7 @@ calendaring applications.")
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: seem to pull in some wrong theme
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@ -632,7 +632,7 @@ functions for accessing calendar data using the kcalcore API.")
`(("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kio" ,kio)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtxmlpatterns" ,qtxmlpatterns)))
(home-page "https://invent.kde.org/frameworks/kdav")
(synopsis "DAV protocol implementation with KJobs")
@ -678,7 +678,7 @@ supported using GroupDAV or CardDAV.")
("libkleo" ,libkleo)
("prison" ,prison)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/kdepim-apps-libs")
(synopsis "KDE PIM mail related libraries and data files")
(description "This package provides mail related libraries and data files
@ -739,7 +739,7 @@ for KDE PIM.")
("libkgapi" ,libkgapi)
;; TODO: libkolab
("qca" ,qca)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtnetworkauth" ,qtnetworkauth)
("qtspeech" ,qtspeech)
@ -815,7 +815,7 @@ package.")
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/eventviews")
(synopsis "KDE PIM library for creating events")
(description "This library provides an event creator for KDE PIM.")
@ -861,7 +861,7 @@ package.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/utilities/org.kde.kgpg")
(synopsis "Graphical front end for GNU Privacy Guard")
(description "Kgpg manages cryptographic keys for the GNU Privacy Guard,
@ -895,7 +895,7 @@ cryptography to the contents of the clipboard.")
("kpimtextedit" ,kpimtextedit)
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -929,7 +929,7 @@ cryptography to the contents of the clipboard.")
("ki18n" ,ki18n)
("kio" ,kio)
("kmime" ,kmime)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library for handling IMAP")
(description "This library provides a job-based API for interacting with
@ -959,7 +959,7 @@ easier to do so.")
`(("ki18n" ,ki18n)
("kio" ,kio)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(propagated-inputs
`(("cyrus-sasl" ,cyrus-sasl)
("openldap" ,openldap)))
@ -1010,7 +1010,7 @@ protocol for querying and modifying directory services running over TCP/IP. ")
("libkleo" ,libkleo)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1096,7 +1096,7 @@ and retrieving certificates from LDAP servers.")
("libksieve" ,libksieve)
("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
@ -1177,7 +1177,7 @@ manager from KDE.")
("libxslt" ,libxslt)
("phonon" ,phonon)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: 4/56 tests fail, even with "offscreen" and dbus
(home-page "https://invent.kde.org/pim/mailcommon")
@ -1218,7 +1218,7 @@ dealing with email.")
("kmime" ,kmime)
("kxmlgui" ,kxmlgui)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/mailimporter")
(synopsis "KDE mail importer library")
(description "This package provides libraries for importing mails other
@ -1259,7 +1259,7 @@ e-mail client programs into KMail and KDE PIM.")
("ktextwidgets" ,ktextwidgets)
("kwallet" ,kwallet)
("libkgapi" ,libkgapi)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@ -1285,7 +1285,7 @@ mail transport.")
(inputs
`(("kcodecs" ,kcodecs)
("kmime" ,kmime)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library for handling mbox mailboxes")
(description "This is a library for handling mailboxes in mbox format,
@ -1355,7 +1355,7 @@ using a Qt/KMime C++ API.")
("libkleo" ,libkleo)
("qca" ,qca)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
@ -1398,7 +1398,7 @@ kwebengineviewer.")
(inputs
`(("kcodecs" ,kcodecs)
("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1475,7 +1475,7 @@ information in non-ASCII character sets.")
("kxmlgui" ,kxmlgui)
("libkdepim" ,libkdepim)
("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://kontact.kde.org/components/knotes.html")
(synopsis "Note-taking utility")
@ -1513,7 +1513,7 @@ Features:
("kparts" ,kparts)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Kontact interface library")
(description " This library provides the glue necessary for
@ -1584,7 +1584,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
("libkdepim" ,libkdepim)
("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
("phonon" ,phonon)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1639,7 +1639,7 @@ and exchanging calendar data, vCalendar and iCalendar.")
(inputs
`(("kcontacts" ,kcontacts)
("kpeople" ,kpeople)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/kpeoplevcard")
(synopsis "Expose vCard contacts to KPeople")
(description
@ -1697,7 +1697,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
("libkdepim" ,libkdepim)
("libxslt" ,libxslt)
("purpose" ,purpose)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtwebengine" ,qtwebengine)))
(arguments
`(#:tests? #f)) ;; TODO tests hang
@ -1736,7 +1736,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtspeech" ,qtspeech)
("sonnet" ,sonnet)))
(arguments
@ -1770,7 +1770,7 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.")
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kio" ,kio)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f ;; TODO: does not find sasl mechs
#:phases
@ -1811,7 +1811,7 @@ standard protocols for e-mail transmission.")
("kcontacts" ,kcontacts)
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/ktnef/html/")
(synopsis "Library for handling mail attachments using TNEF format")
(description "Ktnef is a library for handling data in the TNEF
@ -1862,7 +1862,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
("kmime" ,kmime)
("kwallet" ,kwallet)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/libkdepim")
(synopsis "Libraries for common KDE PIM apps")
(description "This package provided libraries for common KDE PIM apps.")
@ -1892,7 +1892,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
("kio" ,kio)
("kwallet" ,kwallet)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)))
@ -1935,7 +1935,7 @@ various Google services.")
("kwindowsystem" ,kwindowsystem)
("kpimtextedit" ,kpimtextedit)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/libkleo")
(synopsis "KDE PIM cryptographic library")
(description "@code{libkleo} is a library for Kleopatra and other parts of
@ -1978,7 +1978,7 @@ KDE using certificate-based crypto.")
("kwallet" ,kwallet)
("kwindowsystem" ,kwindowsystem)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)))

View File

@ -74,7 +74,7 @@
("kpackage" ,kpackage)
("kwayland" ,kwayland) ; optional
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ; optional
("qtx11extras" ,qtx11extras)))
(home-page "https://invent.kde.org/plasma/breeze")
@ -99,7 +99,7 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.")
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/plasma/kdecoration")
(synopsis "Plugin based library to create window decorations")
(description "KDecoration is a library to create window decorations.
@ -127,7 +127,7 @@ manager which re-parents a Client window to a window decoration frame.")
("ki18n" ,ki18n)
("kwallet" ,kwallet)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/plasma/ksshaskpass")
(synopsis "Front-end for ssh-add using kwallet")
(description "Ksshaskpass is a front-end for @code{ssh-add} which stores the
@ -190,7 +190,7 @@ call it if it is not associated to a terminal.")
("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices
("linux-pam" ,linux-pam)
("logind" ,elogind) ;optional loginctl support
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtx11extras" ,qtx11extras)
("solid" ,solid)
@ -221,7 +221,7 @@ call it if it is not associated to a terminal.")
(inputs
`(("kwayland" ,kwayland)
("libxrandr" ,libxrandr)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(arguments
'(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
@ -261,7 +261,7 @@ basic needs and easy to configure for those who want special setups.")
("knewstuff" ,knewstuff)
("kwidgetsaddons" ,kwidgetsaddons)
("kservice" ,kservice)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
("qtwebkit" ,qtwebkit)

View File

@ -75,7 +75,7 @@
("kwindowsystem" ,kwindowsystem)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(arguments
`(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
@ -116,7 +116,7 @@ The main features of Dolphin are:
("ktexteditor" ,ktexteditor)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "http://www.kde.org/")
(synopsis "VCS-Plugins for Dolphin")
(description "This package contains plugins that offer integration in
@ -156,7 +156,7 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
("kwindowsystem" ,kwindowsystem)
("libxml2" ,libxml2)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("xapian" ,xapian)))
(arguments
`(#:tests? #f)) ;; 1/1 test fails
@ -213,7 +213,7 @@ document meta data file.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)))
(arguments
`(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus
@ -262,7 +262,7 @@ This package is part of the KDE base applications module.")
("libxtst" ,libxtst)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("pipewire" ,pipewire)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("xcb-util-image" ,xcb-util-image)
("zlib" ,zlib)))
@ -309,7 +309,7 @@ This package is part of the KDE networking module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/system/org.kde.ksystemlog")
(synopsis "System log viewer")
(description "This program is developed for being used by beginner users,
@ -353,7 +353,7 @@ This package is part of the KDE administration module.")
("kwayland" ,kwayland)
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)))
(home-page "https://www.kde.org/applications/system/yakuake/")

View File

@ -68,7 +68,7 @@
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)))
(arguments
`(#:tests? #f ;; 2/7 tests fail
@ -121,7 +121,7 @@ Kate's features include:
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
;; TODO: QAccessibilityClient - libqaccessibilityclien
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/utilities/org.kde.kmag")
(synopsis "Screen magnifier tool")
(description "You can use KMagnifier to magnify a part of the screen just
@ -160,7 +160,7 @@ artists to web-designers to people with low vision.")
("libxt" ,libxt)
("phonon" ,phonon)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/utilities/org.kde.kmousetool")
(synopsis "Automatic mouse click and mouse manipulation tool for the
disabled")
@ -196,7 +196,7 @@ whom pressing buttons hurts.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtspeech" ,qtspeech)))
(home-page "https://kde.org/applications/utilities/org.kde.kmouth")
(synopsis "Type-and-say frontend for speech synthesizers")
@ -235,7 +235,7 @@ sentences to be re-spoken.")
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/utilities/org.kde.kronometer")
(synopsis "Simple stopwatch application")
(description "Kronometer is a stopwatch application. It features the
@ -279,7 +279,7 @@ to save the times and resume them later.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("solid" ,solid)
("zlib" ,zlib)))
(home-page "https://www.krusader.org")
@ -318,7 +318,7 @@ great on your desktop.")
(inputs
`(("ktexteditor" ,ktexteditor)
("imagemagick" ,imagemagick)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
(home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch")
(synopsis "Create and print cross stitch patterns")
@ -363,7 +363,7 @@ either be created or generated from a image.")
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qca" ,qca)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)))
(arguments
`(#:phases
@ -421,7 +421,7 @@ redone.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/utilities/org.kde.rsibreak")
(synopsis "Assists in the Recovery and Prevention of Repetitive Strain
Injury")
@ -468,7 +468,7 @@ remind you to take a break now and then.")
("libsmbclient" ,samba)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("plasma-framework" ,plasma-framework)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)))
(home-page "https://kde.org/applications/utilities/org.kde.smb4k")
@ -530,7 +530,7 @@ Features:
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("oxygen-icons" ,oxygen-icons) ;; default icon set
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/utilities/org.kde.sweeper")
(synopsis "Temporary file and history cleaner")
(description "

View File

@ -103,7 +103,7 @@
("kconfig" ,kconfig)
("ki18n" ,ki18n)
("kio" ,kio)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -140,7 +140,7 @@ This package contains GUI widgets for baloo.")
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
("knewstuff" ,knewstuff)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/pim/grantleetheme")
(synopsis "Library providing Grantlee theme support")
(description "This library provides Grantlee theme support.")
@ -202,7 +202,7 @@ This package contains GUI widgets for baloo.")
("libkdepim" ,libkdepim)
("libkleo" ,libkleo)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
@ -243,7 +243,7 @@ browser for easy news reading.")
("ffmpeg" ,ffmpeg)
("rttr" ,rttr)
("mlt" ,mlt)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
("qtsvg" ,qtsvg)
("qtmultimedia" ,qtmultimedia)
@ -350,7 +350,7 @@ projects.")
("kxmlgui" ,kxmlgui)
("libkomparediff2" ,libkomparediff2)
("oxygen-icons" ,oxygen-icons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement
("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement
@ -416,7 +416,7 @@ software (Git, Subversion, Mercurial, CVS and Bazaar).")
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(build-system cmake-build-system)
(home-page "https://kde.org")
(synopsis "Parser generator library for KDevplatform")
@ -445,7 +445,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)))
(home-page "https://invent.kde.org/graphics/kdiagram")
(synopsis "Libraries for creating business diagrams")
@ -532,7 +532,7 @@ illustrate project schedules.")
("openexr" ,openexr)
("perl" ,perl)
("poppler-qt5" ,poppler-qt5)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)
@ -572,7 +572,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
("kgraphviewer" ,kgraphviewer)
("kio" ,kio)
("ki18n" ,ki18n)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("qtxmlpatterns" ,qtxmlpatterns)))
(home-page "https://apps.kde.org/en/massif-visualizer")
@ -605,7 +605,7 @@ compressed massif files can also be opened transparently.")
("ki18n" ,ki18n)
("kio" ,kio)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(build-system cmake-build-system)
(home-page "https://kde.org")
(synopsis "Library to compare files and strings, used in Kompare and KDevelop")
@ -632,7 +632,7 @@ used in KDE development tools Kompare and KDevelop.")
`(("pkg-config" ,pkg-config)))
(inputs
`(("openssl" ,openssl)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://userbase.kde.org/QCA")
(synopsis "Libraries for the Qt Cryptographic Architecture")
(description "The Qt Cryptographic Architecture (QCA) provides a
@ -663,7 +663,7 @@ cards.")
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qca" ,qca)
("util-linux" ,util-linux "lib")))
(home-page "https://community.kde.org/Frameworks")
@ -687,7 +687,7 @@ cards.")
(arguments
`(#:tests? #f)) ; both tests fail, require display
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools)))
@ -748,7 +748,7 @@ different notification systems.")
("libfakekey" ,libfakekey)
("pulseaudio-qt" ,pulseaudio-qt)
("qca" ,qca)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtmultimedia" ,qtmultimedia)
@ -832,7 +832,7 @@ communicate with each other. Here's a few things KDE Connect can do:
("kuserfeedback" ,kuserfeedback)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("shared-mime-info" ,shared-mime-info)
;; Optional.
@ -868,7 +868,7 @@ to perform data analysis.")
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://phabricator.kde.org/source/kqtquickcharts/")
(synopsis "Interactive charts for Qt Quick")
@ -902,7 +902,7 @@ charts.")
("knotifications" ,knotifications)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/system/kdk")
(synopsis "View Disk Usage")
(description "KDiskFree displays the available file devices (hard drive
@ -930,7 +930,7 @@ unmount drives and view them in a file manager.")
("qttools" ,qttools)
("kdoctools" ,kdoctools)))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("karchive" ,karchive)
("ki18n" ,ki18n)
("kio" ,kio)
@ -991,7 +991,7 @@ Python, PHP, and Perl.")
("kxmlgui" ,kxmlgui)
("libsndfile" ,libsndfile)
("openal" ,openal)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))
(home-page "https://games.kde.org/")
@ -1035,7 +1035,7 @@ Python, PHP, and Perl.")
("kbookmarks" ,kbookmarks)
("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("libjpeg-turbo" ,libjpeg-turbo)
("libtiff" ,libtiff)
("kirigami" ,kirigami)
@ -1084,7 +1084,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
("kdoctools" ,kdoctools)))
(inputs
`(("gettext" ,gettext-minimal)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/development")
(synopsis "Tools for translating DocBook XML files with Gettext")
(description "This is a collection of tools that facilitate translating
@ -1109,7 +1109,7 @@ PO template files.")
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("kio" ,kio)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://apps.kde.org/en/kdegraphics_mobipocket")
(synopsis "KDE thumbnailer for Mobipocket files")
(description "This package provides a KDE plugin that shows thumbnails of
@ -1132,7 +1132,7 @@ Mobipocket e-books in Dolphin and other KDE apps.")
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("exiv2" ,exiv2)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://invent.kde.org/graphics/libkexiv2")
(synopsis "Manipulate the metadata of images")
(description "Libkexiv2 wraps the Exiv2 library, allowing to manipulate
@ -1158,7 +1158,7 @@ picture metadata as EXIF/IPTC and XMP.")
("kdnssd" ,kdnssd)
("ki18n" ,ki18n)
("kio" ,kio)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave")
(synopsis "DNS-SD Service Discovery Monitor")
(description "Adds an entry to Dolphin's Network page to show local
@ -1193,7 +1193,7 @@ or Bonjour by other projects).")
;;("phpunit" ,phpunit)
))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,qtbase-5)
("qtcharts" ,qtcharts)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)))

View File

@ -184,7 +184,7 @@
("hangul" ,libhangul)
("m17n-db" ,m17n-db)
("m17n-lib" ,m17n-lib)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("rime" ,librime)
("rsvg" ,librsvg)
("wayland" ,wayland)
@ -255,7 +255,7 @@ focuses especially on Korean input (Hangul, Hanja, ...).")
("appindicator" ,libappindicator)
("chewing" ,libchewing)
("gtk+" ,gtk+)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("xtst" ,libxtst)))
(synopsis "HIME Input Method Editor")
(description "Hime is an extremely easy-to-use input method framework. It

View File

@ -115,7 +115,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
`(("qttools" ,qttools))) ; for lrelease
(inputs
`(("mesa" ,mesa)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("zlib" ,zlib)))
(arguments
'(#:tests? #f

View File

@ -860,7 +860,7 @@ and video calls or instant messaging capabilities to an application.")
("liblinphone" ,liblinphone)
("mediastreamer2" ,mediastreamer2)
("ortp" ,ortp)
("qtbase" ,qtbase)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtquickcontrols" ,qtquickcontrols)

View File

@ -11,7 +11,7 @@
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
@ -36,14 +36,13 @@
;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@ -356,7 +355,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-5.12-version "5.12.9")
(define-public linux-libre-5.12-version "5.12.12")
(define deblob-scripts-5.12
(linux-libre-deblob-scripts
linux-libre-5.12-version
@ -364,7 +363,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1p1jzrci97sipjdx3h0vmdnw35z2vyvczinxmp65xi1ja7ww0g14")))
(define-public linux-libre-5.12-pristine-source
(let ((version linux-libre-5.12-version)
(hash (base32 "0vg71h8r90fl01a8khyf1776y76rgqisxafky89cswa2fpsvxyn7")))
(hash (base32 "1a1ymbgkp8ngrkf7cfjrn56zb9qz1mm1j1pmd60g85ln7nyb4ai1")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.12)))
@ -372,7 +371,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.10-version "5.10.42")
(define-public linux-libre-5.10-version "5.10.45")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
linux-libre-5.10-version
@ -380,12 +379,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1zsr02zmpx3968277sy8pfs2mdlgh86ifymwyj0r56wnhzf5q6hk")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "1r86v6q7ml7zv001f25w3h667nqqy39439s94vnqsyyn7g3jg84b")))
(hash (base32 "01rmw5rnxyybr8sh0v9rgamrg71ign2nr7m0ilrq9704k6dj9dzj")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.124")
(define-public linux-libre-5.4-version "5.4.127")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
@ -393,12 +392,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "10kxa1ng9w9xd2d5xh48fbhp1kri650p90nihrcpnb845gd9vwpp")))
(hash (base32 "1gr89x1ymxaslp9fqcchaa7939yvhxy67z3pgskmx6z2vrd9pgd0")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.193")
(define-public linux-libre-4.19-version "4.19.195")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@ -406,12 +405,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "17ci49ak5iw01kfkn3fcgncg9hm4j188417bxi3bnsq9il5ymhl4")))
(hash (base32 "02rdy5mdmwxli0cin5n7ab492y9fs01hhqxrjq6b4idwv5baa42m")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.235")
(define-public linux-libre-4.14-version "4.14.237")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
@ -419,12 +418,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "03k793hj294zf7jncs1h8zh5dh6xagkfvnydd9jadxvq2z8vvl8f")))
(hash (base32 "0kib9p61hhwjbr8zhir9aw86qik7k6bm95503n3k09ayyachajpq")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.271")
(define-public linux-libre-4.9-version "4.9.273")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
@ -432,12 +431,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "1480miixphkf0b8w00m753ar7yp1rnl3zyr9wp4inngi2f90553r")))
(hash (base32 "0jjarv3xfkc21j1xhgch53w8wm6rq3xw1i03rjw9fv5i9k4x6qsw")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.271")
(define-public linux-libre-4.4-version "4.4.273")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
@ -445,7 +444,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "0n5h2lv1p542a45pas3pi0vkhgrk096vwrps79a7v3a6c1q2dxx6")))
(hash (base32 "1pd39cak0zhda3m9nvn9yxgd070wxvckaha5wl8pi7c8i6jfpclb")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -5088,7 +5087,16 @@ Ridge, Joliet, and zisofs.")
(patches (search-patches "gpm-glibc-2.26.patch"))
(sha256
(base32
"13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"))))
"13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"))
(modules '((guix build utils)))
(snippet
'(begin
;; Take a patch from upstream to fix building with -fno-common,
;; which is default in GCC 10:
;; https://github.com/telmich/gpm/pull/37
(substitute* "src/headers/daemon.h"
(("^time_t[[:blank:]]+last_selection_time;")
"extern time_t last_selection_time;"))))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -5475,7 +5483,7 @@ feature, and a laptop with an accelerometer. It has no effect on SSDs.")
(define-public thinkfan
(package
(name "thinkfan")
(version "1.2.1")
(version "1.2.2")
(source
(origin
(method git-fetch)
@ -5484,7 +5492,7 @@ feature, and a laptop with an accelerometer. It has no effect on SSDs.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "18vgm5w5pjnpipa34j4x87q10695w2jnqwvc2f027afy7mnzw7kz"))))
(base32 "01l1pnj1cgy3dwgyys2s5iqzyv6kk47vlpy09qjafk8py21ijik3"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
@ -6293,16 +6301,26 @@ under OpenGL graphics workloads.")
(uri (string-append "https://github.com/rhboot/" name
"/releases/download/" version "/" name
"-" version ".tar.bz2"))
(patches (search-patches "efivar-gcc-compat.patch"))
(sha256
(base32
"17vvfivhsrszh7q39b6npjsrhrhsjf1cmmcpp3xrh6wh7ywzwrrw"))))
"17vvfivhsrszh7q39b6npjsrhrhsjf1cmmcpp3xrh6wh7ywzwrrw"))
(modules '((guix build utils)))
(snippet
'(begin
;; Compile everything within a single LTO partition
;; to work around ordering issues in the code. Try
;; removing this for versions > 37.
(substitute* "Make.defaults"
(("-flto")
"-flto -flto-partition=one"))))))
(build-system gnu-build-system)
(arguments
`(;; Tests require a UEFI system and is not detected in the chroot.
#:tests? #f
#:make-flags (list (string-append "prefix=" %output)
(string-append "libdir=" %output "/lib")
"CC_FOR_BUILD=gcc"
(string-append "CC_FOR_BUILD=" ,(cc-for-target))
(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
#:phases
(modify-phases %standard-phases
@ -6452,13 +6470,15 @@ set the screen to be pitch black at a value of 0 (or higher).
(file-name (git-file-name name version))
(sha256
(base32
"0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq"))))
"0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq"))
(patches (search-patches "brightnessctl-elogind-support.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags (list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" %output)
(string-append "UDEVDIR=" %output "/lib/udev/rules.d/"))
(string-append "UDEVDIR=" %output "/lib/udev/rules.d/")
"ENABLE_SYSTEMD=1")
#:phases
(modify-phases %standard-phases
(delete 'configure)
@ -6467,6 +6487,10 @@ set the screen to be pitch black at a value of 0 (or higher).
(substitute* "90-brightnessctl.rules"
(("/bin/") "/run/current-system/profile/bin/"))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("elogind" ,elogind)))
(synopsis "Backlight and LED brightness control")
(description
"This program allows you read and control device brightness. Devices
@ -7654,7 +7678,7 @@ of Linux application development.")
(package
(inherit pipewire)
(name "pipewire")
(version "0.3.22")
(version "0.3.29")
(source (origin
(method git-fetch)
(uri (git-reference
@ -7663,12 +7687,12 @@ of Linux application development.")
(file-name (git-file-name name version))
(sha256
(base32
"1ywna5f5v8s79ivrqfwwc8vy6sn3a2zvfwqyalf1fypj5d90w8g9"))))
"16jjxcnahxqfcawz77ywx837ybhwzcivn7hgqb9cmlp1y2syy8gk"))))
(arguments
'(#:configure-flags
(list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out")
"/lib/udev/rules.d")
"-Dsystemd=false")
"-Dsystemd=disabled")
#:phases
(modify-phases %standard-phases
;; Skip shrink-runpath, otherwise validate-runpath fails.

View File

@ -3451,10 +3451,10 @@ is a library for creating graphical user interfaces.")
(sbcl-package->ecl-package sbcl-cl-cffi-gtk))
(define-public sbcl-cl-webkit
(let ((commit "891bcd2c76a61121af930f986abb1f24814913c5"))
(let ((commit "cfc4f01ee806169d824750b4014653a93af9353d"))
(package
(name "sbcl-cl-webkit")
(version (git-version "2.4" "15" commit))
(version (git-version "2.4" "16" commit))
(source
(origin
(method git-fetch)
@ -3464,7 +3464,7 @@ is a library for creating graphical user interfaces.")
(file-name (git-file-name "cl-webkit" version))
(sha256
(base32
"00qfbzpw3biqna6fh8ga9dmxckids46vxy4sxma1r3cxq2yig739"))))
"18n90m33bi6arnjmwr3q3m0arwzr0kdnydlv4if82crvaagd6m89"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)
@ -4439,7 +4439,7 @@ addition, removal, and random selection.")
(define-public sbcl-quri
(package
(name "sbcl-quri")
(version "0.3.0")
(version "0.4.0")
(source
(origin
(method git-fetch)
@ -4448,7 +4448,7 @@ addition, removal, and random selection.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1pkvpiwwhx2fcknr7x47h7036ypkg8xzsskqbl5z315ipfmi8s2m"))))
(base32 "0ka5haq3g72hvaz4hdv7y1d6df9ncmx029wwixn4r413gll5yxy7"))))
(build-system asdf-build-system/sbcl)
(arguments
;; Test system must be loaded before, otherwise tests fail with:
@ -5858,59 +5858,56 @@ formats.")
(sbcl-package->ecl-package sbcl-swap-bytes))
(define-public sbcl-iolib
;; Latest release is from June 2017.
(let ((commit "7f5ea3a8457a29d224b24653c2b3657fb1898021")
(revision "2"))
(package
(name "sbcl-iolib")
(version (git-version "0.8.3" revision commit))
(home-page "https://github.com/sionescu/iolib")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1bg5w7lm61hqk4b0svmri8a590q36z76jfa0sdgzb39r98c04w12"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("cffi" ,sbcl-cffi)
("idna" ,sbcl-idna)
("libfixposix" ,libfixposix)
("split-sequence" ,sbcl-split-sequence)
("swap-bytes" ,sbcl-swap-bytes)))
(arguments
'(#:asd-files '("iolib.asdf.asd"
"iolib.conf.asd"
"iolib.common-lisp.asd"
"iolib.base.asd"
"iolib.asd")
#:asd-systems '("iolib"
"iolib/os")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/syscalls/ffi-functions-unix.lisp"
(("\\(:default \"libfixposix\"\\)")
(string-append
"(:default \""
(assoc-ref inputs "libfixposix") "/lib/libfixposix\")")))
;; Socket tests need Internet access, disable them.
(substitute* "iolib.asd"
(("\\(:file \"sockets\" :depends-on \\(\"pkgdcl\" \"defsuites\"\\)\\)")
"")))))))
(synopsis "Common Lisp I/O library")
(description "IOlib is to be a better and more modern I/O library than
(package
(name "sbcl-iolib")
(version "0.8.4")
(home-page "https://github.com/sionescu/iolib")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("cffi" ,sbcl-cffi)
("idna" ,sbcl-idna)
("libfixposix" ,libfixposix)
("split-sequence" ,sbcl-split-sequence)
("swap-bytes" ,sbcl-swap-bytes)))
(arguments
'(#:asd-files '("iolib.asdf.asd"
"iolib.conf.asd"
"iolib.common-lisp.asd"
"iolib.base.asd"
"iolib.asd")
#:asd-systems '("iolib"
"iolib/os")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/syscalls/ffi-functions-unix.lisp"
(("\\(:default \"libfixposix\"\\)")
(string-append
"(:default \""
(assoc-ref inputs "libfixposix") "/lib/libfixposix\")")))
;; Socket tests need Internet access, disable them.
(substitute* "iolib.asd"
(("\\(:file \"sockets\" :depends-on \\(\"pkgdcl\" \"defsuites\"\\)\\)")
"")))))))
(synopsis "Common Lisp I/O library")
(description "IOlib is to be a better and more modern I/O library than
the standard Common Lisp library. It contains a socket library, a DNS
resolver, an I/O multiplexer(which supports @code{select(2)}, @code{epoll(4)}
and @code{kqueue(2)}), a pathname library and file-system utilities.")
(license license:expat))))
(license license:expat)))
(define-public cl-iolib
(let ((parent (sbcl-package->cl-source-package sbcl-iolib)))
@ -9857,20 +9854,20 @@ correctly.")
(sbcl-package->ecl-package sbcl-trivialib-type-unify))
(define-public sbcl-specialized-function
(let ((commit "dee56d2d2b6ecd10500ad291c56217698604ec35")
(revision "2"))
(let ((commit "5e2b04432bdf728496e6ff7227f210f845af7247")
(revision "3"))
(package
(name "sbcl-specialized-function")
(version (git-version "0.0.0" revision commit))
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/numcl/specialized-function")
(commit commit)))
(file-name (git-file-name name version))
(file-name (git-file-name "specialized-function" version))
(sha256
(base32 "1mcc7mmpbnmgnr1cl2jl5r1ai54gn7fbisv2c14sh9za5w4sib82"))))
(base32 "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"))))
(build-system asdf-build-system/sbcl)
(synopsis "Julia-like dispatch for Common Lisp")
(description
@ -9881,21 +9878,17 @@ code. The main target of this macro is speed.")
(home-page "https://github.com/numcl/specialized-function")
(license license:lgpl3+)
(inputs
`(("trivia" ,sbcl-trivia)
("alexandria" ,sbcl-alexandria)
`(("alexandria" ,sbcl-alexandria)
("iterate" ,sbcl-iterate)
("lisp-namespace" ,sbcl-lisp-namespace)
("type-r" ,sbcl-type-r)
("trivial-cltl2" ,sbcl-trivial-cltl2)))
("trivia" ,sbcl-trivia)
("trivial-cltl2" ,sbcl-trivial-cltl2)
("type-r" ,sbcl-type-r)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-files '("specialized-function.asd")
#:test-asd-file "specialized-function.test.asd"
;; Tests fail because they try to use an internal symbol of SBCL
;; that does not exists in recent versions:
;; "The variable SB-VM:COMPLEX-VECTOR-NIL-WIDETAG is unbound."
#:tests? #f)))))
#:test-asd-file "specialized-function.test.asd")))))
(define-public cl-specialized-function
(sbcl-package->cl-source-package sbcl-specialized-function))
@ -15548,7 +15541,7 @@ return the CPU count of the current system.")
(define-public sbcl-fof
(package
(name "sbcl-fof")
(version "0.1.0")
(version "0.2.0")
(source
(origin
(method git-fetch)
@ -15557,7 +15550,7 @@ return the CPU count of the current system.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1xdnlqrjfmgdgw58avkci881iwarv4am2vq09b14pfifmpxpzv10"))))
(base32 "0j64b7p40h8bq33hqkpgakm3vs1607vyx6n48d7qg3287v1akk6m"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:phases
@ -17247,3 +17240,234 @@ needed. The low-level command API is fully mapped however.")
(define-public cl-legit
(sbcl-package->cl-source-package sbcl-legit))
(define-public sbcl-flow
(let ((commit "6d925af009cdfe033650d7048197a5e6ee937d15")
(revision "1"))
(package
(name "sbcl-flow")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/flow")
(commit commit)))
(file-name (git-file-name "flow" version))
(sha256
(base32 "0ysw1kwiqlf8kzllhnz8v3q40dmvwf83fzq8bfkbmwy5hfjh3pxp"))))
(build-system asdf-build-system/sbcl)
(arguments
;; FIXME: (Sharlatan-20210527T203118+0100): FLOW-VISUALIZER requires
;; COMMONQT which is not packed yet and required tweaks with QT. Remove
;; this when it's ready.
`(#:asd-files '("flow.asd")))
(inputs
`(("closer-mop" ,sbcl-closer-mop)
("documentation-utils" ,sbcl-documentation-utils)))
(home-page "https://shinmera.github.io/flow/")
(synopsis "Tools for the representation of graphs and flowcharts")
(description
"FLOW is a flowchart graph library. Unlike other graphing libraries,
this one focuses on nodes in a graph having distinct @code{ports} through which
connections to other nodes are formed. This helps in many concrete scenarios
where it is important to distinguish not only which nodes are connected, but
also how they are connected to each other.
Particularly, a lot of data flow and exchange problems can be reduced to such
a @code{flowchart}. For example, an audio processing library may present its
pipeline as a flowchart of segments that communicate with each other through
audio sample buffers. Flow gives a convenient view onto this kind of problem,
and even allows the generic visualisation of graphs in this format.")
(license license:zlib))))
(define-public ecl-flow
(sbcl-package->ecl-package sbcl-flow))
(define-public cl-flow
(sbcl-package->cl-source-package sbcl-flow))
(define-public sbcl-cl-glfw3
(let ((commit "32c3f34d592d55ee7ce932ed85804c1a9c4158c6")
(revision "1"))
(package
(name "sbcl-cl-glfw3")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AlexCharlton/cl-glfw3")
(commit commit)))
(file-name (git-file-name "cl-glfw3" version))
(sha256
(base32 "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-glfw-lib-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "glfw-bindings.lisp"
(("libglfw.so.3" all)
(string-append (assoc-ref inputs "glfw") "/lib/" all))))))))
(inputs
`(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
("cl-opengl" ,sbcl-cl-opengl)
("glfw" ,glfw)
("trivial-main-thread" ,sbcl-trivial-main-thread)))
(home-page "https://github.com/AlexCharlton/cl-glfw3")
(synopsis "Common Lisp bindings to GLFW version 3.x")
(description
"This package provides a Common Lisp bindings to @code{glfw}, an OpenGL
application development library.")
(license license:bsd-2))))
(define-public ecl-cl-glfw3
(sbcl-package->ecl-package sbcl-cl-glfw3))
(define-public cl-glfw3
(sbcl-package->cl-source-package sbcl-cl-glfw3))
(define-public sbcl-chirp
(let ((commit "01c79fa41939688216d1f86d0766a687becb0654")
(revision "1"))
(package
(name "sbcl-chirp")
(version (git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/chirp")
(commit commit)))
(file-name (git-file-name "chirp" version))
(sha256
(base32 "10xlz1vwdv3jv48kmpndpnrg6672m0r5vsjgm2pksfl8bc05j2m0"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:asd-systems '("chirp-core" "chirp-dexador" "chirp-drakma" "chirp")))
(inputs
`(("alexandria" ,sbcl-alexandria)
("babel" ,sbcl-babel)
("cl-base64" ,sbcl-cl-base64)
("cl-ppcre" ,sbcl-cl-ppcre)
("dexador" ,sbcl-dexador)
("drakma" ,sbcl-drakma)
("flexi-streams" ,sbcl-flexi-streams)
("ironclad" ,sbcl-ironclad)
("local-time" ,sbcl-local-time)
("split-sequence" ,sbcl-split-sequence)
("uuid" ,sbcl-uuid)
("yason" ,sbcl-yason)))
(home-page "https://shinmera.github.io/chirp/")
(synopsis "Twitter client library for Common Lisp")
(description
"This package provides a Common Lisp Twitter client featuring full API
coverage.")
(license license:zlib))))
(define-public ecl-chirp
(sbcl-package->ecl-package sbcl-chirp))
(define-public cl-chirp
(sbcl-package->cl-source-package sbcl-chirp))
(define-public sbcl-cepl
(let ((commit "d1a10b6c8f4cedc07493bf06aef3a56c7b6f8d5b")
(revision "1"))
(package
(name "sbcl-cepl")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cbaggers/cepl")
(commit commit)))
(file-name (git-file-name "cepl" version))
(sha256
(base32 "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:asd-files '("cepl.asd" "cepl.build.asd")))
(inputs
`(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("cffi" ,sbcl-cffi)
("cl-opengl" ,sbcl-cl-opengl)
("cl-ppcre" ,sbcl-cl-ppcre)
("documentation-utils" ,sbcl-documentation-utils)
("float-features" ,sbcl-float-features)
("ieee-floats" ,sbcl-ieee-floats)
("split-sequence" ,sbcl-split-sequence)
("varjo" ,sbcl-varjo)))
(propagated-inputs
`(("quickproject" ,sbcl-quickproject)))
(home-page "https://github.com/cbaggers/cepl")
(synopsis "Development playground to work with OpenGL")
(description
"CEPL (Code Evaluate Play Loop ) is a lispy and REPL-friendly Common Lisp
library for working with OpenGL.
Its definition of success is making the user feel that GPU programming has
always been part of the languages standard.
The usual approach to using CEPL is to start it at the beginning of your Lisp
session and leave it open for the duration of your work. You can then treat the
window it creates as just another output for your graphics, analogous to how
@code{*standard-output*} is treated for text.")
(license license:bsd-2))))
(define-public ecl-cepl
(sbcl-package->ecl-package sbcl-cepl))
(define-public cl-cepl
(sbcl-package->cl-source-package sbcl-cepl))
(define-public sbcl-stmx
;; No release for years and recent commits contain fixes for revent SBCL versions.
(let ((commit "a7bb44082cd53ee968965adff03d4351750711a1")
(revision "1"))
(package
(name "sbcl-stmx")
(version (git-version "2.0.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cosmos72/stmx/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1hfmh4vj271jdilir97qs6nqbi5nmn5alyls0w3d3xxqwi6ffqjs"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("log4cl" ,sbcl-log4cl)
("closer-mop" ,sbcl-closer-mop)
("trivial-garbage" ,sbcl-trivial-garbage)))
(home-page "https://stmx.org/")
(synopsis "High performance Transactional Memory for Common Lisp")
(description
"STMX is a high-performance implementation of composable Transactional
Memory, which is a concurrency control mechanism aimed at making concurrent
programming easier to write and understand. Instead of traditional lock-based
programming, one programs with atomic memory transactions, which can be
composed together to make larger atomic memory transactions.
A memory transaction gets committed if it returns normally, while it gets
rolled back if it signals an error (and the error is propagated to the
caller).
Finally, memory transactions can safely run in parallel in different threads,
are re-executed from the beginning in case of conflicts or if consistent reads
cannot be guaranteed, and their effects are not visible from other threads
until they commit.
Memory transactions give freedom from deadlocks, are immune to thread-safety
bugs and race conditions, provide automatic roll-back on failure, and aim at
resolving the tension between granularity and concurrency.")
(license license:llgpl))))

View File

@ -37,7 +37,7 @@
"0cpyj1ji6hjy7zzz05672f0j6fr0mwpc1y3sq36hhkv2fkpidw22"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase-5)))
(arguments
`(#:phases
(modify-phases %standard-phases

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