me
/
guix
Archived
1
0
Fork 0
Code

Merge remote-tracking branch 'origin/master' into core-updates

master
Efraim Flashner 2021-03-24 15:28:33 +02:00
parent 5664bcdcb0 65c46e79e0
commit 2aab587f84
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
330 changed files with 20721 additions and 5831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.guix-authorizations
View File

@ -79,6 +79,10 @@
(name "jonsger"))
("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D"
(name "kkebreau"))
("017D 74E2 7F58 5696 3801 781D F663 943E 08D8 092A"
(name "lbraun"))
("CA4F 8CF4 37D7 478F DA05 5FD4 4213 7701 1A37 8446"
(name "lbraun (professional)"))
("ACC2 3BA0 59F7 CCF4 08F0 43AD 442A 84B8 C70E 2F87"
(name "leoprikler"))
("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9"

7
Makefile.am
View File

@ -14,6 +14,7 @@
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
# This file is part of GNU Guix.
#
@ -250,6 +251,7 @@ MODULES = \
guix/import/github.scm \
guix/import/gnome.scm \
guix/import/gnu.scm \
guix/import/go.scm \
guix/import/hackage.scm \
guix/import/json.scm \
guix/import/kde.scm \
@ -293,6 +295,7 @@ MODULES = \
guix/scripts/import/elpa.scm \
guix/scripts/import/gem.scm \
guix/scripts/import/gnu.scm \
guix/scripts/import/go.scm \
guix/scripts/import/hackage.scm \
guix/scripts/import/json.scm \
guix/scripts/import/nix.scm \
@ -456,6 +459,7 @@ SCM_TESTS = \
tests/git-authenticate.scm \
tests/glob.scm \
tests/gnu-maintenance.scm \
tests/go.scm \
tests/grafts.scm \
tests/graph.scm \
tests/gremlin.scm \
@ -797,7 +801,8 @@ SOURCE_TARBALLS = \
$(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext))
# Systems supported by Guix.
SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux
SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \
powerpc64le-linux
# Guix binary tarballs.
BINARY_TARBALLS = \

19
build-aux/build-self.scm
View File

@ -356,14 +356,17 @@ interface (FFI) of Guile.")
(display
(and=>
(run-with-store store
(guix-derivation source version
#$guile-version
#:channel-metadata
'#$channel-metadata
#:pull-version
#$pull-version)
#:system system)
;; Silence autoload warnings and the likes.
(parameterize ((current-warning-port
(%make-void-port "w")))
(run-with-store store
(guix-derivation source version
#$guile-version
#:channel-metadata
'#$channel-metadata
#:pull-version
#$pull-version)
#:system system))
derivation-file-name))))))
#:module-path (list source))))

6
configure.ac
View File

@ -151,9 +151,9 @@ if test "x$guix_cv_have_recent_guile_git" != "xyes"; then
fi
dnl Check for Guile-zlib.
GUILE_MODULE_AVAILABLE([have_guile_zlib], [(zlib)])
if test "x$have_guile_zlib" != "xyes"; then
AC_MSG_ERROR([Guile-zlib is missing; please install it.])
GUIX_CHECK_GUILE_ZLIB
if test "x$guix_cv_have_recent_guile_zlib" != "xyes"; then
AC_MSG_ERROR([A recent Guile-zlib could not be found; please install it.])
fi
dnl Check for Guile-lzlib.

34
doc/build.scm
View File

@ -182,32 +182,6 @@ as well as images, OS examples, and translations."
"-c" "EXTRA_HEAD=<meta name=\"viewport\" \
content=\"width=device-width, initial-scale=1\" />"))
(define guile-lib/htmlprag-fixed
;; Guile-Lib with a hotfix for (htmlprag).
(package
(inherit guile-lib)
(arguments
(substitute-keyword-arguments (package-arguments guile-lib)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'build 'fix-htmlprag
(lambda _
;; When parsing
;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
;; 'html->shtml' would mistakenly close 'blockquote' right
;; before <p>. This patch removes 'p' from the
;; 'parent-constraints' alist to fix that.
(substitute* "src/htmlprag.scm"
(("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
""))
#t))
(add-before 'check 'skip-known-failure
(lambda _
;; XXX: The above change causes one test failure among
;; the htmlprag tests.
(setenv "XFAIL_TESTS" "htmlprag.scm")
#t))))))))
(define (normalize-language-code language) ;XXX: deduplicate
;; Normalize LANGUAGE. For instance, "zh_CN" becomes "zh-cn".
(string-map (match-lambda
@ -224,7 +198,7 @@ key is an identifier and the associated value is the URL reference pointing to
that identifier. The URL is constructed by concatenating BASE-URL to the
actual file name."
(define build
(with-extensions (list guile-lib/htmlprag-fixed)
(with-extensions (list guile-lib)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils)
@ -236,6 +210,8 @@ actual file name."
(ice-9 threads)
(ice-9 pretty-print))
(%strict-tokenizer? #t)
(define file-url
(let ((prefix (string-append #$manual "/")))
(lambda (file)
@ -380,7 +356,7 @@ actual file name."
to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all
its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
(define build
(with-extensions (list guile-lib/htmlprag-fixed guile-syntax-highlight)
(with-extensions (list guile-lib guile-syntax-highlight)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (htmlprag)
@ -394,6 +370,8 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
(ice-9 threads)
(ice-9 vlist))
(%strict-tokenizer? #t)
(define (pair-open/close lst)
;; Pair 'open' and 'close' tags produced by 'highlights' and
;; produce nested 'paren' tags instead.

9
doc/contributing.texi
View File

@ -432,7 +432,7 @@ upstream source.
@subsection Package Naming
@cindex package name
A package has actually two names associated with it:
A package actually has two names associated with it.
First, there is the name of the @emph{Scheme variable}, the one following
@code{define-public}. By this name, the package can be made known in the
Scheme code, for instance as input to another package. Second, there is
@ -1016,7 +1016,6 @@ your @code{operating-system} configuration:
(service qemu-binfmt-service-type
(qemu-binfmt-configuration
(platforms (lookup-qemu-platforms "arm" "aarch64"))
(guix-support? #t)))
@end lisp
Then reconfigure your system.
@ -1374,6 +1373,12 @@ 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 they’re familiar with.
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.
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,

499
doc/guix.texi
View File

@ -32,7 +32,7 @@ Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021 Leo Famulari@*
Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@*
Copyright @copyright{} 2016 Ben Woodcroft@*
Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner@*
Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016, 2017 Nikita Gillmann@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@*
@ -86,6 +86,7 @@ Copyright @copyright{} 2020 raingloom@*
Copyright @copyright{} 2020 Daniel Brooks@*
Copyright @copyright{} 2020 John Soo@*
Copyright @copyright{} 2020 Jonathan Brielmaier@*
Copyright @copyright{} 2020 Edgar Vincent@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -830,7 +831,8 @@ Guile,, gnutls-guile, GnuTLS-Guile});
@item
@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0
or later;
@item @uref{https://notabug.org/guile-zlib/guile-zlib, Guile-zlib};
@item @uref{https://notabug.org/guile-zlib/guile-zlib, Guile-zlib},
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
@ -861,6 +863,11 @@ substitutes (@pxref{Invoking guix publish}).
@uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} for
the @code{crate} importer (@pxref{Invoking guix import}).
@item
@uref{https://www.nongnu.org/guile-lib/doc/ref/htmlprag/, Guile-Lib} for
the @code{go} importer (@pxref{Invoking guix import}) and for some of
the ``updaters'' (@pxref{Invoking guix refresh}).
@item
When @url{http://www.bzip.org, libbz2} is available,
@command{guix-daemon} can use it to compress build logs.
@ -2625,7 +2632,7 @@ Note that @command{sudo guix} runs your user's @command{guix} command and
explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}.
The difference matters here, because @command{guix pull} updates
the @command{guix} command and package definitions only for the user it is ran
the @command{guix} command and package definitions only for the user it is run
as. This means that if you choose to use @command{guix system reconfigure} in
root's login shell, you'll need to @command{guix pull} separately.
@end quotation
@ -2745,7 +2752,11 @@ you can go ahead and install it (run this command as a regular user,
guix install emacs
@end example
You've installed your first package, congrats! In the process, you've
@cindex profile
You've installed your first package, congrats! The package is now
visible in your default @dfn{profile}, @file{$HOME/.guix-profile}---a
profile is a directory containing installed packages.
In the process, you've
probably noticed that Guix downloaded pre-built binaries; or, if you
explicitly chose to @emph{not} use pre-built binaries, then probably
Guix is still building software (@pxref{Substitutes}, for more info).
@ -3053,9 +3064,13 @@ retaining precise @dfn{provenance tracking} of the software.
@cindex removing packages
@cindex package installation
@cindex package removal
@cindex profile
The @command{guix package} command is the tool that allows users to
install, upgrade, and remove packages, as well as rolling back to
previous configurations. It operates only on the user's own profile,
previous configurations. These operations work on a user
@dfn{profile}---a directory of installed packages. Each user has a
default profile in @file{$HOME/.guix-profile}.
The command operates only on the user's own profile,
and works with normal user privileges (@pxref{Features}). Its syntax
is:
@ -3380,6 +3395,7 @@ variable, even though, taken individually, neither @file{foo} nor
@file{bar} would lead to that recommendation.
@cindex profile, choosing
@item --profile=@var{profile}
@itemx -p @var{profile}
Use @var{profile} instead of the user's default profile.
@ -5253,7 +5269,7 @@ The meta-data file should contain a simple S-expression like this:
(version 0)
(dependencies
(channel
(name 'some-collection)
(name some-collection)
(url "https://example.org/first-collection.git")
;; The 'introduction' bit below is optional: you would
@ -5264,7 +5280,7 @@ The meta-data file should contain a simple S-expression like this:
(commit "a8883b58dc82e167c96506cf05095f37c2c2c6cd")
(signer "CABB A931 C0FF EEC6 900D 0CFB 090B 1199 3D9A EBB5"))))
(channel
(name 'some-other-collection)
(name some-other-collection)
(url "https://example.org/second-collection.git")
(branch "testing"))))
@end lisp
@ -7445,8 +7461,10 @@ supports builds of packages using Cargo, the build tool of the
It adds @code{rustc} and @code{cargo} to the set of inputs.
A different Rust package can be specified with the @code{#:rust} parameter.
Regular cargo dependencies should be added to the package definition via the
@code{#:cargo-inputs} parameter as a list of name and spec pairs, where the
Regular cargo dependencies should be added to the package definition similarly
to other packages; those needed only at build time to native-inputs, others to
inputs. If you need to add source-only crates then you should add them to via
the @code{#:cargo-inputs} parameter as a list of name and spec pairs, where the
spec can be a package or a source definition. Note that the spec must
evaluate to a path to a gzipped tarball which includes a @code{Cargo.toml}
file at its root, or it will be ignored. Similarly, cargo dev-dependencies
@ -7457,8 +7475,11 @@ In its @code{configure} phase, this build system will make any source inputs
specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs}
parameters available to cargo. It will also remove an included
@code{Cargo.lock} file to be recreated by @code{cargo} during the
@code{build} phase. The @code{install} phase installs the binaries
defined by the crate.
@code{build} phase. The @code{package} phase will run @code{cargo package}
to create a source crate for future use. The @code{install} phase installs
the binaries defined by the crate. Unless @code{install-source? #f} is
defined it will also install a source crate repository of itself and unpacked
sources, to ease in future hacking on rust packages.
@end defvr
@defvr {Scheme Variable} chicken-build-system
@ -7730,13 +7751,34 @@ julia} packages, which essentially is similar to running @samp{julia -e
Tests are run by calling @code{/test/runtests.jl}.
The Julia package name is read from the file @file{Project.toml}. This
value can be overridden by passing the argument @code{#:julia-file-name}
value can be overridden by passing the argument @code{#:julia-package-name}
(which must be correctly capitalized).
For packages requiring shared library dependencies, you may need to write the
@file{/deps/deps.jl} file manually. It's usually a line of @code{const
variable = /gnu/store/library.so} for each dependency, plus a void function
@code{check_deps() = nothing}.
Julia packages usually manage they binary dependencies via
@code{JLLWrappers.jl}, a Julia package that creates a module (named
after the wrapped library followed by @code{_jll.jl}.
To add the binary path @code{_jll.jl} packages, you need to patch the
files under @file{src/wrappers/}, replacing the call to the macro
@code{JLLWrappers.@@generate_wrapper_header}, adding as a secound
argument containing the store path the binary.
As an example, in the MbedTLS Julia package, we add a build phase
(@pxref{Build Phases}) to insert the absolute file name of the wrapped
MbedTLS package:
@lisp
(add-after 'unpack 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (wrapper)
(substitute* wrapper
(("generate_wrapper_header.*")
(string-append
"generate_wrapper_header(\"MbedTLS\", \""
(assoc-ref inputs "mbedtls-apache") "\")\n"))))
;; There's a Julia file for each platform, override them all.
(find-files "src/wrappers/" "\\.jl$"))))
@end lisp
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}
@ -11503,6 +11545,28 @@ Select the given repository (a repository name). Possible values include:
of coq packages.
@end itemize
@end table
@item go
@cindex go
Import metadata for a Go module using
@uref{https://proxy.golang.org, proxy.golang.org}.
This importer is highly experimental. See the source code for more info
about the current state.
@example
guix import go gopkg.in/yaml.v2
@end example
Additional options include:
@table @code
@item --recursive
@itemx -r
Traverse the dependency graph of the given upstream package recursively
and generate package expressions for all those packages that are not yet
in Guix.
@end table
@end table
The structure of the @command{guix import} code is modular. It would be
@ -11548,10 +11612,10 @@ Consider the packages specified, and all the packages upon which they depend.
@example
$ guix refresh --recursive coreutils
gnu/packages/acl.scm:35:2: warning: no updater for acl
gnu/packages/m4.scm:30:12: info: 1.4.18 is already the latest version of m4
gnu/packages/acl.scm:40:13: acl would be upgraded from 2.2.53 to 2.3.1
gnu/packages/m4.scm:30:12: 1.4.18 is already the latest version of m4
gnu/packages/xml.scm:68:2: warning: no updater for expat
gnu/packages/multiprecision.scm:40:12: info: 6.1.2 is already the latest version of gmp
gnu/packages/multiprecision.scm:40:12: 6.1.2 is already the latest version of gmp
@dots{}
@end example
@ -11674,6 +11738,9 @@ the updater for @uref{https://www.stackage.org, Stackage} packages.
the updater for @uref{https://crates.io, Crates} packages.
@item launchpad
the updater for @uref{https://launchpad.net, Launchpad} packages.
@item generic-html
a generic updater that crawls the HTML page where the source tarball of
the package is hosted, when applicable.
@end table
For instance, the following command only checks for updates of Emacs
@ -11788,7 +11855,7 @@ gpg --no-default-keyring --keyring mykeyring.kbx \
--recv-keys @value{OPENPGP-SIGNING-KEY-ID}
@end example
@ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU
@xref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU
Privacy Guard}, for more information on GPG's @option{--keyring} option.
@item --key-download=@var{policy}
@ -19787,34 +19854,6 @@ Additional command line options to pass to @code{memcached}.
@end table
@end deftp
@subsubheading MongoDB
@defvr {Scheme Variable} mongodb-service-type
This is the service type for @uref{https://www.mongodb.com/, MongoDB}.
The value for the service type is a @code{mongodb-configuration} object.
@end defvr
@lisp
(service mongodb-service-type)
@end lisp
@deftp {Data Type} mongodb-configuration
Data type representing the configuration of mongodb.
@table @asis
@item @code{mongodb} (default: @code{mongodb})
The MongoDB package to use.
@item @code{config-file} (default: @code{%default-mongodb-configuration-file})
The configuration file for MongoDB.
@item @code{data-directory} (default: @code{"/var/lib/mongodb"})
This value is used to create the directory, so that it exists and is
owned by the mongodb user. It should match the data-directory which
MongoDB is configured to use through the configuration file.
@end table
@end deftp
@subsubheading Redis
@defvr {Scheme Variable} redis-service-type
@ -27056,9 +27095,9 @@ The verbosity level of the daemon.
@subsection Continuous Integration
@cindex continuous integration
@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a
continuous integration tool for Guix. It can be used both for development and
for providing substitutes to others (@pxref{Substitutes}).
@uref{https://guix.gnu.org/cuirass/, Cuirass} is a continuous
integration tool for Guix. It can be used both for development and for
providing substitutes to others (@pxref{Substitutes}).
The @code{(gnu services cuirass)} module provides the following service.
@ -27067,45 +27106,44 @@ The type of the Cuirass service. Its value must be a
@code{cuirass-configuration} object, as described below.
@end defvr
To add build jobs, you have to set the @code{specifications} field of the
configuration. Here is an example of a service that polls the Guix repository
and builds the packages from a manifest. Some of the packages are defined in
the @code{"custom-packages"} input, which is the equivalent of
@env{GUIX_PACKAGE_PATH}.
To add build jobs, you have to set the @code{specifications} field of
the configuration. For instance, the following example will build all
the packages provided by the @code{my-channel} channel.
@lisp
(define %cuirass-specs
#~(list
'((#:name . "my-manifest")
(#:load-path-inputs . ("guix"))
(#:package-path-inputs . ("custom-packages"))
(#:proc-input . "guix")
(#:proc-file . "build-aux/cuirass/gnu-system.scm")
(#:proc . cuirass-jobs)
(#:proc-args . ((subset . "manifests")
(systems . ("x86_64-linux"))
(manifests . (("config" . "guix/manifest.scm")))))
(#:inputs . (((#:name . "guix")
(#:url . "git://git.savannah.gnu.org/guix.git")
(#:load-path . ".")
(#:branch . "master")
(#:no-compile? . #t))
((#:name . "config")
(#:url . "https://git.example.org/config.git")
(#:load-path . ".")
(#:branch . "master")
(#:no-compile? . #t))
((#:name . "custom-packages")
(#:url . "https://git.example.org/custom-packages.git")
(#:load-path . ".")
(#:branch . "master")
(#:no-compile? . #t)))))))
#~(list (specification
(name "my-channel")
(build '(channels my-channel))
(channels
(cons (channel
(name 'my-channel)
(url "https://my-channel.git"))
%default-channels)))))
(service cuirass-service-type
(cuirass-configuration
(specifications %cuirass-specs)))
@end lisp
To build the @code{linux-libre} package defined by the default Guix
channel, one can use the following configuration.
@lisp
(define %cuirass-specs
#~(list (specification
(name "my-linux")
(build '(packages "linux-libre")))))
(service cuirass-service-type
(cuirass-configuration
(specifications %cuirass-specs)))
@end lisp
The other configuration possibilities, as well as the specification
record itself are described in the Cuirass manual
(@pxref{Specifications,,, cuirass, Cuirass}).
While information related to build jobs is located directly in the
specifications, global settings for the @command{cuirass} process are
accessible in other @code{cuirass-configuration} fields.
@ -27114,20 +27152,15 @@ accessible in other @code{cuirass-configuration} fields.
Data type representing the configuration of Cuirass.
@table @asis
@item @code{cuirass} (default: @code{cuirass})
The Cuirass package to use.
@item @code{log-file} (default: @code{"/var/log/cuirass.log"})
Location of the log file.
@item @code{web-log-file} (default: @code{"/var/log/cuirass-web.log"})
Location of the log file used by the web interface.
@item @code{queries-log-file} (default: @code{#f})
Location of the SQL queries log file. By default, SQL queries logging is
disabled.
@item @code{web-queries-log-file} (default: @code{#f})
Location of the web SQL queries log file. By default, web SQL queries
logging is disabled.
@item @code{cache-directory} (default: @code{"/var/cache/cuirass"})
Location of the repository cache.
@ -27141,17 +27174,19 @@ Owner's group of the @code{cuirass} process.
Number of seconds between the poll of the repositories followed by the
Cuirass jobs.
@item @code{queue-size} (default: @code{1})
Size of the database writer queue.
@item @code{parameters} (default: @code{#f})
Read parameters from the given @var{parameters} file. The supported
parameters are described here (@pxref{Parameters,,, cuirass, Cuirass}).
@item @code{database} (default: @code{"/var/lib/cuirass/cuirass.db"})
Location of sqlite database which contains the build results and previously
added specifications.
@item @code{remote-server} (default: @code{#f})
A @code{cuirass-remote-server-configuration} record to use the build
remote mechanism or @code{#f} to use the default build mechanism.
@item @code{ttl} (default: @code{(* 30 24 3600)})
Specifies the time-to-live (TTL) in seconds of garbage collector roots that
are registered for build results. This means that build results are protected
from garbage collection for at least @var{ttl} seconds.
@item @code{database} (default: @code{"dbname=cuirass host=/var/run/postgresql"})
Use @var{database} as the database containing the jobs and the past
build results. Since Cuirass uses PostgreSQL as a database engine,
@var{database} must be a string such as @code{"dbname=cuirass
host=localhost"}.
@item @code{port} (default: @code{8081})
Port number used by the HTTP server.
@ -27161,11 +27196,9 @@ Listen on the network interface for @var{host}. The default is to
accept connections from localhost.
@item @code{specifications} (default: @code{#~'()})
A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications,
where a specification is an association list
(@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose
keys are keywords (@code{#:keyword-example}) as shown in the example
above.
A gexp (@pxref{G-Expressions}) that evaluates to a list of
specifications records. The specification record is described in the
Cuirass manual (@pxref{Specifications,,, cuirass, Cuirass}).
@item @code{use-substitutes?} (default: @code{#f})
This allows using substitutes to avoid building every dependencies of a job
@ -27181,123 +27214,103 @@ packages locally.
@item @code{extra-options} (default: @code{'()})
Extra options to pass when running the Cuirass processes.
@end table
@end deftp
@cindex remote build
@subsubheading Cuirass remote building
Cuirass supports two mechanisms to build derivations.
@itemize
@item Using the local Guix daemon.
This is the default build mechanism. Once the build jobs are
evaluated, they are sent to the local Guix daemon. Cuirass then
listens to the Guix daemon output to detect the various build events.
@item Using the remote build mechanism.
The build jobs are not submitted to the local Guix daemon. Instead, a
remote server dispatches build requests to the connect remote workers,
according to the build priorities.
@end itemize
To enable this build mode a @code{cuirass-remote-server-configuration}
record must be passed as @code{remote-server} argument of the
@code{cuirass-configuration} record. The
@code{cuirass-remote-server-configuration} record is described below.
This build mode scales way better than the default build mode. This is
the build mode that is used on the GNU Guix build farm at
@url{https://ci.guix.gnu.org}. It should be preferred when using
Cuirass to build large amount of packages.
@deftp {Data Type} cuirass-remote-server-configuration
Data type representing the configuration of the Cuirass remote-server.
@table @asis
@item @code{backend-port} (default: @code{5555})
The TCP port for communicating with @code{remote-worker} processes
using ZMQ. It defaults to @code{5555}.
@item @code{log-port} (default: @code{5556})
The TCP port of the log server. It defaults to @code{5556}.
@item @code{publish-port} (default: @code{5557})
The TCP port of the publish server. It defaults to @code{5557}.
@item @code{log-file} (default: @code{"/var/log/cuirass-remote-server.log"})
Location of the log file.
@item @code{cache} (default: @code{"/var/cache/cuirass/remote"})
Use @var{cache} directory to cache build log files.
@item @code{trigger-url} (default: @code{#f})
Once a substitute is successfully fetched, trigger substitute baking at
@var{trigger-url}.
@item @code{public-key}
@item @code{private-key}
Use the specific @var{file}s as the public/private key pair used to sign
the store items being published.
@end table
@end deftp
At least one remote worker must also be started on any machine of the
local network to actually perform the builds and report their status.
@deftp {Data Type} cuirass-remote-worker-configuration
Data type representing the configuration of the Cuirass remote-worker.
@table @asis
@item @code{cuirass} (default: @code{cuirass})
The Cuirass package to use.
@end table
@end deftp
@cindex simple cuirass
@subsubheading Simple Cuirass
@item @code{workers} (default: @code{1})
Start @var{workers} parallel workers.
The Cuirass service configuration described above can be a little
intimidating. In particular, getting the right @code{specifications}
can prove difficult. The @code{simple-cuirass-configuration->specs}
procedure offers a way to generate those @code{specifications} and thus
setup a continuous integration server more readily.
@deffn {Scheme Procedure} simple-cuirass-configuration->specs @var{configuration}
This procedure takes a @code{simple-cuirass-configuration} record as
argument and returns the corresponding Cuirass specifications gexp.
@end deffn
@deftp {Data Type} simple-cuirass-configuration
Data type representing the configuration of a simple Cuirass instance.
@table @asis
@item @code{build} (default: @code{all})
The packages to be built by Cuirass. It defaults to @code{all}, which
means that all the discovered packages in the subsequent @code{channels}
field are to be selected.
It is also possible to set this field to a list of @code{build-manifest}
records, so that only the packages that are part of the declared
manifests are built. This record is described below.
@deftp {Data Type} build-manifest
@table @asis
@item @code{channel-name}
The name of the channel where the manifest is located.
@item @code{manifest}
The manifest path inside the channel.
@end table
@end deftp
@item @code{channels} (default: @code{%default-channels})
The channels to be fetched by Cuirass (@pxref{Channels}).
@item @code{non-package-channels} (default: @code{'()})
List the channel names that must not be searched for packages. That is
often the case for the channel containing the manifest.
@item @code{server} (default: @code{#f})
Do not use Avahi discovery and connect to the given @code{server} IP
address instead.
@item @code{systems} (default: @code{(list (%current-system))})
Build every discovered package for each system in this list. By default
only the current system is selected.
Only request builds for the given @var{systems}.
@item @code{log-file} (default: @code{"/var/log/cuirass-remote-worker.log"})
Location of the log file.
@item @code{publish-port} (default: @code{5558})
The TCP port of the publish server. It defaults to @code{5558}.
@item @code{public-key}
@item @code{private-key}
Use the specific @var{file}s as the public/private key pair used to sign
the store items being published.
@end table
@end deftp
Here is an example of how to setup a Cuirass instance that builds all
the packages declared by Guix and a user repository. The package list
is re-evaluated each time a commit is pushed in one of the declared
channels.
@lisp
(service cuirass-service-type
(cuirass-configuration
(specifications
(simple-cuirass-configuration->specs
(simple-cuirass-configuration
(build 'all)
(channels (cons (channel
(name 'my-guix)
(url "https://my-git-repo/guix.git"))
%default-channels)))))))
@end lisp
In the same spirit, this builds all the packages that are part of the
@code{guix} or @code{my-guix} channels and declared in the manifest
located in the @code{conf} channel.
@lisp
(service cuirass-service-type
(cuirass-configuration
(specifications
(simple-cuirass-configuration->specs
(simple-cuirass-configuration
(build (list
(build-manifest
(channel-name 'conf)
(manifest "guix/manifest.scm"))))
(channels (cons* (channel
(name 'my-guix)
(url "https://my-git-repo/guix.git"))
(channel
(name 'conf)
(url "https://my-git-repo/conf.git"))
%default-channels))
(non-package-channels '(conf)))))))
@end lisp
Finally, @code{simple-cuirass-services} takes as a second optional
argument a @code{cuirass-configuration} record. It can be used to
customize the configuration of the Cuirass instance.
@lisp
(simple-cuirass-services
(simple-cuirass-configuration
(build 'all)
(channels (cons (channel
(name 'my-guix)
(url "https://my-git-repo/guix.git"))
%default-channels))
(non-package-channels '(conf)))
(cuirass-configuration
(inherit %default-cuirass-config)
(host "0.0.0.0"))) ;listen on all interfaces.
@end lisp
@node Power Management Services
@subsection Power Management Services
@ -28700,13 +28713,6 @@ This is the configuration for the @code{qemu-binfmt} service.
The list of emulated QEMU platforms. Each item must be a @dfn{platform
object} as returned by @code{lookup-qemu-platforms} (see below).
@item @code{guix-support?} (default: @code{#t})
When it is true, QEMU and all its dependencies are added to the build
environment of @command{guix-daemon} (@pxref{Invoking guix-daemon,
@option{--chroot-directory} option}). This allows the @code{binfmt_misc}
handlers to be used within the build environment, which in turn means
that you can transparently build programs for another architecture.
For example, let's suppose you're on an x86_64 machine and you have this
service:
@ -28714,7 +28720,6 @@ service:
(service qemu-binfmt-service-type
(qemu-binfmt-configuration
(platforms (lookup-qemu-platforms "arm"))
(guix-support? #t)))
@end lisp
You can run:
@ -28729,10 +28734,6 @@ build}, transparently using QEMU to emulate the ARMv7 CPU@. Pretty handy
if you'd like to test a package build for an architecture you don't have
access to!
When @code{guix-support?} is set to @code{#f}, programs for other
architectures can still be executed transparently, but invoking commands
like @command{guix build -s armhf-linux @dots{}} will fail.
@item @code{qemu} (default: @code{qemu})
The QEMU package to use.
@end table
@ -31382,6 +31383,21 @@ instantiated as:
(sysctl-configuration
(settings '(("net.ipv4.ip_forward" . "1")))))
@end lisp
Since @code{sysctl-service-type} is used in the default lists of
services, @code{%base-services} and @code{%desktop-services}, you can
use @code{modify-services} to change its configuration and add the
kernel parameters that you want (@pxref{Service Reference,
@code{modify-services}}).
@lisp
(modify-services %base-services
(sysctl-service-type config =>
(sysctl-configuration
(settings (append '(("net.ipv4.ip_forward" . "1"))
%default-sysctl-settings)))))
@end lisp
@end defvr
@deftp {Data Type} sysctl-configuration
@ -31391,11 +31407,16 @@ The data type representing the configuration of @command{sysctl}.
@item @code{sysctl} (default: @code{(file-append procps "/sbin/sysctl"})
The @command{sysctl} executable to use.
@item @code{settings} (default: @code{'()})
@item @code{settings} (default: @code{%default-sysctl-settings})
An association list specifies kernel parameters and their values.
@end table
@end deftp
@defvr {Scheme Variable} %default-sysctl-settings
An association list specifying the default @command{sysctl} parameters
on Guix System.
@end defvr
@cindex pcscd
@subsubheading PC/SC Smart Card Daemon Service
@ -34044,6 +34065,38 @@ This is the list of modules that must be in scope when @code{start} and
@end table
@end deftp
The example below defines a Shepherd service that spawns
@command{syslogd}, the system logger from the GNU Networking Utilities
(@pxref{syslogd invocation, @command{syslogd},, inetutils, GNU
Inetutils}):
@example
(let ((config (plain-file "syslogd.conf" "@dots{}")))
(shepherd-service
(documentation "Run the syslog daemon (syslogd).")
(provision '(syslogd))
(requirement '(user-processes))
(start #~(make-forkexec-constructor
(list #$(file-append inetutils "/libexec/syslogd")
"--rcfile" #$config)
#:pid-file "/var/run/syslog.pid"))
(stop #~(make-kill-destructor))))
@end example
Key elements in this example are the @code{start} and @code{stop}
fields: they are @dfn{staged} code snippets that use the
@code{make-forkexec-constructor} procedure provided by the Shepherd and
its dual, @code{make-kill-destructor} (@pxref{Service De- and
Constructors,,, shepherd, The GNU Shepherd Manual}). The @code{start}
field will have @command{shepherd} spawn @command{syslogd} with the
given option; note that we pass @code{config} after @option{--rcfile},
which is a configuration file declared above (contents of this file are
omitted). Likewise, the @code{stop} field tells how this service is to
be stopped; in this case, it is stopped by making the @code{kill} system
call on its PID@. Code staging is achieved using G-expressions:
@code{#~} stages code, while @code{#$} ``escapes'' back to host code
(@pxref{G-Expressions}).
@deftp {Data Type} shepherd-action
This is the data type that defines additional actions implemented by a
Shepherd service (see above).

4
etc/guix-install.sh
View File

@ -8,6 +8,7 @@
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
# This file is part of GNU Guix.
#
@ -187,6 +188,9 @@ chk_sys_arch()
armv7l)
local arch=armhf
;;
ppc64le | powerpc64le)
local arch=powerpc64le
;;
*)
_err "${ERR}Unsupported CPU type: ${arch}"
exit 1

338
etc/news.scm
View File

@ -1,16 +1,17 @@
;; GNU Guix news, for use by 'guix pull'.
;;
;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;; Copyright © 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;; Copyright © 2019, 2020, 2021 Julien Lepiller <julien@lepiller.eu>
;; Copyright © 2019, 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;; Copyright © 2021 Zhu Zihao <all_but_last@163.com>
;;
;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and
@ -19,6 +20,239 @@
(channel-news
(version 0)
(entry (commit "9ade2b720af91acecf76278b4d9b99ace406781e")
(title
(en "Update on previous @command{guix-daemon} local privilege escalation")
(de "Nachtrag zur lokalen Rechteausweitung bei @command{guix-daemon}")
(nl "Aanvulling bij escalatie van bevoegdheden via @command{guix-daemon}"))
(body
(en "The previous news item described a potential local privilege
escalation in @command{guix-daemon}, and claimed that systems with the Linux
@uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt,
``protected hardlink''} feature enabled were unaffected by the vulnerability.
This is not entirely correct. Exploiting the bug on such systems is harder,
but not impossible. To avoid unpleasant surprises, all users are advised to
upgrade @command{guix-daemon}. Run @command{info \"(guix) Upgrading Guix\"}
for info on how to do that. See
@uref{https://guix.gnu.org/en/blog/2021/risk-of-local-privilege-escalation-via-guix-daemon/}
for more information on this bug.")
(de "In der letzten Neuigkeit wurde eine mögliche lokale
Rechteausweitung im @command{guix-daemon} beschrieben und behauptet, dass
Systeme, auf denen Linux’
@uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt,
„Geschützte-Hardlinks“-Funktionalität} aktiviert ist, von der Sicherheitslücke
nicht betroffen seien.
Das stimmt nicht ganz. Die Lücke auf solchen Systemen auszunutzen, ist
schwerer, aber nicht unmöglich. Um unangenehme Überraschungen zu vermeiden,
empfehlen wir allen Nutzern, @command{guix-daemon} zu aktualisieren. Führen
Sie @command{info \"(guix.de) Aktualisieren von Guix\"} aus, um zu erfahren,
wie Sie ihn aktualisieren können. Siehe
@uref{https://guix.gnu.org/de/blog/2021/risk-of-local-privilege-escalation-via-guix-daemon/}
für mehr Informationen zu diesem Fehler.")
(nl "Het vorige nieuwsbericht beschreef een beveiligingsprobleem in
@command{guix-daemon} dat kan leiden tot de escalatie van lokale bevoegdheden.
Het bericht stelde dat machines waarop de
@uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt,
``protected hardlink''}-optie van Linux is inschakeld niet kwetsbaar zijn.
Dit is niet volledig juist. De optie maakt het uitbuiten van de fout
moeilijker maar niet onmogelijk. Om onaangename verrassingen te voorkomen
is het voor iedereen aangeraden om @command{guix-daemon} op te waarderen.
Voer @command{info \"(guix) Upgrading Guix\"} uit voor meer informatie
daarover. Lees
@uref{https://guix.gnu.org/en/blog/2021/risk-of-local-privilege-escalation-via-guix-daemon/}
voor meer informatie over het probleem.")))
(entry (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf")
(title
(en "Risk of local privilege escalation @i{via} @command{guix-daemon}")
(de "Risiko lokaler Rechteausweitung über @command{guix-daemon}")
(fr "Risque d'élévation locale de privilèges @i{via} @command{guix-daemon}")
(nl "Risico op escalatie van bevoegdheden via @command{guix-daemon}"))
(body
(en "A security vulnerability that can lead to local privilege
escalation has been found in @command{guix-daemon}. It affects multi-user
setups in which @command{guix-daemon} runs locally.
It does @emph{not} affect multi-user setups where @command{guix-daemon} runs
on a separate machine and is accessed over the network, @i{via}
@env{GUIX_DAEMON_SOCKET}, as is customary on cluster setups. Machines where
the Linux @uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt,
``protected hardlink''} feature is enabled, which is common, are also
unaffected---this is the case when the contents of
@file{/proc/sys/fs/protected_hardlinks} are @code{1}.
The attack consists in having an unprivileged user spawn a build process, for
instance with @command{guix build}, that makes its build directory
world-writable. The user then creates a hardlink within the build directory
to a root-owned file from outside of the build directory, such as
@file{/etc/shadow}. If the user passed the @option{--keep-failed} option and
the build eventually fails, the daemon changes ownership of the whole build
tree, including the hardlink, to the user. At that point, the user has write
access to the target file.
You are advised to upgrade @command{guix-daemon}. Run @command{info \"(guix)
Upgrading Guix\"}, for info on how to do that. See
@uref{https://issues.guix.gnu.org/47229} for more information on this bug.")
(de "Eine Sicherheitslücke, die zu einer lokalen Rechteausweitung
führen kann, wurde in @command{guix-daemon} gefunden. Sie betrifft
Mehrbenutzersysteme, auf denen @command{guix-daemon} lokal läuft.
@emph{Nicht} betroffen sind Mehrbenutzersysteme, auf denen
@command{guix-daemon} auf einer separaten Maschine läuft und darauf über das
Netzwerk mittels @env{GUIX_DAEMON_SOCKET} zugegriffen wird, was auf
Rechen-Clustern üblich ist. Auch Maschinen, auf denen Linux’
@uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt,
„Geschützte-Hardlinks“-Funktionalität} aktiviert ist@tie{}– was häufig der
Fall ist@tie{}–, sind nicht betroffen; sie ist aktiviert, wenn
@file{/proc/sys/fs/protected_hardlinks} den Inhalt @code{1} hat.
Der Angriff besteht darin, dass ein unprivilegierter Benutzer einen
Erstellungsprozess startet, etwa mit @command{guix build}, der allen
Schreibberechtigung auf sein Erstellungsverzeichnis erteilt. In diesem
Erstellungsverzeichnis erzeugt der Benutzer nun eine harte Verknüpfung auf
eine Datei außerhalb des Erstellungsverzeichnisses, die dem
Administratornutzer root gehört, etwa @file{/etc/shadow}. Wenn der Nutzer die
Befehlszeilenoption @option{--keep-failed} angegeben hat und die Erstellung
irgendwann fehlschlägt, trägt der Daemon als Besitzer des gesamten
Erstellungsverzeichnisses den Benutzer ein, Hardlink eingeschlossen. Jetzt
hat der Benutzer Schreibzugriff auf die Zieldatei bekommen.
Wir empfehlen, dass Sie @command{guix-daemon} aktualisieren. Führen Sie
@command{info \"(guix.de) Aktualisieren von Guix\"} aus, um zu erfahren, wie
Sie ihn aktualisieren können. Siehe @uref{https://issues.guix.gnu.org/47229}
für mehr Informationen zu diesem Fehler.")
(fr "Une faille de sécurité pouvant mener à une élévation locale de
privilèges a été trouvée dans @command{guix-daemon}. Elle touche les
installations multi-utilisateur·ices dans lesquelles @command{guix-daemon}
tourne en local.
Elle @emph{n'affecte pas} les installations où @command{guix-daemon} tourne
sur une machine séparée et qu'on y accède à travers le réseau, @i{via}
@env{GUIX_DAEMON_SOCKET}, comme c'est typiquement le cas sur les grappes de
calcul (@i{clusters}). Les machines où les
@uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt, ``liens
protégés''} de Linux sont activés, ce qui est courant, ne sont pas non plus
touchées ; cette fonctionnalité est activée si le contenu de
@file{/proc/sys/fs/protected_hardlinks} est @code{1}.
Pour mener cette attaque, un·e utilisateur·rice démarre un processus de
compilation, par exemple avec @command{guix build}, qui rend le répertoire de
compilation inscriptible pour tout le monde. La personne créée ensuite un
lien dur (@i{hard link}) dans ce répertoire vers un fichier appartenant à
@code{root}, tel que @file{/etc/shadow}. Si on a passé l'option
@option{--keep-failed} et que la compilation finit par échouer, le démon met
l'utilisateur·rice appelant·e comme propriétaire de l'ensemble du répertoire
de compilation, y compris le lien. À ce stade, cette personne a accès en
écriture sur le fichier cible.
Nous conseillons de mettre à jour @command{guix-daemon}. Lancer @command{info
\"(guix.fr) Mettre à niveau Guix\"} pour voir comment faire. Voir
@uref{https://issues.guix.gnu.org/47229} pour plus d'informations sur cette
faille.")
(nl "In @command{guix-daemon} werd een beveiligingsprobleem
gevonden dat kan leiden tot de escalatie van lokale bevoegdheden. Het
probleem doet zich voor bij installaties met meerdere gebruikers waarop een
lokale @command{guix-daemon} draait.
Het heeft @emph{geen} invloed op systemen met meerdere gebruikers waarbij de
@command{guix-daemon} op een afzonderlijke machine draait en via
@env{GUIX_DAEMON_SOCKET} over het netwerk wordt aangesproken, zoals
gebruikelijk bij computerclusters. Ook machines waarop de
@uref{https://www.kernel.org/doc/Documentation/sysctl/fs.txt,
``protected hardlink''}-optie van Linux is inschakeld, wat vaak het geval is,
zijn niet kwetsbaar.
De aanval bestaat erin dat een gebruiker zonder privileges een bouwproces
opstart, bijvoorbeeld met @command{guix build}, dat zijn werkmap beschrijfbaar
maakt voor alle gebruikers. Vervolgens maakt de gebruiker vanuit deze map een
harde link naar een bestand erbuiten met @code{root} als eigenaar, zoals
@file{/etc/shadow}. Als de gebruiker de @option{--keep-failed}-optie opgaf
en de bouw faalt, maakt @command{guix-daemon} de gebruiker eigenaar van de
volledige inhoud van de werkmap, met inbegrip van de harde link. Op dat
moment bezit de gebruiker schrijfrechten over het doelbestand.
Het is aangeraden om @command{guix-daemon} op te waarderen. Voer
@command{info \"(guix) Upgrading Guix\"} uit voor meer informatie daarover.
Lees @uref{https://issues.guix.gnu.org/47229} voor meer informatie over het
probleem.")))
(entry (commit "77c2f4e2068ebec3f384c826c5a99785125ff72c")
(title
(en "@code{qemu-binfmt-service-type} is usable for any container")
(de "@code{qemu-binfmt-service-type} funktioniert mit jedem Container")
(fr "@code{qemu-binfmt-service-type} fonctionne avec tous les conteneurs"))
(body
(en "The service now makes use of the statically built QEMU binaries
along with the fix binary (F) @code{binfmt_misc} flag, which allows the kernel
to fully pre-load it in memory. QEMU can thus now be used with any container
without extra configuration. The @code{guix-support?} field of the
@code{qemu-binfmt-configuration} record is removed, as it is no longer
necessary.")
(de "Der Dienst benutzt jetzt statisch gebundene QEMU-Binärdateien
zusammen mit der Fix-Binary-Flag (F) von @code{binfmt_misc}. Dadurch kann der
Kernel die QEMU-Binärdatei als Ganzes vorab in den Speicher laden. Dann kann
sie auch ohne weitere Konfiguration in jeder Art von isolierter Umgebung
benutzt werden. Darum wurde das Feld @code{guix-support?} des
@code{qemu-binfmt-configuration}-Verbundsobjekts entfernt; es wird nicht mehr
gebraucht.")
(fr "Le service utilise maintenant les binaire QEMU statiques avec
le drapeau « fixed » (F) de @code{binfmt_misc}, ce qui permet au noyau
de le charger entièrement en mémoire. On peut donc maintenant utiliser QEMU
avec n'importe quel conteneur sans configuration supplémentaire. Le champ
@code{guix-support?} de l'enregistrement @code{qemu-binfmt-configuration} a
été supprimé car il n'est pas nécessaire.")))
(entry (commit "02e2e093e858e8a0ca7bd66c1f1f6fd0a1705edb")
(title
(en "New @command{guix import go} command")
(de "Neuer Befehl @command{guix import go}")
(fr "Nouvelle commande @command{guix import go}")
(nl "Nieuwe @command{guix import go}-opdracht"))
(body
(en "The new @command{guix import go} command allows packagers to
generate a package definition or a template thereof given the name of a Go
package available through @url{https://proxy.golang.org}, like so:
@example
guix import go golang.org/x/sys
@end example
Run @command{info \"(guix) Invoking guix import\"} for more info.")
(de "Mit dem neuen Befehl @command{guix import go} können
Paketautoren eine Paketdefinition oder eine Vorlage dafür anhand des Namens
eines auf @url{https://proxy.golang.org} verfügbaren Go-Pakets erzeugen, etwa
so:
@example
guix import go golang.org/x/sys
@end example
Führen Sie @command{info \"(guix.de) Aufruf von guix import\"} aus, um mehr
Informationen zu bekommen.")
(fr "La nouvelle commande @command{guix import go} permet aux
empaqueteur·ice·s de générer une définition de paquet ou un modèle de
définition à partir du nom d'un paquet Go disponible via
@url{https://proxy.golang.org}, comme ceci :
@example
guix import go golang.org/x/sys
@end example
Lancez @command{info \"(guix.fr) Invoquer guix import\"} pour en savoir plus.")
(nl "Met de nieuwe @command{guix import go}-opdracht kunnen
pakketschrijvers een pakketdefinitie of -sjabloon aanmaken, op basis van de
naam van een Go-pakket te vinden op @url{https://proxy.golang.org}:
@example
guix import go golang.org/x/sys
@end example
Voer @command{info \"(guix) Invoking guix import\"} uit voor meer
informatie.")))
(entry (commit "1b5b882120daf7d111aa351a919a90e818324347")
(title
(en "The @code{linux-libre} kernel is updated to 5.11.2")
@ -373,7 +607,8 @@ l'instant grâce à la librairie Guile-Avahi.")))
(entry (commit "a9a2fdaabcc78e7a54d9a6bcfa4ee3de308e9a90")
(title (en "Logical Volume Manager (LVM) now supported on Guix System")
(de "Logical Volume Manager (LVM) wird jetzt auf Guix System unterstützt")
(es "El sistema Guix ahora implementa también volúmenes lógicos LVM"))
(es "El sistema Guix ahora implementa también volúmenes lógicos LVM")
(fr "Le gestionnaire de volumes logiques (LVM) est maintenant pris en charge par le système Guix"))
(body
(en "On Guix System, the new @code{lvm-device-mapping} variable
allows you to declare ``mapped devices'' for LVM, the Linux Logical Volume
@ -415,7 +650,20 @@ los volúmenes lógicos «alfa» y «beta» del grupo de volúmenes «vg0»:
@end lisp
Véase @command{info \"(guix.es) Dispositivos traducidos\"} para obtener más
información.")))
información.")
(fr "Sur le système Guix, la nouvelle variable @code{lvm-device-mapping}
vous permet de déclarer des « périphériques mappés » pour LVM, le gestionnaire
de volumes logiques. Par exemple, vous pouvez déclarer les volumes logiques
« alpha » et « beta » du groupe « vg0 » comme ceci :
@lisp
(mapped-device
(source \"vg0\")
(target (list \"vg0-alpha\" \"vg0-beta\"))
(type lvm-device-mapping))
@end lisp
Voir @command{info \"(guix.fr) Périphériques mappés\"} pour en savoir plus.")))
(entry (commit "3b6e4e5fd05e72b8a32ff1a2d5e21464260e21e6")
(title (en "List of substitute keys is now declarative on Guix System")
@ -1066,7 +1314,8 @@ engine")
(es "@command{guix pack -RR} introduce un nuevo motor
de ejecución")
(de "@command{guix pack -RR} führt neuen Ausführungstreiber
ein"))
ein")
(fr "@command{guix pack -RR} introduit un nouveau moteur d'exécution"))
(body
(en "The @command{guix pack -RR} command allows you to create a
tarball containing @dfn{relocatable binaries}. Until now, those would rely
@ -1125,12 +1374,30 @@ export GUIX_EXECUTION_ENGINE
@end example
Führen Sie @command{info \"(guix.de) Aufruf von guix pack\"} aus, wenn Sie
mehr wissen wollen.")))
mehr wissen wollen.")
(fr "La commande @command{guix pack -RR} vous permet de créer une
archive tar contenant des @dfn{binaires repositionnables}. Jusqu'ici, ils
s'appuyaient sur les « espaces de noms non privilégiés » de Linux ou sur
PRoot, quand les espaces de noms non privilégiés n'étaient pas disponibles.
Cependant, PRoot ralenti significativement certains profils d'exécution.
Pour éviter cela, @command{guix pack -RR} introduit une troisième possibilité
basée sur une extension de l'éditeur des liens à l'exécution de GNU (ld.so) et
sur Fakechroot, qui ralenti très peu l'exécution. Vous pouvez choisir l'option
la plus rapide à l'exécution d'un binaire relocalisable de cette manière :
@example
GUIX_EXECUTION_ENGINE=performance
export GUIX_EXECUTION_ENGINE
@end example
Lancez @command{info \"(guix.fr) Invoquer guix pack\"} pour en savoir plus.")))
(entry (commit "88a96c568c47c97d05d883ada5afbc4e1200b10f")
(title (en "New @option{--path} option for @command{guix graph}")
(es "Nueva opción @option{--path} para @command{guix graph}")
(de "Neue Option @option{--path} für @command{guix graph}"))
(de "Neue Option @option{--path} für @command{guix graph}")
(fr "Nouvelle option @option{--path} pour @command{guix graph}"))
(body
(en "The @command{guix graph} command has a new @option{--path}
option that instructs it to display the shortest path between two packages,
@ -1165,7 +1432,18 @@ guix graph --path libreoffice libunistring
@end example
Führen Sie @code{info \"(guix.de) Aufruf von guix graph\"} aus, um mehr zu
erfahren.")))
erfahren.")
(fr "La commande @command{guix graph} a une nouvelle option
@option{--path} qui lui dit d'afficer le plus court chemin entre deux
paquets, dérivations ou éléments du dépôt. Par exemple, la commande ci-dessous
affiche le plus court chemin entre le paquet @code{libreoffice} et
@code{libunistring} :
@example
guix graph --path libreoffice libunistring
@end example
Lancez @code{info \"(guix.fr) Invoquer guix graph\"} pour en savoir plus.")))
(entry (commit "a33eac038a811603c8b9ed106ae405a5f80a0e9d")
(title (en "GNU C Library upgraded")
@ -1271,7 +1549,8 @@ Rezepte mit uns zu teilen!")))
(entry (commit "2ca7af43fe17d9acf082dce85d137a27a8ac4887")
(title (en "Further reduced binary seed bootstrap")
(de "Bootstrapping jetzt mit noch kleinerem Seed"))
(de "Bootstrapping jetzt mit noch kleinerem Seed")
(fr "Le bootstrap binaire est encore plus réduit"))
(body
(en "The package graph on x86_64 and i686 is now rooted in a further
@dfn{reduced set of binary seeds}. The initial set of binaries from which
@ -1283,11 +1562,18 @@ the talk at @uref{https://fosdem.org/2020/schedule/event/gnumes/}.")
Menge an Binärdateien, aus denen heraus Pakete erstellt werden, machen nun
ungefähr 60 MiB aus, ein Viertel der früheren Größe. Führen Sie @code{info
\"(guix.de) Bootstrapping\"} aus, um mehr zu erfahren, oder schauen Sie sich
den Vortrag auf @uref{https://fosdem.org/2020/schedule/event/gnumes/} an.")))
den Vortrag auf @uref{https://fosdem.org/2020/schedule/event/gnumes/} an.")
(fr "Le graphe des paquets sur x86_64 et i686 prend maintenant racine
dans un @dfn{ensemble de graines binaires} plus réduit. L'ensemble initial
des binaires à partir desquels les paquets sont désormais construit pèse
environ 60 Mo, un quart de ce qu'il était. Lancez
@code{info \"(guix.fr) Bootstrapping\"} pour en savoir plus, ou regardez
la présentation sur @uref{https://fosdem.org/2020/schedule/event/gnumes/}.")))
(entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47")
(title (en "Rottlog service added to @code{%base-services}")
(de "Rottlog-Dienst ist nun Teil der @code{%base-services}"))
(de "Rottlog-Dienst ist nun Teil der @code{%base-services}")
(fr "Le service rottlog a été ajouté à @code{%base-services}"))
(body (en "An instance of @code{rottlog-service-type}, the system
service responsible for log rotation, has been added to @code{%base-services}.
If your operating system configuration for Guix System is explicitly adding
@ -1297,11 +1583,18 @@ the ``Log Rotation'' section of the manual for more information.")
Log-Rotation wurde zu den @code{%base-services} hinzugefügt. Wenn der
Systemdienst bereits in Ihrer Konfiguration für Guix System ausdrücklich
genannt wurde, sollten Sie ihn jetzt daraus entfernen. Siehe den Abschnitt
„Log-Rotation“ im Handbuch für weitere Informationen.")))
„Log-Rotation“ im Handbuch für weitere Informationen.")
(fr "Une instance de @code{rottlog-service-type}, le service
système responsable de la rotation des journaux, a été ajoutée à
@code{%base-services}. Si votre configuration de système d'exploitation Guix
System ajoute @code{rottlog-service-type} explicitement, vous devriez maintenant
le supprimer. Voir la section « Rotation des journaux » dans le manuel
pour en savoir plus.")))
(entry (commit "b6bee63bed4f013064c0d902e7c8b83ed7514ade")
(title (en "@code{guile} package now refers to version 3.0")
(de "Das @code{guile}-Paket bezeichnet jetzt Version 3.0"))
(de "Das @code{guile}-Paket bezeichnet jetzt Version 3.0")
(fr "Le paquet @code{guile} se réfère maintenant à la version 3.0"))
(body (en "The @code{guile} package has been upgraded to version 3.0
(instead of 2.2). The @code{guile3.0-} packages have been renamed to their
original name, and @code{guile2.2-} variants of these packages have been
@ -1312,7 +1605,12 @@ system services also run on 3.0.")
beginnen, wurden umbenannt, so dass sie nun den unveränderten Namen tragen,
während ihre Varianten mit @code{guile2.2-} hinzugefügt wurden. Des Weiteren
werden jetzt alle Ableitungen mit Guile 3.0 erstellt und die Systemdienste
laufen auch auf 3.0.")))
laufen auch auf 3.0.")
(fr "Le paquet @code{guile} a été mis à jour vers la version 3.0
(au lieu de la 2.2). Les paquets @code{guile3.0-} ont été renommés en leur
nom d'origine et les variantes @code{guile2.2-} de ces paquets ont été définis.
En plus, les dérivation sont maintenant construites avec Guile 3.0, et les
services systèmes utilisent aussi la 3.0.")))
(entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444")
(title (en "@command{guix pull} now supports SSH authenticated
@ -1418,7 +1716,9 @@ historique.")))
(entry (commit "3e962e59d849e4300e447d94487684102d9d412e")
(title (en "@command{guix graph} now supports package
transformations")
(de "@command{guix graph} unterstützt nun Paketumwandlungen"))
(de "@command{guix graph} unterstützt nun Paketumwandlungen")
(fr "@command{guix graph} prend maintenant en charge les
transformations de paquets"))
(body
(en "The @command{guix graph} command now supports the common package
transformation options (see @command{info \"(guix) Package Transformation
@ -1433,7 +1733,11 @@ Abhängigkeitsgraphen zu sehen.")
comunes de transformación de paquetes (véase @command{info \"(guix.es)
Opciones de transformación de paquetes\"}). Esto es particularmente
útil para comprobar el efecto de la opción de reescritura del grafo
de dependencias @option{--with-input}.")))
de dependencias @option{--with-input}.")
(fr "La commande @command{guix graph} prend maintenant en charge les
transformations de paquets communes (voir @command{info \"(guix.fr) Options de
transformation de paquets\"}). C'est particulièrement utile pour voir l'effet
de l'option @option{--with-input} qui réécrit de graphe de dépendance.")))
(entry (commit "49af34cfac89d384c46269bfd9388b2c73b1220a")
(title (en "@command{guix pull} now honors

53
gnu/build/activation.scm
View File

@ -1,6 +1,11 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@ -37,7 +42,8 @@
activate-modprobe
activate-firmware
activate-ptrace-attach
activate-current-system))
activate-current-system
mkdir-p/perms))
;;; Commentary:
;;;
@ -55,6 +61,47 @@
(define (dot-or-dot-dot? file)
(member file '("." "..")))
;; Based upon mkdir-p from (guix build utils)
(define (verify-not-symbolic dir)
"Verify DIR or its ancestors aren't symbolic links."
(define absolute?
(string-prefix? "/" dir))
(define not-slash
(char-set-complement (char-set #\/)))
(define (verify-component file)
(unless (eq? 'directory (stat:type (lstat file)))
(error "file name component is not a directory" dir)))
(let loop ((components (string-tokenize dir not-slash))
(root (if absolute?
""
".")))
(match components
((head tail ...)
(let ((file (string-append root "/" head)))
(catch 'system-error
(lambda ()
(verify-component file)
(loop tail file))
(lambda args
(if (= ENOENT (system-error-errno args))
#t
(apply throw args))))))
(() #t))))
;; TODO: the TOCTTOU race can be addressed once guile has bindings
;; for fstatat, openat and friends.
(define (mkdir-p/perms directory owner bits)
"Create the directory DIRECTORY and all its ancestors.
Verify no component of DIRECTORY is a symbolic link.
Warning: this is currently suspect to a TOCTTOU race!"
(verify-not-symbolic directory)
(mkdir-p directory)
(chown directory (passwd:uid owner) (passwd:gid owner))
(chmod directory bits))
(define* (copy-account-skeletons home
#:key
(directory %skeleton-directory)

10
gnu/build/file-systems.scm
View File

@ -920,14 +920,8 @@ corresponds to the symbols listed in FLAGS."
;; MS_REMOUNT call below fails with EPERM.
;; See <https://bugs.gnu.org/46292>
(if (memq 'bind-mount (file-system-flags fs))
(or (and=> (find (let ((devno (stat:dev
(lstat source))))
(lambda (mount)
(= (mount-device-number mount)
devno)))
(mounts))
mount-flags)
0)
(statfs-flags->mount-flags
(file-system-mount-flags (statfs source)))
0)))
(options (file-system-options fs)))
(when (file-system-check? fs)

28
gnu/ci.scm
View File

@ -23,6 +23,7 @@
(define-module (gnu ci)
#:use-module (guix channels)
#:use-module (guix config)
#:use-module (guix describe)
#:use-module (guix store)
#:use-module (guix grafts)
#:use-module (guix profiles)
@ -155,6 +156,7 @@ SYSTEM."
"arm-linux-gnueabihf"
"aarch64-linux-gnu"
"powerpc-linux-gnu"
"powerpc64le-linux-gnu"
"riscv64-linux-gnu"
"i586-pc-gnu" ;aka. GNU/Hurd
"i686-w64-mingw32"
@ -422,16 +424,12 @@ valid."
(define (arguments->manifests arguments channels)
"Return the list of manifests extracted from ARGUMENTS."
(define (channel-name->checkout name)
(let ((channel (find (lambda (channel)
(eq? (channel-name channel) name))
channels)))
(channel-url channel)))
(map (match-lambda
((name . path)
(let ((checkout (channel-name->checkout name)))
(in-vicinity checkout path))))
(map (lambda (manifest)
(any (lambda (checkout)
(let ((path (in-vicinity checkout manifest)))
(and (file-exists? path)
path)))
(map channel-url channels)))
arguments))
(define (manifests->packages store manifests)
@ -521,6 +519,16 @@ valid."
(let ((hello (specification->package "hello")))
(list (package-job store (job-name hello)
hello system))))
(('channels . channels)
;; Build only the packages from CHANNELS.
(let ((all (all-packages)))
(filter-map
(lambda (package)
(any (lambda (channel)
(and (member (channel-name channel) channels)
(package->job store package system)))
(package-channels package)))
all)))
(('packages . rest)
;; Build selected list of packages only.
(let ((packages (map specification->package rest)))

79
gnu/local.mk
View File

@ -2,7 +2,7 @@
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Andreas Enge <andreas@enge.fr>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org>
# Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
@ -31,7 +31,7 @@
# Copyright © 2020 R Veera Kumar <vkor@vkten.in>
# Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
# Copyright © 2020 Michael Rohleder <mike@rohleder.de>
# Copyright © 2020 Felix Gruber <felgru@posteo.net>
# Copyright © 2020, 2021 Felix Gruber <felgru@posteo.net>
# Copyright © 2020 Ryan Prior <rprior@protonmail.com>
# Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
# Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
@ -354,7 +354,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/logging.scm \
%D%/packages/logo.scm \
%D%/packages/loko.scm \
%D%/packages/lolcode.scm \
%D%/packages/lsof.scm \
%D%/packages/lua.scm \
%D%/packages/lxde.scm \
@ -690,7 +689,6 @@ GNU_SYSTEM_MODULES = \
%D%/tests.scm \
%D%/tests/audio.scm \
%D%/tests/base.scm \
%D%/tests/cuirass.scm \
%D%/tests/cups.scm \
%D%/tests/databases.scm \
%D%/tests/desktop.scm \
@ -789,6 +787,8 @@ dist_patch_DATA = \
%D%/packages/patches/abcl-fix-build-xml.patch \
%D%/packages/patches/ableton-link-system-libraries-debian.patch \
%D%/packages/patches/abiword-explictly-cast-bools.patch \
%D%/packages/patches/abseil-cpp-fix-gtest.patch \
%D%/packages/patches/abseil-cpp-fix-strerror_test.patch \
%D%/packages/patches/adb-add-libraries.patch \
%D%/packages/patches/aegis-constness-error.patch \
%D%/packages/patches/aegis-perl-tempdir1.patch \
@ -832,7 +832,10 @@ dist_patch_DATA = \
%D%/packages/patches/avahi-localstatedir.patch \
%D%/packages/patches/avidemux-install-to-lib.patch \
%D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
%D%/packages/patches/aws-c-cal-cmake-prefix.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
%D%/packages/patches/aws-c-io-cmake-prefix.patch \
%D%/packages/patches/aws-c-io-disable-networking-tests.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
@ -873,7 +876,10 @@ dist_patch_DATA = \
%D%/packages/patches/blender-2.79-python-3.8-fix.patch \
%D%/packages/patches/boost-fix-transitive-linking.patch \
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
%D%/packages/patches/busybox-CVE-2021-28831.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2018-19876.patch \
%D%/packages/patches/cairo-CVE-2020-35492.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-sqlite.patch \
%D%/packages/patches/calibre-remove-test-unrar.patch \
@ -919,6 +925,7 @@ dist_patch_DATA = \
%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 \
%D%/packages/patches/cyrus-sasl-CVE-2019-19906.patch \
%D%/packages/patches/c++-gsl-find-system-gtest.patch \
%D%/packages/patches/date-output-pkg-config-files.patch \
%D%/packages/patches/datefudge-gettimeofday.patch \
@ -950,6 +957,7 @@ dist_patch_DATA = \
%D%/packages/patches/ecl-16-format-directive-limit.patch \
%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/eigen-remove-openmp-error-counting.patch \
%D%/packages/patches/eigen-stabilise-sparseqr-test.patch \
%D%/packages/patches/einstein-build.patch \
@ -974,6 +982,9 @@ dist_patch_DATA = \
%D%/packages/patches/erlang-man-path.patch \
%D%/packages/patches/eudev-rules-directory.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
%D%/packages/patches/evolution-CVE-2020-11879.patch \
%D%/packages/patches/evolution-data-server-CVE-2020-14928.patch \
%D%/packages/patches/evolution-data-server-CVE-2020-16117.patch \
%D%/packages/patches/evolution-data-server-locales.patch \
%D%/packages/patches/evolution-data-server-libical-compat.patch \
%D%/packages/patches/exercism-disable-self-update.patch \
@ -1051,7 +1062,9 @@ dist_patch_DATA = \
%D%/packages/patches/gdb-hurd.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \
%D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \
%D%/packages/patches/gdm-default-session.patch \
%D%/packages/patches/geary-CVE-2020-24661.patch \
%D%/packages/patches/genimage-signedness.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
@ -1069,6 +1082,26 @@ dist_patch_DATA = \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
%D%/packages/patches/glib-tests-timer.patch \
%D%/packages/patches/glib-CVE-2021-27218.patch \
%D%/packages/patches/glib-CVE-2021-27219-01.patch \
%D%/packages/patches/glib-CVE-2021-27219-02.patch \
%D%/packages/patches/glib-CVE-2021-27219-03.patch \
%D%/packages/patches/glib-CVE-2021-27219-04.patch \
%D%/packages/patches/glib-CVE-2021-27219-05.patch \
%D%/packages/patches/glib-CVE-2021-27219-06.patch \
%D%/packages/patches/glib-CVE-2021-27219-07.patch \
%D%/packages/patches/glib-CVE-2021-27219-08.patch \
%D%/packages/patches/glib-CVE-2021-27219-09.patch \
%D%/packages/patches/glib-CVE-2021-27219-10.patch \
%D%/packages/patches/glib-CVE-2021-27219-11.patch \
%D%/packages/patches/glib-CVE-2021-27219-12.patch \
%D%/packages/patches/glib-CVE-2021-27219-13.patch \
%D%/packages/patches/glib-CVE-2021-27219-14.patch \
%D%/packages/patches/glib-CVE-2021-27219-15.patch \
%D%/packages/patches/glib-CVE-2021-27219-16.patch \
%D%/packages/patches/glib-CVE-2021-27219-17.patch \
%D%/packages/patches/glib-CVE-2021-27219-18.patch \
%D%/packages/patches/glib-CVE-2021-28153.patch \
%D%/packages/patches/glibc-CVE-2018-11236.patch \
%D%/packages/patches/glibc-CVE-2018-11237.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
@ -1088,6 +1121,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-hurd-mach-print.patch \
%D%/packages/patches/glibc-hurd-magic-pid.patch \
%D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \
%D%/packages/patches/glibc-ldd-powerpc.patch \
%D%/packages/patches/glibc-ldd-x86_64.patch \
%D%/packages/patches/glibc-locales.patch \
%D%/packages/patches/glibc-locales-2.28.patch \
@ -1105,12 +1139,15 @@ dist_patch_DATA = \
%D%/packages/patches/gnash-fix-giflib-version.patch \
%D%/packages/patches/gnome-shell-theme.patch \
%D%/packages/patches/gnome-shell-disable-test.patch \
%D%/packages/patches/gnome-shell-CVE-2020-17489.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gnutls-CVE-2021-20231.patch \
%D%/packages/patches/gnutls-CVE-2021-20232.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
@ -1262,8 +1299,11 @@ dist_patch_DATA = \
%D%/packages/patches/libbase-fix-includes.patch \
%D%/packages/patches/libbase-use-own-logging.patch \
%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/libcanberra-sound-theme-freedesktop.patch \
%D%/packages/patches/libcanberra-wayland-crash.patch \
%D%/packages/patches/libcroco-CVE-2020-12825.patch \
%D%/packages/patches/libcyaml-libyaml-compat.patch \
%D%/packages/patches/libexpected-nofetch.patch \
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \
@ -1360,9 +1400,9 @@ dist_patch_DATA = \
%D%/packages/patches/mit-krb5-hurd.patch \
%D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \
%D%/packages/patches/mpg321-CVE-2019-14247.patch \
%D%/packages/patches/module-init-tools-moduledir.patch \
%D%/packages/patches/monero-use-system-miniupnpc.patch \
%D%/packages/patches/mongodb-support-unknown-linux-distributions.patch \
%D%/packages/patches/mono-mdoc-timestamping.patch \
%D%/packages/patches/mozjs17-aarch64-support.patch \
%D%/packages/patches/mozjs24-aarch64-support.patch \
@ -1551,7 +1591,6 @@ dist_patch_DATA = \
%D%/packages/patches/python2-pygobject-2-deprecation.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
%D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \
@ -1679,6 +1718,7 @@ dist_patch_DATA = \
%D%/packages/patches/udiskie-no-appindicator.patch \
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
%D%/packages/patches/ungoogled-chromium-system-nspr.patch \
%D%/packages/patches/ungoogled-chromium-system-opus.patch \
%D%/packages/patches/unison-fix-ocaml-4.08.patch \
%D%/packages/patches/unknown-horizons-python-3.8-distro.patch \
%D%/packages/patches/unzip-CVE-2014-8139.patch \
@ -1694,6 +1734,26 @@ dist_patch_DATA = \
%D%/packages/patches/unzip-initialize-symlink-flag.patch \
%D%/packages/patches/unzip-overflow-long-fsize.patch \
%D%/packages/patches/unzip-remove-build-date.patch \
%D%/packages/patches/unzip-case-insensitive.patch \
%D%/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch \
%D%/packages/patches/unzip-CVE-2016-9844.patch \
%D%/packages/patches/unzip-CVE-2018-1000035.patch \
%D%/packages/patches/unzip-CVE-2018-18384.patch \
%D%/packages/patches/unzip-alt-iconv-utf8-print.patch \
%D%/packages/patches/unzip-alt-iconv-utf8.patch \
%D%/packages/patches/unzip-close.patch \
%D%/packages/patches/unzip-exec-shield.patch \
%D%/packages/patches/unzip-fix-recmatch.patch \
%D%/packages/patches/unzip-manpage-fix.patch \
%D%/packages/patches/unzip-overflow.patch \
%D%/packages/patches/unzip-timestamp.patch \
%D%/packages/patches/unzip-valgrind.patch \
%D%/packages/patches/unzip-x-option.patch \
%D%/packages/patches/unzip-zipbomb-manpage.patch \
%D%/packages/patches/unzip-zipbomb-part1.patch \
%D%/packages/patches/unzip-zipbomb-part2.patch \
%D%/packages/patches/unzip-zipbomb-part3.patch \
%D%/packages/patches/unzip-32bit-zipbomb-fix.patch \
%D%/packages/patches/ustr-fix-build-with-gcc-5.patch \
%D%/packages/patches/util-linux-tests.patch \
%D%/packages/patches/upower-builddir.patch \
@ -1708,6 +1768,7 @@ dist_patch_DATA = \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
%D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/webkitgtk-share-store.patch \
%D%/packages/patches/webkitgtk-bind-all-fonts.patch \
@ -1744,7 +1805,9 @@ dist_patch_DATA = \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
%D%/packages/patches/xsane-support-ipv6.patch \
%D%/packages/patches/xsane-tighten-default-umask.patch \
%D%/packages/patches/yggdrasil-extra-config.patch
%D%/packages/patches/yggdrasil-extra-config.patch \
%D%/packages/patches/ytnef-CVE-2021-3403.patch \
%D%/packages/patches/ytnef-CVE-2021-3404.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in

36
gnu/packages/admin.scm
View File

@ -222,7 +222,7 @@ usual file attributes can be checked for inconsistencies.")
(define-public progress
(package
(name "progress")
(version "0.15")
(version "0.16")
(source
(origin
(method git-fetch)
@ -230,7 +230,7 @@ usual file attributes can be checked for inconsistencies.")
(url "https://github.com/Xfennec/progress")
(commit (string-append "v" version))))
(sha256
(base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"))
(base32 "0gf10j9zd8spain94b5kigknwbdqajiy6fjsa5hhwsc1biz34hcj"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
@ -1052,7 +1052,7 @@ connection alive.")
(define-public isc-dhcp
(let* ((bind-major-version "9")
(bind-minor-version "11")
(bind-patch-version "28")
(bind-patch-version "29")
(bind-release-type "") ; for patch release, use "-P"
(bind-release-version "") ; for patch release, e.g. "6"
(bind-version (string-append bind-major-version
@ -1189,7 +1189,7 @@ connection alive.")
"/bind-" bind-version ".tar.gz"))
(sha256
(base32
"0x2yjy0d8p7i5mr2s5y65fdax0jjgvd8fn07s42c8dxsrbkcp40h"))))
"01vvkvlhsxz4ffz2fw86z0fsf170b93jjnn5710ai6vfri8wgfy7"))))
("coreutils*" ,coreutils)
("sed*" ,sed)))
@ -1503,7 +1503,7 @@ system administrator.")
(define-public sudo
(package
(name "sudo")
(version "1.9.5p2")
(version "1.9.6p1")
(source (origin
(method url-fetch)
(uri
@ -1513,7 +1513,7 @@ system administrator.")
version ".tar.gz")))
(sha256
(base32
"0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk"))
"146alf6cwnzjcckia8m0ibcj9ram2z469f5z7v6vkzpsb30cvsd9"))
(modules '((guix build utils)))
(snippet
'(begin
@ -2002,13 +2002,13 @@ development, not the kernel implementation of ACPI.")
(define-public s-tui
(package
(name "s-tui")
(version "1.0.2")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "s-tui" version))
(sha256
(base32 "0xkfdaz5np21311ffdvhks58155qby8j8scbcixhvjd913pj66qx"))))
(base32 "1clk59wf6v1lq33h4x5qwxvz5ng9mfkp1s6ynxa58w2raq8dbmy5"))))
(build-system python-build-system)
(inputs
`(("python-psutil" ,python-psutil)
@ -2928,13 +2928,13 @@ a new command using the matched rule, and runs it.")
(define-public di
(package
(name "di")
(version "4.48.0.1")
(version "4.49")
(source
(origin
(method url-fetch)
(uri (string-append "https://gentoo.com/di/di-" version ".tar.gz"))
(uri (string-append "mirror://sourceforge/diskinfo-di/di-" version ".tar.gz"))
(sha256
(base32 "0rxli3bcm6vlcfx2jminviv8aawwczrpp9kja5zniawy6528al30"))))
(base32 "1y38jhp2bpwbwzdzjlhgfqc7bxxz9cwapxd61799zjf54jkslkf0"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; obscure test failures
@ -3550,7 +3550,7 @@ make it a perfect utility on modern distros.")
(define-public thermald
(package
(name "thermald")
(version "2.4.2")
(version "2.4.3")
(source
(origin
(method git-fetch)
@ -3559,7 +3559,7 @@ make it a perfect utility on modern distros.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0nzjfiis4d3ml765s65bywk5dhx5x2fb3hpiixpxzzrs50ajwasj"))))
(base32 "1ibihgpmx038xci0k2h471scs5ssn7z5kcvjrfz63qf2ppdf9yh8"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -3748,7 +3748,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
(version "3.2.02-2")
(version "3.3.03-1")
(source
(origin
(method git-fetch)
@ -3757,7 +3757,7 @@ Python loading in HPC environments.")
(commit version)))
(file-name (git-file-name real-name version))
(sha256
(base32 "0fwx798v9kwiwkgbj97w6rjdanwf7ap65vvq1fqy7gd9x78xcxsq"))))
(base32 "1pahns10i5farw47v9v8cykrk5arq8218vpsa8c0bmaia0rf2n1q"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash-minimal)
@ -3961,7 +3961,7 @@ cache of unix and unix-like systems.")
(define-public solaar
(package
(name "solaar")
(version "1.0.4")
(version "1.0.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3970,7 +3970,7 @@ cache of unix and unix-like systems.")
(file-name (git-file-name name version))
(sha256
(base32
"15wzxxr2m5349kkvcs3k5clg1rsmvh6by2066qm4hlgvjwmigggy"))))
"17gkr2lf1kzp1198gcdr30j3c8xd81kg7ly12aar1jrgi6lc7klk"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -3988,7 +3988,7 @@ cache of unix and unix-like systems.")
("python-xlib" ,python-xlib)
("gtk+" ,gtk+)
("python-pygobject" ,python-pygobject)))
(home-page "https://smxi.org/docs/inxi.htm")
(home-page "https://pwr-solaar.github.io/Solaar/")
(synopsis "Linux devices manager for the Logitech Unifying Receiver")
(description "This package provides tools to manage clients of the
Logitech Unifying Receiver.")

18
gnu/packages/adns.scm
View File

@ -74,6 +74,7 @@ scripts.")
(sha256
(base32
"1kl6bzlcmxn0524h5qldlbh99wf96whhvk54w3p4igf3xk8150yh"))))
(replacement c-ares/fixed)
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -87,6 +88,23 @@ The primary examples of such applications are servers which communicate with
multiple clients and programs with graphical user interfaces.")
(license (x11-style "https://c-ares.haxx.se/license.html"))))
(define-public c-ares/fixed
(package
(inherit c-ares)
(name "c-ares")
(version "1.17.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://c-ares.haxx.se/download/" name "-" version
".tar.gz"))
(sha256
(base32
"0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"))))
(arguments
`(;; FIXME: Some tests require network access
#:tests? #f))))
;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
;; We can not build c-ares itself with CMake because that would introduce a
;; circular dependency through nghttp2.

35
gnu/packages/algebra.scm
View File

@ -13,6 +13,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -44,7 +45,6 @@
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages java)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision)
@ -64,6 +64,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system python)
#:use-module (guix build-system r)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix hg-download)
@ -340,7 +341,7 @@ precision.")
(define-public giac
(package
(name "giac")
(version "1.6.0-47")
(version "1.7.0-1")
(source
(origin
(method url-fetch)
@ -352,7 +353,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz"))
(sha256
(base32 "15sgsr8l6njp5spagbqclqkdy3x7ra23wi6wvpc8vzlbivy3v43k"))))
(base32 "0s926aza2larfz02hrhdlpxn77yjlrhjg844b3fhwz11yj942p9q"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)
@ -795,7 +796,7 @@ cosine/ sine transforms or DCT/DST).")
(license license:gpl2+)))
(define-public fftwf
(package (inherit fftw)
(package/inherit fftw
(name "fftwf")
(arguments
(substitute-keyword-arguments (package-arguments fftw)
@ -813,7 +814,7 @@ cosine/ sine transforms or DCT/DST).")
" Single-precision version."))))
(define-public fftw-openmpi
(package (inherit fftw)
(package/inherit fftw
(name "fftw-openmpi")
(inputs
`(("openmpi" ,openmpi)
@ -973,11 +974,8 @@ algorithms from the FORTRAN library MINPACK.")
"-DWITH_MPFR=on"
"-DWITH_MPC=on"
"-DINTEGER_CLASS=flint"
"-DWITH_LLVM=on"
"-DWITH_SYMENGINE_THREAD_SAFE=on"
"-DBUILD_SHARED_LIBS=on"))) ;also build libsymengine
(native-inputs
`(("llvm" ,llvm)))
(inputs
`(("flint" ,flint)
("gmp" ,gmp)
@ -1590,3 +1588,24 @@ general purpose; they require that p satisfy some preconditions based on
the dimension of the input matrix (usually p should be prime and should be
no more than about 20 bits long).")
(license license:bsd-3)))
(define-public r-dtt
(package
(name "r-dtt")
(version "0.1-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "dtt" version))
(sha256
(base32
"0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"))))
(properties `((upstream-name . "dtt")))
(build-system r-build-system)
(home-page "http://www.r-project.org")
(synopsis "Discrete Trigonometric Transforms")
(description
"This package provides functions for 1D and 2D Discrete Cosine Transform
(@dfn{DCT}), Discrete Sine Transform (@dfn{DST}) and Discrete Hartley Transform
(@dfn{DHT}).")
(license license:gpl2+)))

4
gnu/packages/astronomy.scm
View File

@ -167,7 +167,7 @@ feature detection and cosmetic corrections.")
(define-public wcslib
(package
(name "wcslib")
(version "7.4")
(version "7.5")
(source
(origin
(method url-fetch)
@ -175,7 +175,7 @@ feature detection and cosmetic corrections.")
"ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version
".tar.bz2"))
(sha256
(base32 "072i1id4zk08mwi2c1zpy8zxrabl8dqyklx9ikbd2nh56r0rc752"))))
(base32 "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw"))))
(inputs
`(("cfitsio" ,cfitsio)))
(build-system gnu-build-system)

49
gnu/packages/audio.scm
View File

@ -197,7 +197,7 @@ promoting the market for advanced audio.")
(define-public wildmidi
(package
(name "wildmidi")
(version "0.4.3")
(version "0.4.4")
(source
(origin
(method git-fetch)
@ -207,7 +207,7 @@ promoting the market for advanced audio.")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "01f4a9c5xlap5a4pkfnlgkzk5pjlk43zkq6fnw615ghya04g6hrl"))))
(base32 "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No target
@ -1052,6 +1052,40 @@ performances. The plugins include a cellular automaton synthesizer, an
envelope follower, distortion effects, tape effects and more.")
(license license:gpl2+)))
(define-public snapcast
(package
(name "snapcast")
(version "0.24.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/badaix/snapcast")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no included tests
(inputs
`(("boost" ,boost)
("libvorbis" ,libvorbis)
("soxr" ,soxr)
("alsa-lib" ,alsa-lib)
("avahi" ,avahi)
("pulseaudio" ,pulseaudio)
("flac" ,flac)
("opus" ,opus)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/badaix/snapcast")
(synopsis "Synchronous multiroom audio player")
(description
"Snapcast is a multi-room client-server audio player. Clients are time
synchronized with the server to play synced audio.")
(license license:gpl3+)))
(define-public swh-plugins
(package
(name "swh-plugins")
@ -1622,7 +1656,7 @@ follower.")
(define-public fluidsynth
(package
(name "fluidsynth")
(version "2.1.5")
(version "2.1.8")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1631,7 +1665,7 @@ follower.")
(file-name (git-file-name name version))
(sha256
(base32
"0ccpq4p1h1g53ng3961g3lh590qnwvpzwdzpl6ai4j6iazq0bh73"))))
"0r944ndn138ak9s3ivgd1wgkwkh6zp7jjnxd30hryczc6kbhkpmr"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no check target
@ -2678,14 +2712,14 @@ different audio devices such as ALSA or PulseAudio.")
(define-public qjackctl
(package
(name "qjackctl")
(version "0.9.0")
(version "0.9.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
version "/qjackctl-" version ".tar.gz"))
(sha256
(base32
"1gaabf2ncd5xd846fjm3k5d0kzphlyc33k9pralc2j3r3g0cb5ji"))))
"0m72kglwwvn91dxnka4lx765p3r0bcpqw251svymxr2wxjc4rgjg"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f)) ; no check target
@ -4918,8 +4952,7 @@ edited, converted, compressed and saved.")
(license license:lgpl2.1)))
(define-public ztoolkit-rsvg
(package
(inherit ztoolkit)
(package/inherit ztoolkit
(name "ztoolkit-rsvg")
(arguments
`(#:configure-flags `("-Denable_rsvg=true")))

2
gnu/packages/autotools.scm
View File

@ -267,6 +267,8 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
;; Do not show it in the UI since it's meant for internal use.
(properties '((hidden? . #t)))))
;; Only use this package when autoconf is not usable,
;; see <https://issues.guix.gnu.org/46564#1>.
(define-public autoconf-wrapper
(make-autoconf-wrapper autoconf))

19
gnu/packages/axoloti.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@ -39,14 +39,21 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml))
;; XXX The patch does not apply to libusb 1.0.24.
;; See https://github.com/axoloti/axoloti/issues/464
(define libusb-for-axoloti
(package (inherit libusb)
(name "axoloti-libusb")
(version (package-version libusb))
(package
(inherit libusb)
(version "1.0.23")
(source
(origin
(inherit (package-source libusb))
(patches (list (search-patch "libusb-for-axoloti.patch")))))))
(method url-fetch)
(uri (string-append "https://github.com/libusb/libusb/"
"releases/download/v" version
"/libusb-" version ".tar.bz2"))
(sha256
(base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv"))
(patches (list (search-patch "libusb-for-axoloti.patch")))))))
(define dfu-util-for-axoloti
(package (inherit dfu-util)

40
gnu/packages/backup.scm
View File

@ -18,6 +18,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -62,6 +63,7 @@
#:use-module (gnu packages golang)
#:use-module (gnu packages gperf)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages linux)
#:use-module (gnu packages mcrypt)
#:use-module (gnu packages ncurses)
@ -570,13 +572,13 @@ detection, and lossless compression.")
(define-public borg
(package
(name "borg")
(version "1.1.15")
(version "1.1.16")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
(base32 "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"))
(base32 "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"))
(modules '((guix build utils)))
(snippet
'(begin
@ -586,6 +588,8 @@ detection, and lossless compression.")
;; generate the wrong list.
(for-each delete-file
'("src/borg/algorithms/checksums.c"
"src/borg/algorithms/msgpack/_packer.cpp"
"src/borg/algorithms/msgpack/_unpacker.cpp"
"src/borg/chunker.c"
"src/borg/compress.c"
"src/borg/crypto/low_level.c"
@ -1083,3 +1087,35 @@ interactive mode.")
to reduce network traffic and the amount of space that is used by each
backup.")
(license license:agpl3)))
(define-public disarchive
(package
(name "disarchive")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://files.ngyro.com/disarchive/"
"disarchive-" version ".tar.gz"))
(sha256
(base32
"12d4r4i7vi8fxilr2aww6kzq56jax5ymhjfm3cpgx26vj4c70kb6"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("guile-quickcheck" ,guile-quickcheck)))
(inputs
`(("guile" ,guile-3.0)
("zlib" ,zlib)))
(propagated-inputs
`(("guile-gcrypt" ,guile-gcrypt)))
(home-page "https://ngyro.com/software/disarchive.html")
(synopsis "Software archive disassembler")
(description "Disarchive can disassemble software archives into data
and metadata. The goal is to create a small amount of metadata that
can be used to recreate a software archive bit-for-bit from the
original files. For example, a software archive made using tar and
Gzip will need to describe the order of files in the tarball and the
compression parameters used by Gzip.")
(license license:gpl3+)))

13
gnu/packages/base.scm
View File

@ -16,6 +16,7 @@
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com>
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -873,6 +874,14 @@ the store.")
(map (cut string-append slib "/" <>)
files))))))
,@(if (target-powerpc?)
'((add-after 'unpack 'apply-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs
"powerpc64le-patch")))
(invoke "patch" "--force" "-p1"
"-i" patch)))))
'())
,@(if (hurd-target?)
'((add-after 'install 'augment-libc.so
(lambda* (#:key outputs #:allow-other-keys)
@ -893,6 +902,10 @@ the store.")
("gettext" ,gettext-minimal)
("python" ,python-minimal)
,@(if (target-powerpc?)
`(("powerpc64le-patch" ,@(search-patches
"glibc-ldd-powerpc.patch")))
'())
,@(if (hurd-target?)
`(("mig" ,mig)
("perl" ,perl))

6
gnu/packages/benchmark.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
@ -51,14 +51,14 @@
(define-public fio
(package
(name "fio")
(version "3.25")
(version "3.26")
(source (origin
(method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2"))
(sha256
(base32
"16r734an459cz1ax3jyhxc269i3syzdkll4qbv18wqaxpm5y34v6"))))
"1114h60vw63bim872an33xpvjfib6sc9dwj9xvk0yw41xjzfpp06"))))
(build-system gnu-build-system)
(arguments
'(#:test-target "test"

785
gnu/packages/bioconductor.scm
View File

@ -1,11 +1,15 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2019, 2020, 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Peter Lo <peterloleungyau@gmail.com>
;;; Copyright © 2020, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Hong Li <hli@mdc-berlin.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -389,6 +393,25 @@ musculus (Mouse) as provided by UCSC (mm10, December 2011) and stored
in Biostrings objects.")
(license license:artistic2.0)))
(define-public r-genomeinfodbdata
(package
(name "r-genomeinfodbdata")
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomeInfoDbData" version 'annotation))
(sha256
(base32
"0di6nlqpsyqf693k2na65ayqldih563x3zfrczpqc5q2hl5kg35c"))))
(properties
`((upstream-name . "GenomeInfoDbData")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/GenomeInfoDbData")
(synopsis "Species and taxonomy ID look up tables for GenomeInfoDb")
(description "This package contains data for mapping between NCBI taxonomy
ID and species. It is used by functions in the GenomeInfoDb package.")
(license license:artistic2.0)))
(define-public r-homo-sapiens
(package
(name "r-homo-sapiens")
@ -905,6 +928,26 @@ All datasets are restricted to protein coding genes.")
from Illumina 450k methylation arrays.")
(license license:artistic2.0)))
(define-public r-chromstardata
(package
(name "r-chromstardata")
(version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "chromstaRData" version 'experiment))
(sha256
(base32
"0ph80d53598635bb8g61acg5rqwnj8644a0gh297r4hgbvwlflab"))))
(properties `((upstream-name . "chromstaRData")))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/chromstaRData/")
(synopsis "ChIP-seq data for demonstration purposes")
(description
"This package provides ChIP-seq data for demonstration purposes in the
chromstaR package.")
(license license:gpl3)))
(define-public r-genelendatabase
(package
(name "r-genelendatabase")
@ -1243,6 +1286,35 @@ and evaluate clustering results.")
arbitrary genomic intervals along chromosomal ideogram.")
(license license:gpl2)))
(define-public r-iranges
(package
(name "r-iranges")
(version "2.24.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "IRanges" version))
(sha256
(base32
"01mx46a82vd3gz705pj0kk4wpxg683s8jqxchzjia3gz00b4qw52"))))
(properties
`((upstream-name . "IRanges")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)
("r-s4vectors" ,r-s4vectors)))
(home-page "https://bioconductor.org/packages/IRanges")
(synopsis "Infrastructure for manipulating intervals on sequences")
(description
"This package provides efficient low-level and highly reusable S4 classes
for storing ranges of integers, RLE vectors (Run-Length Encoding), and, more
generally, data that can be organized sequentially (formally defined as
@code{Vector} objects), as well as views on these @code{Vector} objects.
Efficient list-like classes are also provided for storing big collections of
instances of the basic classes. All classes in the package use consistent
naming and share the same rich and consistent \"Vector API\" as much as
possible.")
(license license:artistic2.0)))
;; This is a CRAN package, but it depends on r-bsgenome-hsapiens-ucsc-hg19
;; from Bioconductor.
(define-public r-deconstructsigs
@ -1487,6 +1559,298 @@ structure.")
microarrays.")
(license license:artistic2.0)))
(define-public r-annotationforge
(package
(name "r-annotationforge")
(version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationForge" version))
(sha256
(base32
"0y3820dkvwz09wlmz9drx6gqpsr9cwppaiz40zafwfxbz65y8px7"))))
(properties
`((upstream-name . "AnnotationForge")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-dbi" ,r-dbi)
("r-rcurl" ,r-rcurl)
("r-rsqlite" ,r-rsqlite)
("r-s4vectors" ,r-s4vectors)
("r-xml" ,r-xml)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/AnnotationForge")
(synopsis "Code for building annotation database packages")
(description
"This package provides code for generating Annotation packages and their
databases. Packages produced are intended to be used with AnnotationDbi.")
(license license:artistic2.0)))
(define-public r-category
(package
(name "r-category")
(version "2.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Category" version))
(sha256
(base32
"0m77wpnica0h2ia9ajdaiga4plgz1s9wls6pdnxzk7kwl8a68wkr"))))
(properties `((upstream-name . "Category")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotate" ,r-annotate)
("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-genefilter" ,r-genefilter)
("r-graph" ,r-graph)
("r-gseabase" ,r-gseabase)
("r-matrix" ,r-matrix)
("r-rbgl" ,r-rbgl)
("r-dbi" ,r-dbi)))
(home-page "https://bioconductor.org/packages/Category")
(synopsis "Category analysis")
(description
"This package provides a collection of tools for performing category
analysis.")
(license license:artistic2.0)))
(define-public r-deseq2
(package
(name "r-deseq2")
(version "1.30.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DESeq2" version))
(sha256
(base32
"1i0jpzsm1vl7q6qdmplj45w13lsaycxrx5pazlanjba2khn79k19"))))
(properties `((upstream-name . "DESeq2")))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biocparallel" ,r-biocparallel)
("r-genefilter" ,r-genefilter)
("r-geneplotter" ,r-geneplotter)
("r-genomicranges" ,r-genomicranges)
("r-ggplot2" ,r-ggplot2)
("r-iranges" ,r-iranges)
("r-locfit" ,r-locfit)
("r-rcpp" ,r-rcpp)
("r-rcpparmadillo" ,r-rcpparmadillo)
("r-s4vectors" ,r-s4vectors)
("r-summarizedexperiment" ,r-summarizedexperiment)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/DESeq2")
(synopsis "Differential gene expression analysis")
(description
"This package provides functions to estimate variance-mean dependence in
count data from high-throughput nucleotide sequencing assays and test for
differential expression based on a model using the negative binomial
distribution.")
(license license:lgpl3+)))
(define-public r-dexseq
(package
(name "r-dexseq")
(version "1.36.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DEXSeq" version))
(sha256
(base32
"0wfjb42xcr4wjy8a654b74411dky8hp6sp8xdwf0sxqgsxy106qi"))))
(properties `((upstream-name . "DEXSeq")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biocparallel" ,r-biocparallel)
("r-biomart" ,r-biomart)
("r-deseq2" ,r-deseq2)
("r-genefilter" ,r-genefilter)
("r-geneplotter" ,r-geneplotter)
("r-genomicranges" ,r-genomicranges)
("r-hwriter" ,r-hwriter)
("r-iranges" ,r-iranges)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-rsamtools" ,r-rsamtools)
("r-s4vectors" ,r-s4vectors)
("r-statmod" ,r-statmod)
("r-stringr" ,r-stringr)
("r-summarizedexperiment" ,r-summarizedexperiment)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/DEXSeq")
(synopsis "Inference of differential exon usage in RNA-Seq")
(description
"This package is focused on finding differential exon usage using RNA-seq
exon counts between samples with different experimental designs. It provides
functions that allows the user to make the necessary statistical tests based
on a model that uses the negative binomial distribution to estimate the
variance between biological replicates and generalized linear models for
testing. The package also provides functions for the visualization and
exploration of the results.")
(license license:gpl3+)))
(define-public r-edger
(package
(name "r-edger")
(version "3.32.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "edgeR" version))
(sha256
(base32
"1gaic8qf6a6sy0bmydh1xzf52w0wnq31aanpvw3a30pfsi218bcp"))))
(properties `((upstream-name . "edgeR")))
(build-system r-build-system)
(propagated-inputs
`(("r-limma" ,r-limma)
("r-locfit" ,r-locfit)
("r-rcpp" ,r-rcpp)
("r-statmod" ,r-statmod))) ;for estimateDisp
(home-page "http://bioinf.wehi.edu.au/edgeR")
(synopsis "EdgeR does empirical analysis of digital gene expression data")
(description "This package can do differential expression analysis of
RNA-seq expression profiles with biological replication. It implements a range
of statistical methodology based on the negative binomial distributions,
including empirical Bayes estimation, exact tests, generalized linear models
and quasi-likelihood tests. It be applied to differential signal analysis of
other types of genomic data that produce counts, including ChIP-seq, SAGE and
CAGE.")
(license license:gpl2+)))
(define-public r-genefilter
(package
(name "r-genefilter")
(version "1.72.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "genefilter" version))
(sha256
(base32
"1c6h3qnjvphs977qhv5vafvsb108r0q7xhaayly6qv6adqfn94rn"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)
("r-knitr" ,r-knitr)))
(propagated-inputs
`(("r-annotate" ,r-annotate)
("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-survival" ,r-survival)))
(home-page "https://bioconductor.org/packages/genefilter")
(synopsis "Filter genes from high-throughput experiments")
(description
"This package provides basic functions for filtering genes from
high-throughput sequencing experiments.")
(license license:artistic2.0)))
(define-public r-genomeinfodb
(package
(name "r-genomeinfodb")
(version "1.26.4")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomeInfoDb" version))
(sha256
(base32
"1sbhdpgabqbi749ixih8nlmq5id7sg8y6kkfj46r00642rc293ys"))))
(properties
`((upstream-name . "GenomeInfoDb")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)
("r-genomeinfodbdata" ,r-genomeinfodbdata)
("r-iranges" ,r-iranges)
("r-rcurl" ,r-rcurl)
("r-s4vectors" ,r-s4vectors)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/GenomeInfoDb")
(synopsis "Utilities for manipulating chromosome identifiers")
(description
"This package contains data and functions that define and allow
translation between different chromosome sequence naming conventions (e.g.,
\"chr1\" versus \"1\"), including a function that attempts to place sequence
names in their natural, rather than lexicographic, order.")
(license license:artistic2.0)))
(define-public r-gostats
(package
(name "r-gostats")
(version "2.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GOstats" version))
(sha256
(base32
"18q8p0fv9fl2r6zjxknfjwqxr69dlyxy6c8amzn6c6dwjq1cxk6j"))))
(properties `((upstream-name . "GOstats")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotate" ,r-annotate)
("r-annotationdbi" ,r-annotationdbi)
("r-annotationforge" ,r-annotationforge)
("r-biobase" ,r-biobase)
("r-category" ,r-category)
("r-go-db" ,r-go-db)
("r-graph" ,r-graph)
("r-rgraphviz" ,r-rgraphviz)
("r-rbgl" ,r-rbgl)))
(home-page "https://bioconductor.org/packages/GOstats")
(synopsis "Tools for manipulating GO and microarrays")
(description
"This package provides a set of tools for interacting with GO and
microarray data. A variety of basic manipulation tools for graphs, hypothesis
testing and other simple calculations.")
(license license:artistic2.0)))
(define-public r-gseabase
(package
(name "r-gseabase")
(version "1.52.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GSEABase" version))
(sha256
(base32
"0dawh1kjmf6921jm77j2s2phrq5237pjc4sdh8fkln89gf48zx6i"))))
(properties `((upstream-name . "GSEABase")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotate" ,r-annotate)
("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-graph" ,r-graph)
("r-xml" ,r-xml)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/GSEABase")
(synopsis "Gene set enrichment data structures and methods")
(description
"This package provides classes and methods to support @dfn{Gene Set
Enrichment Analysis} (GSEA).")
(license license:artistic2.0)))
(define-public r-hpar
(package
(name "r-hpar")
@ -1507,6 +1871,29 @@ microarrays.")
the Human Protein Atlas project.")
(license license:artistic2.0)))
(define-public r-rbgl
(package
(name "r-rbgl")
(version "1.66.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "RBGL" version))
(sha256
(base32
"016vyzgixb3gjpzi21rbs6ngnnqcxr77krwjjf1ldnzzj8vqrqsz"))))
(properties `((upstream-name . "RBGL")))
(build-system r-build-system)
(propagated-inputs
`(("r-bh" ,r-bh)
("r-graph" ,r-graph)))
(home-page "https://www.bioconductor.org/packages/RBGL")
(synopsis "Interface to the Boost graph library")
(description
"This package provides a fairly extensive and comprehensive interface to
the graph algorithms contained in the Boost library.")
(license license:artistic2.0)))
(define-public r-regioner
(package
(name "r-regioner")
@ -1541,14 +1928,14 @@ region sets and other genomic features.")
(define-public r-reportingtools
(package
(name "r-reportingtools")
(version "2.30.0")
(version "2.30.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ReportingTools" version))
(sha256
(base32
"0gkshdhx44yjffqf1xmvik7j5hlhszp1n9ckanaws9ky3iia8j31"))))
"1vvra7l29s7lnq996nwlpzbkrbdkr3ivkgmfp4kndfykxsl9q4vb"))))
(properties
`((upstream-name . "ReportingTools")))
(build-system r-build-system)
@ -1588,6 +1975,141 @@ reports together for a particular project that can be viewed in a web
browser.")
(license license:artistic2.0)))
(define-public r-shortread
(package
(name "r-shortread")
(version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ShortRead" version))
(sha256
(base32
"0w4m8d3h660mmr2ymp206r1n4aqssxmkv8yxkbr5y1swrahxzfk9"))))
(properties `((upstream-name . "ShortRead")))
(build-system r-build-system)
(inputs
`(("zlib" ,zlib)))
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biocparallel" ,r-biocparallel)
("r-biostrings" ,r-biostrings)
("r-genomeinfodb" ,r-genomeinfodb)
("r-genomicalignments" ,r-genomicalignments)
("r-genomicranges" ,r-genomicranges)
("r-rhtslib" ,r-rhtslib)
("r-hwriter" ,r-hwriter)
("r-iranges" ,r-iranges)
("r-lattice" ,r-lattice)
("r-latticeextra" ,r-latticeextra)
("r-rsamtools" ,r-rsamtools)
("r-s4vectors" ,r-s4vectors)
("r-xvector" ,r-xvector)
("r-zlibbioc" ,r-zlibbioc)))
(home-page "https://bioconductor.org/packages/ShortRead")
(synopsis "FASTQ input and manipulation tools")
(description
"This package implements sampling, iteration, and input of FASTQ files.
It includes functions for filtering and trimming reads, and for generating a
quality assessment report. Data are represented as
@code{DNAStringSet}-derived objects, and easily manipulated for a diversity of
purposes. The package also contains legacy support for early single-end,
ungapped alignment formats.")
(license license:artistic2.0)))
(define-public r-systempiper
(package
(name "r-systempiper")
(version "1.24.3")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "systemPipeR" version))
(sha256
(base32
"0ffazyl2q9plbhwlxi04s3fvnli6qj95n7bkjc21535bbi08xfki"))))
(properties `((upstream-name . "systemPipeR")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotate" ,r-annotate)
("r-assertthat" ,r-assertthat)
("r-batchtools" ,r-batchtools)
("r-biostrings" ,r-biostrings)
("r-deseq2" ,r-deseq2)
("r-dot" ,r-dot)
("r-edger" ,r-edger)
("r-genomicfeatures" ,r-genomicfeatures)
("r-genomicranges" ,r-genomicranges)
("r-ggplot2" ,r-ggplot2)
("r-go-db" ,r-go-db)
("r-gostats" ,r-gostats)
("r-iranges" ,r-iranges)
("r-limma" ,r-limma)
("r-magrittr" ,r-magrittr)
("r-pheatmap" ,r-pheatmap)
("r-rjson" ,r-rjson)
("r-rsamtools" ,r-rsamtools)
("r-rsvg" ,r-rsvg)
("r-shortread" ,r-shortread)
("r-stringr" ,r-stringr)
("r-summarizedexperiment" ,r-summarizedexperiment)
("r-yaml" ,r-yaml)
("r-variantannotation" ,r-variantannotation)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/tgirke/systemPipeR")
(synopsis "Next generation sequencing workflow and reporting environment")
(description
"This R package provides tools for building and running automated
end-to-end analysis workflows for a wide range of @dfn{next generation
sequence} (NGS) applications such as RNA-Seq, ChIP-Seq, VAR-Seq and Ribo-Seq.
Important features include a uniform workflow interface across different NGS
applications, automated report generation, and support for running both R and
command-line software, such as NGS aligners or peak/variant callers, on local
computers or compute clusters. Efficient handling of complex sample sets and
experimental designs is facilitated by a consistently implemented sample
annotation infrastructure.")
(license license:artistic2.0)))
(define-public r-variantannotation
(package
(name "r-variantannotation")
(version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "VariantAnnotation" version))
(sha256
(base32
"1sl0l6v05lfglj281nszma0h5k234md7rn2pdah8vs2d4iq3kimw"))))
(properties
`((upstream-name . "VariantAnnotation")))
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biostrings" ,r-biostrings)
("r-bsgenome" ,r-bsgenome)
("r-dbi" ,r-dbi)
("r-genomeinfodb" ,r-genomeinfodb)
("r-genomicfeatures" ,r-genomicfeatures)
("r-genomicranges" ,r-genomicranges)
("r-iranges" ,r-iranges)
("r-matrixgenerics" ,r-matrixgenerics)
("r-summarizedexperiment" ,r-summarizedexperiment)
("r-rhtslib" ,r-rhtslib)
("r-rsamtools" ,r-rsamtools)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)
("r-xvector" ,r-xvector)
("r-zlibbioc" ,r-zlibbioc)))
(build-system r-build-system)
(home-page "https://bioconductor.org/packages/VariantAnnotation")
(synopsis "Package for annotation of genetic variants")
(description "This R package can annotate variants, compute amino acid
coding changes and predict coding outcomes.")
(license license:artistic2.0)))
(define-public r-geneplotter
(package
(name "r-geneplotter")
@ -1796,14 +2318,14 @@ signal in the input, that lead to spurious peaks during peak calling.")
(define-public r-diffbind
(package
(name "r-diffbind")
(version "3.0.13")
(version "3.0.14")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DiffBind" version))
(sha256
(base32
"0kxn59v93hl5pq8d156lnbz0sslpnxyjcfrvq2gzgd91sd587qmn"))))
"1siabhjd0w7bb6v2gfhsm9j7c7c86z8m6lfsyl8p84h0zhjs2vrw"))))
(properties `((upstream-name . "DiffBind")))
(build-system r-build-system)
(propagated-inputs
@ -3688,33 +4210,6 @@ visualising metrics relative to experiment run time or spatially over the
surface of a flowcell.")
(license license:expat)))
;; This is a CRAN package, but it depends on packages from Bioconductor.
(define-public r-gkmsvm
(package
(name "r-gkmsvm")
(version "0.81.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "gkmSVM" version))
(sha256
(base32
"119g5rhc7ffyviz04r04aj5z1g6abnj3ddd01g7db505sdr6lapj"))))
(properties `((upstream-name . "gkmSVM")))
(build-system r-build-system)
(propagated-inputs
`(("r-kernlab" ,r-kernlab)
("r-rcpp" ,r-rcpp)
("r-rocr" ,r-rocr)
("r-seqinr" ,r-seqinr)))
(home-page "https://cran.r-project.org/web/packages/gkmSVM")
(synopsis "Gapped-kmer support vector machine")
(description
"This R package provides tools for training gapped-kmer SVM classifiers
for DNA and protein sequences. This package supports several sequence
kernels, including: gkmSVM, kmer-SVM, mismatch kernel and wildcard kernel.")
(license license:gpl2+)))
;; This is a CRAN package, but it depends on multtest from Bioconductor.
(define-public r-mutoss
(package
@ -6525,14 +7020,14 @@ sequential way to mimic the manual gating strategy.")
(define-public r-cytoml
(package
(name "r-cytoml")
(version "2.2.1")
(version "2.2.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "CytoML" version))
(sha256
(base32
"1d8x49aqc95x1vx456hya5r7mal80pj9l6wmr5x5pb5r8qyzz6yq"))))
"0ckjb7bkz0cy46scrv4vl9w37g54c0yihvzmbkzilip1ikpvhxd1"))))
(properties `((upstream-name . "CytoML")))
(build-system r-build-system)
(arguments
@ -6547,7 +7042,8 @@ sequential way to mimic the manual gating strategy.")
(string-append match "/libhdf5.a")))
#t)))))
(inputs
`(("libxml2" ,libxml2)))
`(("libxml2" ,libxml2)
("zlib" ,zlib)))
(propagated-inputs
`(("r-base64enc" ,r-base64enc)
("r-bh" ,r-bh)
@ -6813,14 +7309,14 @@ accessibility data.")
(define-public r-circrnaprofiler
(package
(name "r-circrnaprofiler")
(version "1.4.0")
(version "1.4.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "circRNAprofiler" version))
(sha256
(base32
"1rwpl9a5p5242aiapik0vf4ywqh7m6phzl8z8qmzcy0imbx7mpbn"))))
"0r1hfm3pc7c71irzmxmdwc27ns9hkymz4vhb4pqbli4xn37q7cg8"))))
(properties
`((upstream-name . "circRNAprofiler")))
(build-system r-build-system)
@ -7915,14 +8411,14 @@ visualizing RNA-sequencing datasets and differentially expressed genes.")
(define-public r-chemminer
(package
(name "r-chemminer")
(version "3.42.1")
(version "3.42.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ChemmineR" version))
(sha256
(base32
"1853w19042c53whdnrfg1v8f07wpswf2si8q4613yrcamzg2zjkx"))))
"10d8h6w24h4s7l02zzv6q46w3yiqsjizip7mf11cvkmd6p7qxfl9"))))
(properties `((upstream-name . "ChemmineR")))
(build-system r-build-system)
(propagated-inputs
@ -7956,14 +8452,14 @@ structures.")
(define-public r-bioassayr
(package
(name "r-bioassayr")
(version "1.28.0")
(version "1.28.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "bioassayR" version))
(sha256
(base32
"0vxnd8wnhjdfqh47nc6y1ffiy5r9a6n3g2hyk1r9bv6vhrd0ns3f"))))
"0ylnnm31jkmi8zz78kngqv36yn6i5lvjp1i27v59svw13m4r03g5"))))
(properties `((upstream-name . "bioassayR")))
(build-system r-build-system)
(propagated-inputs
@ -7976,7 +8472,7 @@ structures.")
("r-xml" ,r-xml)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/TylerBackman/bioassayR")
(home-page "https://github.com/girke-lab/bioassayR")
(synopsis "Cross-target analysis of small molecule bioactivity")
(description
"bioassayR is a computational tool that enables simultaneous analysis of
@ -8125,6 +8621,55 @@ microarray data.")
monograph.")
(license license:artistic2.0)))
(define-public r-bioccheck
(package
(name "r-bioccheck")
(version "1.26.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocCheck" version))
(sha256
(base32
"1hyncn9zqj432da95k86rm5b28nbwrvzm52jbhisifkxj1j43cib"))))
(properties
`((upstream-name . "BiocCheck")))
(build-system r-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
;; This package can be used by calling BiocCheck(<package>) from
;; within R, or by running R CMD BiocCheck <package>. This phase
;; makes sure the latter works. For this to work, the BiocCheck
;; script must be somewhere on the PATH (not the R bin directory).
(add-after 'install 'install-bioccheck-subcommand
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dest-dir (string-append out "/bin"))
(script-dir
(string-append out "/site-library/BiocCheck/script/")))
(mkdir-p dest-dir)
(symlink (string-append script-dir "/checkBadDeps.R")
(string-append dest-dir "/checkBadDeps.R"))
(symlink (string-append script-dir "/BiocCheck")
(string-append dest-dir "/BiocCheck")))
#t)))))
(propagated-inputs
`(("r-codetools" ,r-codetools)
("r-graph" ,r-graph)
("r-httr" ,r-httr)
("r-knitr" ,r-knitr)
("r-optparse" ,r-optparse)
("r-biocmanager" ,r-biocmanager)
("r-biocviews" ,r-biocviews)
("r-stringdist" ,r-stringdist)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/BiocCheck")
(synopsis "Executes Bioconductor-specific package checks")
(description "This package contains tools to perform additional quality
checks on R packages that are to be submitted to the Bioconductor repository.")
(license license:artistic2.0)))
(define-public r-biocgraph
(package
(name "r-biocgraph")
@ -8150,6 +8695,62 @@ monograph.")
different graph related packages produced by Bioconductor.")
(license license:artistic2.0)))
(define-public r-biocstyle
(package
(name "r-biocstyle")
(version "2.18.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocStyle" version))
(sha256
(base32
"0rsxyna4dd99x42vc82mlkxx774vb9375llpakg53max1hhwkrqp"))))
(properties
`((upstream-name . "BiocStyle")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocmanager" ,r-biocmanager)
("r-bookdown" ,r-bookdown)
("r-knitr" ,r-knitr)
("r-rmarkdown" ,r-rmarkdown)
("r-yaml" ,r-yaml)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/BiocStyle")
(synopsis "Bioconductor formatting styles")
(description "This package provides standard formatting styles for
Bioconductor PDF and HTML documents. Package vignettes illustrate use and
functionality.")
(license license:artistic2.0)))
(define-public r-biocviews
(package
(name "r-biocviews")
(version "1.58.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "biocViews" version))
(sha256
(base32
"1by2639z7n62z84dr8rj9jz12gsd1k8q42zsnxacxbwfwp6h0cl4"))))
(properties
`((upstream-name . "biocViews")))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-biocmanager" ,r-biocmanager)
("r-graph" ,r-graph)
("r-rbgl" ,r-rbgl)
("r-rcurl" ,r-rcurl)
("r-xml" ,r-xml)
("r-runit" ,r-runit)))
(home-page "https://bioconductor.org/packages/biocViews")
(synopsis "Bioconductor package categorization helper")
(description "The purpose of biocViews is to create HTML pages that
categorize packages in a Bioconductor package repository according to keywords,
also known as views, in a controlled vocabulary.")
(license license:artistic2.0)))
(define-public r-experimenthub
(package
(name "r-experimenthub")
@ -8184,6 +8785,33 @@ and manages a local cache of files retrieved enabling quick and reproducible
access.")
(license license:artistic2.0)))
(define-public r-grohmm
(package
(name "r-grohmm")
(version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "groHMM" version))
(sha256
(base32
"08pap9wsaxl4jjlc1py0rc019gmi6daa0f9cr3ih1d97wybncanx"))))
(properties `((upstream-name . "groHMM")))
(build-system r-build-system)
(propagated-inputs
`(("r-genomeinfodb" ,r-genomeinfodb)
("r-genomicalignments" ,r-genomicalignments)
("r-genomicranges" ,r-genomicranges)
("r-iranges" ,r-iranges)
("r-mass" ,r-mass)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)))
(home-page "https://github.com/Kraus-Lab/groHMM")
(synopsis "GRO-seq analysis pipeline")
(description
"This package provides a pipeline for the analysis of GRO-seq data.")
(license license:gpl3+)))
(define-public r-multiassayexperiment
(package
(name "r-multiassayexperiment")
@ -8695,19 +9323,46 @@ generated.")
routines.")
(license license:lgpl2.0+)))
(define-public r-s4vectors
(package
(name "r-s4vectors")
(version "0.28.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "S4Vectors" version))
(sha256
(base32
"0fhf4lsfxrim7glazh6ng46ykzaly5ggwpg170vcz4cc24prv0rh"))))
(properties
`((upstream-name . "S4Vectors")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)))
(home-page "https://bioconductor.org/packages/S4Vectors")
(synopsis "S4 implementation of vectors and lists")
(description
"The S4Vectors package defines the @code{Vector} and @code{List} virtual
classes and a set of generic functions that extend the semantic of ordinary
vectors and lists in R. Package developers can easily implement vector-like
or list-like objects as concrete subclasses of @code{Vector} or @code{List}.
In addition, a few low-level concrete subclasses of general interest (e.g.
@code{DataFrame}, @code{Rle}, and @code{Hits}) are implemented in the
S4Vectors package itself.")
(license license:artistic2.0)))
;; This is a CRAN package, but it depends on preprocessorcore, which is a
;; Bioconductor package.
(define-public r-wgcna
(package
(name "r-wgcna")
(version "1.69")
(version "1.70-3")
(source
(origin
(method url-fetch)
(uri (cran-uri "WGCNA" version))
(sha256
(base32
"022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f"))))
"1m6b4a2xpb02c1ajndhk8qlqnhwxa7lkkwj6nzv3l618jy1kp15r"))))
(properties `((upstream-name . "WGCNA")))
(build-system r-build-system)
(propagated-inputs
@ -9223,13 +9878,13 @@ of other packages.")
(define-public r-scater
(package
(name "r-scater")
(version "1.18.3")
(version "1.18.6")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "scater" version))
(sha256
(base32
"14f7yw277nykxmcm7wlhlsf3nizpwzz24hax1icx73lavfxmc535"))))
"0k1ls5gqv1zsn1w2kszhmbhwfccfjw8khk36s5zbf90rbbkw5609"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)
@ -9988,6 +10643,44 @@ large-scale and fully automated analysis.")
the earlier snpMatrix package, allowing for uncertainty in genotypes.")
(license license:gpl3)))
(define-public r-chromstar
(package
(name "r-chromstar")
(version "1.16.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "chromstaR" version))
(sha256
(base32
"0vgpb7g2cncdn82hia2yzzachyns2zbd7906662g990qjnp2xlm1"))))
(properties `((upstream-name . "chromstaR")))
(build-system r-build-system)
(propagated-inputs
`(("r-bamsignals" ,r-bamsignals)
("r-biocgenerics" ,r-biocgenerics)
("r-chromstardata" ,r-chromstardata)
("r-doparallel" ,r-doparallel)
("r-foreach" ,r-foreach)
("r-genomeinfodb" ,r-genomeinfodb)
("r-genomicalignments" ,r-genomicalignments)
("r-genomicranges" ,r-genomicranges)
("r-ggplot2" ,r-ggplot2)
("r-iranges" ,r-iranges)
("r-mvtnorm" ,r-mvtnorm)
("r-reshape2" ,r-reshape2)
("r-rsamtools" ,r-rsamtools)
("r-s4vectors" ,r-s4vectors)))
(native-inputs `(("r-knitr" ,r-knitr)))
(home-page "https://github.com/ataudt/chromstaR")
(synopsis "Chromatin state analysis for ChIP-Seq data")
(description
"This package implements functions for combinatorial and differential
analysis of ChIP-seq data. It includes uni- and multivariate peak-calling,
export to genome browser viewable files, and functi ons for enrichment
analyses.")
(license license:artistic2.0)))
(define-public r-sushi
(package
(name "r-sushi")

918
gnu/packages/bioinformatics.scm
View File

File diff suppressed because it is too large Load Diff

5
gnu/packages/bootloaders.scm
View File

@ -1027,15 +1027,14 @@ tools, and more.")
(define-public os-prober
(package
(name "os-prober")
(version "1.77")
(version "1.78")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
version ".tar.xz"))
(sha256
(base32
"0pvhrw4h05n21zw7ig3a3bi8aqdh6zxs0x1znz4g7vhspsps93ld"))))
(base32 "1sahk72blsrlirly4xlwa8jfxrpwagyn7b81p92q2s9m218rz43f"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)

38
gnu/packages/bootstrap.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;; Copyright © 2019 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -123,16 +124,27 @@
("tar"
,(base32 "06gmqdjq3rl8lr47b9fyx4ifnm5x56ymc8lyryp1ax1j2s4y5jb4"))
("xz"
,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5")))))
,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5")))
("powerpc64le-linux"
("bash"
,(base32 "1kiw7n6mkdy2x9in97646nb7aiayxr090ws1hbrlazah3fjqi6nj"))
("mkdir"
,(base32 "04dpvi231zcl40ig048vqqnyvmnkw1byrm1q1qqvs1f0g16yhrrk"))
("tar"
,(base32 "150c8948cz8r208g6qgn2dn4f4zs5kpgbpbg6bwag6yw42rapw2l"))
("xz"
,(base32 "0v5738idy9pqzcbrjdpxi5c6qs5m78zrpsydmrpx5cfcfzbkxzjh")))))
(define %bootstrap-executable-base-urls
;; This is where the bootstrap executables come from.
'("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/"
"https://alpha.gnu.org/gnu/guix/bootstrap/"
"http://lilypond.org/janneke/guix/"))
(define (bootstrap-executable-file-name system program)
"Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM."
(match system
("powerpc64le-linux" (string-append system "/20210106/" program))
("i586-gnu" (string-append system "/20200326/" program))
(_ (string-append system "/" program
"?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))))
@ -333,6 +345,8 @@ or false to signal an error."
"/20150101/guile-2.0.11.tar.xz")
("i586-gnu"
"/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz")
("powerpc64le-linux"
"/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz")
(_
"/20131110/guile-2.0.9.tar.xz"))))
@ -347,6 +361,8 @@ or false to signal an error."
(base32 "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr"))
("armhf-linux"
(base32 "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))
("powerpc64le-linux"
(base32 "1rnyfz5q38jyvxddj617443bnnzql4vw0mxzqpj8wz48wx4bhbq0"))
("aarch64-linux"
(base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))
("i586-gnu"
@ -480,6 +496,8 @@ $out/bin/guile --version~%"
"/20150101/static-binaries.tar.xz")
("aarch64-linux"
"/20170217/static-binaries.tar.xz")
("powerpc64le-linux"
"/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz")
("i586-gnu"
"/20200326/static-binaries-0-i586-pc-gnu.tar.xz")
(_
@ -499,6 +517,9 @@ $out/bin/guile --version~%"
("aarch64-linux"
(base32
"18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh"))
("powerpc64le-linux"
(base32
"0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v"))
("i586-gnu"
(base32
"17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
@ -548,6 +569,8 @@ $out/bin/guile --version~%"
"/20150101/binutils-2.25.tar.xz")
("aarch64-linux"
"/20170217/binutils-2.27.tar.xz")
("powerpc64le-linux"
"/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
("i586-gnu"
"/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
(_
@ -567,6 +590,9 @@ $out/bin/guile --version~%"
("aarch64-linux"
(base32
"111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n"))
("powerpc64le-linux"
(base32
"1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz"))
("i586-gnu"
(base32
"11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
@ -623,6 +649,8 @@ $out/bin/guile --version~%"
"/20150101/glibc-2.20.tar.xz")
("aarch64-linux"
"/20170217/glibc-2.25.tar.xz")
("powerpc64le-linux"
"/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
("i586-gnu"
"/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz")
(_
@ -642,6 +670,9 @@ $out/bin/guile --version~%"
("aarch64-linux"
(base32
"07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c"))
("powerpc64le-linux"
(base32
"1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz"))
("i586-gnu"
(base32
"14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952"))
@ -714,6 +745,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
"/20150101/gcc-4.8.4.tar.xz")
("aarch64-linux"
"/20170217/gcc-5.4.0.tar.xz")
("powerpc64le-linux"
"/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
("i586-gnu"
"/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
(_
@ -733,6 +766,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
("aarch64-linux"
(base32
"1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1"))
("powerpc64le-linux"
(base32
"151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1"))
("i586-gnu"
(base32
"1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5"))

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

@ -13,6 +13,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -313,6 +314,30 @@ resembles Python.")
(base32
"19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb"))))))
(define-public meson-next
(package
(inherit meson)
(version "0.57.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
"releases/download/" version "/meson-"
version ".tar.gz"))
(sha256
(base32
"19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj"))))))
(define-public meson-for-build
(package
(inherit meson)
(name "meson-for-build")
(source (origin
(inherit (package-source meson))
(patches (search-patches "meson-for-build-rpath.patch"))))
;; People should probably install "meson", not "meson-for-build".
(properties `((hidden? . #t)))))
(define-public premake4
(package
(name "premake")
@ -451,7 +476,7 @@ a build worked by accident.")
(define-public osc
(package
(name "osc")
(version "0.165.2")
(version "0.172.0")
(source
(origin
(method git-fetch)
@ -460,7 +485,7 @@ a build worked by accident.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0yjwvbvv9fgkpiyvrag89zxchyn3nbgp9jz0wn5p0z9450zwfyz6"))))
(base32 "1sqdnkka3c6b6hwnrmlwrgy7w62cp8raq8mph9pgd2lydzzbvwlp"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -474,6 +499,8 @@ a build worked by accident.")
(string-append bin "osc-wrapper.py")
(string-append bin "osc"))
#t))))))
(native-inputs
`(("python-chardet" ,python-chardet)))
(inputs
`(("python-m2crypto" ,python-m2crypto)
("python-pycurl" ,python-pycurl)

5
gnu/packages/busybox.scm
View File

@ -33,7 +33,7 @@
(define-public busybox
(package
(name "busybox")
(version "1.32.1")
(version "1.33.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -41,7 +41,8 @@
version ".tar.bz2"))
(sha256
(base32
"1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"))))
"1gcg7ggg79apdlp5qnrh9pbjl10fx30yn33p21kxqpm8j4f6hs6m"))
(patches (search-patches "busybox-CVE-2021-28831.patch"))))
(build-system gnu-build-system)
(arguments
'(#:phases

96
gnu/packages/c.scm
View File

@ -10,7 +10,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -52,6 +52,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages gettext)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
#:use-module (gnu packages xml))
(define-public tcc
@ -447,7 +448,7 @@ more, like escaping special characters.")
(define-public libfastjson
(package
(name "libfastjson")
(version "0.99.8")
(version "0.99.9")
(source
(origin
(method git-fetch)
@ -456,8 +457,7 @@ more, like escaping special characters.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl"))))
(base32 "12rqcdqxazw8czzxbivdapdgj19pcswpw1jp2915sxbljis83g6q"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -546,7 +546,7 @@ portability.")
(define-public aws-c-common
(package
(name "aws-c-common")
(version "0.4.63")
(version "0.5.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -555,8 +555,11 @@ portability.")
(file-name (git-file-name name version))
(sha256
(base32
"16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9"))))
"0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(synopsis "Amazon Web Services core C library")
(description
"This library provides common C99 primitives, configuration, data
@ -567,7 +570,7 @@ portability.")
(define-public aws-checksums
(package
(name "aws-checksums")
(version "0.1.10")
(version "0.1.11")
(source (origin
(method git-fetch)
(uri (git-reference
@ -576,9 +579,12 @@ portability.")
(file-name (git-file-name name version))
(sha256
(base32
"1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"))
"1pjs31x3cq9wyw511y00kksz660m8im9zxk30hid8iwlilcbnyvx"))
(patches (search-patches "aws-checksums-cmake-prefix.patch"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(inputs
`(("aws-c-common" ,aws-c-common)))
(synopsis "Amazon Web Services checksum library")
@ -591,7 +597,7 @@ with fallback to efficient C99 software implementations.")
(define-public aws-c-event-stream
(package
(name "aws-c-event-stream")
(version "0.1.6")
(version "0.2.7")
(source (origin
(method git-fetch)
(uri (git-reference
@ -600,13 +606,19 @@ with fallback to efficient C99 software implementations.")
(file-name (git-file-name name version))
(sha256
(base32
"1vl9ainc4klv0g9gk1iv4833bsllni6jxn6mwb0fnv2dnlz7zv9q"))
"0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))
(patches (search-patches "aws-c-event-stream-cmake-prefix.patch"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)))
`(("aws-c-common" ,aws-c-common)
("aws-c-io" ,aws-c-io)
("aws-checksums" ,aws-checksums)))
(inputs
`(("aws-checksums" ,aws-checksums)))
`(("aws-c-cal" ,aws-c-cal)
("s2n" ,s2n)))
(synopsis "Amazon Web Services client-server message format library")
(description
"This library is a C99 implementation for @acronym{AWS,Amazon Web Services}
@ -614,3 +626,63 @@ event stream encoding, a binary format for bidirectional client-server
communication.")
(home-page "https://github.com/awslabs/aws-c-event-stream")
(license license:asl2.0)))
(define-public aws-c-io
(package
(name "aws-c-io")
(version "0.9.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/awslabs/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1vwyf1pm0hhcypyjc9xh9x7y50ic79xlbck1yf9d9wz0bnh43p7v"))
(patches
(search-patches
"aws-c-io-cmake-prefix.patch"
"aws-c-io-disable-networking-tests.patch"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(propagated-inputs
`(("aws-c-cal" ,aws-c-cal)
("aws-c-common" ,aws-c-common)
("s2n" ,s2n)))
(synopsis "Event driven framework for implementing application protocols")
(description "This library provides a C99 framework for constructing
event-driven, asynchronous network application protocols.")
(home-page "https://github.com/awslabs/aws-c-io")
(license license:asl2.0)))
(define-public aws-c-cal
(package
(name "aws-c-cal")
(version "0.4.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/awslabs/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6"))
(patches (search-patches "aws-c-cal-cmake-prefix.patch"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)))
(inputs
`(("openssl" ,openssl)
("openssl:static" ,openssl "static")))
(synopsis "Amazon Web Services Crypto Abstraction Layer")
(description "This library provides a C99 wrapper for hash, HMAC, and ECC
cryptographic primitives for the @acronym{AWS,Amazon Web Services} SDK.")
(home-page "https://github.com/awslabs/aws-c-cal")
(license license:asl2.0)))

36
gnu/packages/check.scm
View File

@ -16,7 +16,7 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -562,7 +562,7 @@ and it supports a very flexible form of test discovery.")
(define-public doctest
(package
(name "doctest")
(version "2.4.4")
(version "2.4.5")
(home-page "https://github.com/onqtam/doctest")
(source (origin
(method git-fetch)
@ -570,7 +570,7 @@ and it supports a very flexible form of test discovery.")
(file-name (git-file-name name version))
(sha256
(base32
"0xldd6cr1w3bn33rdb7yc6p57w143cgnjb48ig1b99iwvvkw599n"))))
"1pc34dvpgdzx3paqdf0khgs87kvjncx27yn434f5ic33r1lwr9r4"))))
(build-system cmake-build-system)
(synopsis "C++ test framework")
(description
@ -837,7 +837,7 @@ have been used.")
(define-public python2-mock
(let ((base (package-with-python2
(strip-python2-variant python-mock))))
(package (inherit base)
(package/inherit base
(propagated-inputs
`(("python2-functools32" ,python2-functools32)
("python2-funcsigs" ,python2-funcsigs)
@ -1197,7 +1197,7 @@ same arguments.")
(define-public python2-pytest-mock
(let ((base (package-with-python2
(strip-python2-variant python-pytest-mock))))
(package (inherit base)
(package/inherit base
(propagated-inputs
`(("python2-mock" ,python2-mock)
,@(package-propagated-inputs base))))))
@ -2811,15 +2811,27 @@ system. The code under test requires no modification to work with pyfakefs.")
(define-public python-aiounittest
(package
(name "python-aiounittest")
(version "1.3.1")
(version "1.4.0")
;; Pypi package lacks tests.
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiounittest" version))
(sha256
(base32
"1q4bhmi80smaa1lknvdna0sx3915naczlfna1fp435nf6cjyrjl1"))))
(origin (method git-fetch)
(uri (git-reference
(url "https://github.com/kwarunek/aiounittest.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0hql5mw62lclrpblbh7xvinwjfcdcfvhhlvl7xlq2hi9isjq1c8r"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "nosetests" "-v")
(format #t "test suite not run~%"))
#t)))))
(propagated-inputs `(("python-wrapt" ,python-wrapt)))
(native-inputs
`(("python-coverage" ,python-coverage)
("python-nose" ,python-nose)))

71
gnu/packages/chromium.scm
View File

@ -65,7 +65,6 @@
#:use-module (gnu packages regex)
#:use-module (gnu packages serialization)
#:use-module (gnu packages speech)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages video)
@ -96,7 +95,6 @@
"net/third_party/quiche" ;BSD-3
"net/third_party/uri_template" ;ASL2.0
"third_party/abseil-cpp" ;ASL2.0
"third_party/adobe/flash/flapper_version.h" ;no license, trivial
"third_party/angle" ;BSD-3
"third_party/angle/src/common/third_party/base" ;BSD-3
"third_party/angle/src/common/third_party/smhasher" ;Public domain
@ -105,10 +103,6 @@
"third_party/angle/src/third_party/libXNVCtrl" ;Expat
"third_party/angle/src/third_party/trace_event" ;BSD-3
"third_party/angle/src/third_party/volk" ;Expat
"third_party/angle/third_party/vulkan-headers" ;ASL2.0
"third_party/angle/third_party/vulkan-loader" ;ASL2.0
"third_party/angle/third_party/vulkan-tools" ;ASL2.0
"third_party/angle/third_party/vulkan-validation-layers" ;ASL2.0
"third_party/apple_apsl" ;APSL2.0
"third_party/axe-core" ;MPL2.0
"third_party/blink" ;BSD-3, LGPL2+
@ -161,7 +155,6 @@
"third_party/emoji-segmenter" ;ASL2.0
"third_party/flatbuffers" ;ASL2.0
"third_party/fusejs" ;ASL2.0
"third_party/glslang" ;BSD-3, Expat, ASL2.0
"third_party/google_input_tools" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat
@ -189,6 +182,8 @@
"third_party/libsrtp" ;BSD-3
"third_party/libsync" ;ASL2.0
"third_party/libudev" ;LGPL2.1+
"third_party/liburlpattern" ;Expat
"third_party/libva_protected_content" ;Expat
;; FIXME: build/linux/unbundle/libvpx.gn does not work for all users.
"third_party/libvpx" ;BSD-3
@ -203,6 +198,7 @@
"third_party/markupsafe" ;BSD-3
"third_party/mesa_headers" ;Expat, SGI
"third_party/metrics_proto" ;BSD-3
"third_party/minigbm" ;BSD-3
"third_party/modp_b64" ;BSD-3
"third_party/nasm" ;BSD-2
"third_party/nearby" ;ASL2.0
@ -220,7 +216,8 @@
"third_party/pdfium/third_party/skia_shared" ;BSD-3
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
"third_party/perfetto" ;ASL2.0
"third_party/pffft" ;the "FFTPACK" license, similar to BSD-3
"third_party/perfetto/protos/third_party/chromium" ;BSD-3
"third_party/pffft" ;the "FFTPACK" license
"third_party/ply" ;BSD-3
"third_party/polymer" ;BSD-3
"third_party/private_membership" ;ASL2.0
@ -236,7 +233,6 @@
"third_party/s2cellid" ;ASL2.0
"third_party/schema_org" ;CC-BY-SA3.0
"third_party/securemessage" ;ASL2.0
"third_party/shaka-player" ;ASL2.0
"third_party/shell-encryption" ;ASL2.0
"third_party/skia" ;BSD-3
"third_party/skia/include/third_party/skcms" ;BSD-3
@ -244,8 +240,6 @@
"third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
"third_party/smhasher" ;Expat, public domain
"third_party/speech-dispatcher" ;GPL2+
"third_party/spirv-headers" ;ASL2.0
"third_party/SPIRV-Tools" ;ASL2.0
"third_party/sqlite" ;Public domain
"third_party/swiftshader" ;ASL2.0
"third_party/swiftshader/third_party/astc-encoder" ;ASL2.0
@ -258,6 +252,7 @@
"third_party/ukey2" ;ASL2.0
"third_party/usb_ids" ;BSD-3
"third_party/usrsctp" ;BSD-2
"third_party/vulkan-deps" ;ASL2.0, BSD-3, Expat
"third_party/vulkan_memory_allocator" ;Expat
"third_party/wayland/protocol" ;Expat
"third_party/wayland/stubs" ;BSD-3, Expat
@ -310,8 +305,7 @@
(string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash))))
(define %chromium-version "88.0.4324.182")
(define %ungoogled-revision "b98f2d51406c84a75df96f0da9dee3c0d790963d")
(define %ungoogled-revision "89.0.4389.90-1")
(define %debian-revision "debian/84.0.4147.105-1")
(define %debian-patches
@ -326,15 +320,20 @@
(uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium")
(commit %ungoogled-revision)))
(file-name (git-file-name "ungoogled-chromium"
(string-take %ungoogled-revision 7)))
(if (= 40 (string-length %ungoogled-revision))
(string-take %ungoogled-revision 7)
%ungoogled-revision)))
(sha256
(base32
"1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay"))))
"0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79"))))
(define %guix-patches
(list (local-file
(assume-valid-file-name
(search-patch "ungoogled-chromium-system-nspr.patch")))
(local-file
(assume-valid-file-name
(search-patch "ungoogled-chromium-system-opus.patch")))
(local-file
(assume-valid-file-name
(search-patch "ungoogled-chromium-extension-search-path.patch")))))
@ -418,7 +417,7 @@
(define libvpx/chromium
(package
(inherit libvpx)
(version "1.9.0-88-g12059d956")
(version "1.9.0-104-gb5d77a48d")
(source (origin
(inherit (package-source libvpx))
(uri (git-reference
@ -427,7 +426,7 @@
(file-name (git-file-name "libvpx" version))
(sha256
(base32
"14knnvfaskfz97vs3lfqrdpcbcx22s6qp16213wdnvnsf4c1lx1b"))))))
"07nkpx8myw5nd4bkaj6l4wr5ipk2c6lg9cwirz0i5qbr659051rk"))))))
;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need
;; this trick to make it wrap 'lld'.
@ -457,17 +456,17 @@
(define-public ungoogled-chromium
(package
(name "ungoogled-chromium")
(version (string-append %chromium-version "-0."
(string-take %ungoogled-revision 7)))
(version %ungoogled-revision)
(synopsis "Graphical web browser")
(source (origin
(method url-fetch)
(uri (string-append "https://commondatastorage.googleapis.com"
"/chromium-browser-official/chromium-"
%chromium-version ".tar.xz"))
(string-drop-right %ungoogled-revision 2)
".tar.xz"))
(sha256
(base32
"10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h"))
"16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)
@ -488,9 +487,6 @@
;; Use the "official" release optimizations, as opposed to
;; a developer build.
"is_official_build=true"
(string-append "max_jobs_per_link="
;; Respect the default cap of 8 jobs.
(number->string (min 8 (parallel-job-count))))
"clang_use_chrome_plugins=false"
"chrome_pgo_phase=0"
"use_sysroot=false"
@ -533,7 +529,6 @@
"use_system_zlib=true"
"use_gnome_keyring=false" ;deprecated by libsecret
"use_openh264=true"
"use_pulseaudio=true"
"link_pulseaudio=true"
"icu_use_data_file=false"
@ -548,6 +543,10 @@
'("use_vaapi=true")
'())
"media_use_ffmpeg=true"
"media_use_libvpx=true"
"media_use_openh264=true"
;; Do not artifically restrict formats supported by system ffmpeg.
"proprietary_codecs=true"
"ffmpeg_branding=\"Chrome\""
@ -556,17 +555,15 @@
"rtc_use_h264=true"
"rtc_use_pipewire=true"
"rtc_link_pipewire=true"
"rtc_pipewire_version=\"0.3\""
;; Don't use bundled sources.
"rtc_build_json=true" ;FIXME: libc++ std::string ABI difference
"rtc_build_libevent=false"
"rtc_build_libvpx=false"
"rtc_build_opus=false"
"rtc_build_ssl=false"
"rtc_build_libsrtp=true" ;FIXME: fails to find headers
"rtc_build_usrsctp=true" ;TODO: package this
(string-append "rtc_ssl_root=\""
(assoc-ref %build-inputs "openssl")
"/include/openssl\""))
"rtc_build_ssl=true") ;XXX: the bundled BoringSSL is required?
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-stuff
@ -604,12 +601,6 @@
(("third_party/icu/source/(common|i18n)/")
""))
;; Fix faulty ICU call. Likely fixed in M89.
(substitute*
"third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc"
(("ideographicSpaceCharacter")
"kIdeographicSpaceCharacter"))
;; XXX: Should be unnecessary when use_system_lcms2=true.
(substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h"
(("include \"third_party/lcms/include/lcms2\\.h\"")
@ -753,6 +744,7 @@
(resources (string-append lib "/resources"))
(preferences (assoc-ref inputs "master-preferences"))
(gtk+ (assoc-ref inputs "gtk+"))
(xdg-utils (assoc-ref inputs "xdg-utils"))
(sh (which "sh")))
(substitute* '("chrome/app/resources/manpage.1.in"
@ -789,7 +781,8 @@
(wrap-program exe
;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))))
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))
`("PATH" ":" prefix (,(string-append xdg-utils "/bin")))))
(with-directory-excursion "chrome/app/theme/chromium"
(for-each
@ -863,18 +856,18 @@
("nss" ,nss)
("openh264" ,openh264)
("openjpeg" ,openjpeg) ;PDFium only
("openssl" ,openssl)
("opus" ,opus+custom)
("pango" ,pango)
("pciutils" ,pciutils)
("pipewire" ,pipewire)
("pipewire" ,pipewire-0.3)
("pulseaudio" ,pulseaudio)
("snappy" ,snappy)
("speech-dispatcher" ,speech-dispatcher)
("udev" ,eudev)
("valgrind" ,valgrind)
("vulkan-headers" ,vulkan-headers)
("wayland" ,wayland)))
("wayland" ,wayland)
("xdg-utils" ,xdg-utils)))
(native-search-paths
(list (search-path-specification
(variable "CHROMIUM_EXTENSION_DIRECTORY")

91
gnu/packages/ci.scm
View File

@ -66,20 +66,21 @@
(file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass
(let ((commit "543e26addc6e2304611e2feb8dd3a5a0646507b6")
(revision "72"))
(let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7")
(revision "2"))
(package
(name "cuirass")
(version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"01cxg0nwafzfg0phbv1b4cv24w7yaalkkdib3qfwf6jqagbfg85y"))))
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"120cnnjy4j2dinfmas1ddmqzzc7ikj9c76sl4li6g6dn8g7s8f69"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
@ -87,9 +88,21 @@
(ice-9 rdelim)
(ice-9 popen))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
#:tests? #f ;requires a PostgreSQL database.
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'check 'set-PATH-for-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((pg (assoc-ref inputs "ephemeralpg"))
(path (getenv "PATH")))
(setenv "PATH" (string-append pg "/bin:" path))
#t)))
;; Disable the remote tests that require a Guix daemon connection.
(add-before 'check 'disable-remote-tests
(lambda _
(substitute* "Makefile.am"
(("tests/remote.scm") ""))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules.
@ -110,31 +123,30 @@
(deps (list avahi gcrypt json zmq squee git bytes
fibers zlib matd tls mail guix))
(guile (assoc-ref %build-inputs "guile"))
(effective (read-line
(open-pipe* OPEN_READ
(string-append guile "/bin/guile")
"-c" "(display (effective-version))")))
(mods (string-drop-right ;drop trailing colon
(string-join deps
(string-append "/share/guile/site/"
effective ":")
'suffix)
1))
(objs (string-drop-right
(string-join deps
(string-append "/lib/guile/" effective
"/site-ccache:")
'suffix)
1)))
;; Make sure 'cuirass' can find the 'evaluate' command, as
;; well as the relevant Guile modules.
(for-each
(lambda (name)
(wrap-program (string-append out "/bin/" name)
`("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))))
'("cuirass" "remote-server" "remote-worker"))
(effective
(read-line
(open-pipe* OPEN_READ
(string-append guile "/bin/guile")
"-c" "(display (effective-version))")))
(mods
(string-drop-right ;drop trailing colon
(string-join deps
(string-append "/share/guile/site/"
effective ":")
'suffix)
1))
(objs
(string-drop-right
(string-join deps
(string-append "/lib/guile/" effective
"/site-ccache:")
'suffix)
1)))
;; Make sure 'cuirass' can find the relevant Guile modules.
(wrap-program (string-append out "/bin/cuirass")
`("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
#t))))))
(inputs
`(("guile" ,guile-3.0/libgc-7)
@ -157,7 +169,8 @@
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
("texinfo" ,texinfo)
("ephemeralpg" ,ephemeralpg)))
(native-search-paths
;; For HTTPS access, Cuirass itself honors these variables, with the
;; same semantics as Git and OpenSSL (respectively).

9
gnu/packages/cobol.scm
View File

@ -30,7 +30,7 @@
(define-public gnucobol
(package
(name "gnucobol")
(version "2.2")
(version "3.1.2")
(source
(origin
(method url-fetch)
@ -39,7 +39,7 @@
version ".tar.xz"))
(sha256
(base32
"1814s1n95xax2dz938cf4fkcp0q94nkj1gjbdblbzpk9q92zq66w"))))
"0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"))))
(arguments
'(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
@ -49,7 +49,10 @@
(add-after 'unpack 'place-cobol85-test-suite
(lambda* (#:key inputs #:allow-other-keys)
(let ((newcob (assoc-ref inputs "newcob")))
(copy-file newcob "tests/cobol85/newcob.val.Z")))))
(copy-file newcob "tests/cobol85/newcob.val.Z"))))
(add-before 'check 'set-TERM
;; Some tests expect a known terminal
(lambda _ (setenv "TERM" "xterm-256color"))))
#:test-target "checkall"))
(native-inputs
`(("perl" ,perl)))

28
gnu/packages/commencement.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2728,7 +2729,8 @@ exec " gcc "/bin/" program
"--disable-shared"
"--enable-languages=c,c++"
,@(if (equal? "powerpc64le-linux-gnu" (boot-triplet))
;; boot-triplet inserts "guix" in the triplet.
,@(if (equal? "powerpc64le-guix-linux-gnu" (boot-triplet))
;; On POWER9 (little endian) glibc needs the
;; 128-bit long double type.
'("--with-long-double-128")
@ -3216,7 +3218,11 @@ memoized as a function of '%current-system'."
`(("bison" ,bison-boot0)
("texinfo" ,texinfo-boot0)
("perl" ,perl-boot0)
("python" ,python-boot0)))
("python" ,python-boot0)
,@(if (target-powerpc?)
`(("powerpc64le-patch" ,@(search-patches
"glibc-ldd-powerpc.patch")))
'())))
(inputs
`( ;; The boot inputs. That includes the bootstrap libc. We don't want
;; it in $CPATH, hence the 'pre-configure' phase above.
@ -3360,6 +3366,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; This time we need 'msgfmt' to install all the libc.mo files.
(native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
,@(if (target-powerpc?)
`(("powerpc64le-patch" ,@(search-patches
"glibc-ldd-powerpc.patch")))
'())
("gettext" ,gettext-boot0)))
(propagated-inputs
@ -3400,9 +3410,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
#:allowed-references ("out" ,glibc-final)
#:allowed-references
,@(match (%current-system)
((? target-powerpc?)
`(("out" ,glibc-final ,static-bash-for-glibc)))
(_
`(("out" ,glibc-final))))
,@(package-arguments binutils)))
(inputs (%boot2-inputs))))
(inputs
(match (%current-system)
((? target-powerpc?)
`(("bash" ,static-bash-for-glibc)
,@(%boot2-inputs)))
(_ (%boot2-inputs))))))
(define libstdc++
;; Intermediate libstdc++ that will allow us to build the final GCC

111
gnu/packages/compression.scm
View File

@ -27,7 +27,7 @@
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020, 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
@ -87,7 +87,7 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml)
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (last)))
#:use-module (srfi srfi-1))
(define-public zlib
(package
@ -953,44 +953,6 @@ possible and can compress in parallel. This is especially useful for large
tarballs.")
(license license:bsd-2)))
(define-public bsdiff
(package
(name "bsdiff")
(version "4.3")
(home-page "https://www.daemonology.net/bsdiff/")
(source (origin
(method url-fetch)
(uri (string-append home-page name "-" version ".tar.gz"))
(sha256
(base32
"0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "INSTALL=install"
(string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases (modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'fix-Makefile
(lambda _
(substitute* "Makefile"
;; Adjust syntax to make it compatible with GNU Make.
(("^\\.") "")
;; Help install(1) create the target directory.
(("\\$\\{PREFIX\\}") "-D -t ${PREFIX}"))
#t)))
#:tests? #f)) ;no tests
(inputs
`(("bzip2" ,bzip2)))
(synopsis "Patch binary files")
(description
"@command{bsdiff} and @command{bspatch} are tools for building and
applying patches to binary files. By using suffix sorting (specifically
Larsson and Sadakane's @code{qsufsort}) and taking advantage of how
executable files change, bsdiff routinely produces binary patches 50-80%
smaller than those produced by @code{Xdelta}.")
(license license:bsd-2)))
(define-public cabextract
(package
(name "cabextract")
@ -1110,15 +1072,14 @@ human-readable output.")
(define-public lrzip
(package
(name "lrzip")
(version "0.640")
(version "0.641")
(source
(origin
(method url-fetch)
(uri (string-append
"http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.xz"))
(sha256
(base32
"175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9"))))
(base32 "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc"))))
(build-system gnu-build-system)
(native-inputs
`(;; nasm is only required when building for 32-bit x86 platforms
@ -1263,6 +1224,12 @@ handles the 7z format which features very high compression ratios.")
`(#:test-target "test"
#:phases
(modify-phases %standard-phases
;; Enable PIC, so it can be used in shared libraries.
(add-after 'unpack 'use-pic
(lambda _
(substitute* "Makefile"
(("CPPFLAGS = " all) (string-append all "-fPIC ")))
#t))
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
@ -1508,11 +1475,9 @@ speed.")
license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h}
(define-public pzstd
(package
(package/inherit zstd
(name "pzstd")
(version (package-version zstd))
(source (package-source zstd))
(build-system gnu-build-system)
(outputs '("out"))
(inputs
`(,@(if (%current-target-system)
`(("googletest" ,googletest))
@ -1622,6 +1587,7 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
"unzip-overflow-on-invalid-input.patch"
"unzip-format-secure.patch"
"unzip-overflow-long-fsize.patch"))))
(replacement unzip/fixed)
(build-system gnu-build-system)
;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
(arguments
@ -1657,6 +1623,57 @@ recreates the stored directory structure by default.")
(license (license:non-copyleft "file://LICENSE"
"See LICENSE in the distribution."))))
(define unzip/fixed
(package
(inherit unzip)
(version "6.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/infozip"
"/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"))
(sha256
(base32
"0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"))
(patches (search-patches "unzip-CVE-2014-8139.patch"
"unzip-CVE-2014-8140.patch"
"unzip-CVE-2014-8141.patch"
"unzip-CVE-2014-9636.patch"
"unzip-CVE-2015-7696.patch"
"unzip-CVE-2015-7697.patch"
"unzip-allow-greater-hostver-values.patch"
"unzip-initialize-symlink-flag.patch"
"unzip-remove-build-date.patch"
"unzip-attribs-overflow.patch"
"unzip-overflow-on-invalid-input.patch"
"unzip-format-secure.patch"
"unzip-overflow-long-fsize.patch"
;; From Fedora
"unzip-alt-iconv-utf8.patch"
"unzip-alt-iconv-utf8-print.patch"
"unzip-fix-recmatch.patch"
"unzip-case-insensitive.patch"
"unzip-close.patch"
"unzip-COVSCAN-fix-unterminated-string.patch"
"unzip-CVE-2016-9844.patch"
"unzip-CVE-2018-1000035.patch"
"unzip-CVE-2018-18384.patch"
"unzip-exec-shield.patch"
"unzip-manpage-fix.patch"
"unzip-overflow.patch"
"unzip-timestamp.patch"
"unzip-valgrind.patch"
"unzip-x-option.patch"
;; CVE-2019-13232
"unzip-zipbomb-manpage.patch"
"unzip-zipbomb-part1.patch"
"unzip-zipbomb-part2.patch"
"unzip-zipbomb-part3.patch"
;; https://github.com/madler/unzip/issues/2
"unzip-32bit-zipbomb-fix.patch"))))))
(define-public ziptime
(let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
(revision "0"))

18
gnu/packages/cpp.scm
View File

@ -91,7 +91,7 @@
(description "Range-v3 is an extension of the Standard Template Library that
makes its iterators and algorithms more powerful by making them composable.
Unlike other range-like solutions which, seek to do away with iterators, in
range-v3 ranges are an abstration layer on top of iterators.")
range-v3 ranges are an abstraction layer on top of iterators.")
(home-page "https://github.com/ericniebler/range-v3/")
(license
(list
@ -678,7 +678,7 @@ point and then, after each tween step, plugging back the result.")
(define-public abseil-cpp
(package
(name "abseil-cpp")
(version "20200225.2")
(version "20200923.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -687,11 +687,17 @@ point and then, after each tween step, plugging back the result.")
(file-name (git-file-name name version))
(sha256
(base32
"0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"))))
"1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))
;; Remove after next googletest release and update.
(patches
(search-patches
"abseil-cpp-fix-gtest.patch"
"abseil-cpp-fix-strerror_test.patch"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
"-DABSL_RUN_TESTS=ON"
"-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
;; Needed, else we get errors like:
;;
;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:
@ -813,7 +819,7 @@ of C++14 components that complements @code{std} and Boost.")
(define-public aws-sdk-cpp
(package
(name "aws-sdk-cpp")
(version "1.8.102")
(version "1.8.159")
(source (origin
(method git-fetch)
(uri (git-reference
@ -822,13 +828,13 @@ of C++14 components that complements @code{std} and Boost.")
(file-name (git-file-name name version))
(sha256
(base32
"1w8x2vakg5ngjyyg08n4g3dqy8wqnz0k3gkrlqrh460s2pvdivba"))))
"0jpfv9x82nq7hcix9in7qgrc8009dwpg6gr96hlgmcvqrqckd2r9"))))
(build-system cmake-build-system)
(arguments
'(;; Tests are run during the build phase.
#:tests? #f
#:configure-flags
'("-DBUILD_SHARED_LIBS=OFF"
'("-DBUILD_SHARED_LIBS=ON"
"-DBUILD_DEPS=OFF")))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)

1569
gnu/packages/cran.scm
View File

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
@ -907,8 +907,7 @@ EUI-64, also known as MAC-48 media access control addresses.")
(base32 "18szbh4dixcr7pmymvbrpv21hv0wrpii5w03rv2534bb2ywwpq8s"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-android-glue" ,rust-android-glue-0.2)
("rust-cgl" ,rust-cgl-0.3)
("rust-cocoa" ,rust-cocoa-0.23)
@ -924,10 +923,12 @@ EUI-64, also known as MAC-48 media access control addresses.")
("rust-objc" ,rust-objc-0.2)
("rust-osmesa-sys" ,rust-osmesa-sys-0.1)
("rust-parking-lot" ,rust-parking-lot-0.11)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-wayland-egl" ,rust-wayland-egl-0.28)
("rust-winapi" ,rust-winapi-0.3)
("rust-winit" ,rust-winit-0.24))))
(inputs
`(("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-wayland-egl" ,rust-wayland-egl-0.28)))
(home-page "https://github.com/tomaka/glutin")
(synopsis "Cross-platform OpenGL context provider")
(description "This package provides an OpenGL context provider.")
@ -2324,16 +2325,23 @@ applications.")
(base32 "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-downcast-rs" ,rust-downcast-rs-1)
("rust-libc" ,rust-libc-0.2)
("rust-nix" ,rust-nix-0.18)
("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-wayland-commons" ,rust-wayland-commons-0.28)
("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
("rust-wayland-sys" ,rust-wayland-sys-0.28))))
("rust-scoped-tls" ,rust-scoped-tls-1))
#:cargo-development-inputs
(("rust-tempfile" ,rust-tempfile-3))))
(inputs
`(("rust-bitflags" ,rust-bitflags-1)
("rust-downcast-rs" ,rust-downcast-rs-1)
("rust-libc" ,rust-libc-0.2)
("rust-nix" ,rust-nix-0.18)
("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-wayland-commons" ,rust-wayland-commons-0.28)
("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
("rust-wayland-sys" ,rust-wayland-sys-0.28)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis
"Rust bindings to the standard C implementation of the wayland protocol")
@ -2357,7 +2365,8 @@ the wayland protocol, client side.")
(base32
"1nmw2kz70llc5mxwzg6bglnqy0qnyr9224zjmq9czazgw3mq045g"))))
(arguments
`(#:cargo-inputs
`(#:skip-build? #t
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-calloop" ,rust-calloop-0.4)
("rust-downcast-rs" ,rust-downcast-rs-1)
@ -2369,7 +2378,8 @@ the wayland protocol, client side.")
("rust-wayland-scanner" ,rust-wayland-scanner-0.23))
#:cargo-development-inputs
(("rust-byteorder" ,rust-byteorder-1)
("rust-tempfile" ,rust-tempfile-3))))))
("rust-tempfile" ,rust-tempfile-3))))
(inputs `())))
(define-public rust-wayland-client-0.21
(package
@ -2413,12 +2423,15 @@ the wayland protocol, client side.")
(base32 "0mid1sgy3bmiywnrhsr31b8w6zvk1ll2ci2as15ddv8pczvm0128"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-nix" ,rust-nix-0.18)
("rust-once-cell" ,rust-once-cell-1)
("rust-smallvec" ,rust-smallvec-1)
("rust-wayland-sys" ,rust-wayland-sys-0.28))))
("rust-smallvec" ,rust-smallvec-1))))
(inputs
`(("rust-nix" ,rust-nix-0.18)
("rust-once-cell" ,rust-once-cell-1)
("rust-smallvec" ,rust-smallvec-1)
("rust-wayland-sys" ,rust-wayland-sys-0.28)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis "Types and structures used by wayland-client and wayland-server")
(description
@ -2441,9 +2454,11 @@ and wayland-server.")
(base32
"1nyvcs6xxxzqgh0wvc7z0fgi89bf3h9p4qrbf77bnfbwlb8v0rmv"))))
(arguments
`(#:cargo-inputs
`(#:skip-build? #t
#:cargo-inputs
(("rust-nix" ,rust-nix-0.14)
("rust-wayland-sys" ,rust-wayland-sys-0.23))))))
("rust-wayland-sys" ,rust-wayland-sys-0.23))))
(inputs `())))
(define-public rust-wayland-commons-0.21
(package
@ -2477,11 +2492,13 @@ and wayland-server.")
(base32 "0pvf96a9hg7b40vyvamcg491sa0006fr9bzf1xkaf8q22qn15syn"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-nix" ,rust-nix-0.18)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-xcursor" ,rust-xcursor-0.3))))
(inputs
`(("rust-nix" ,rust-nix-0.18)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-xcursor" ,rust-xcursor-0.3)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis "Bindings to libwayland-cursor")
(description
@ -2502,11 +2519,12 @@ properly display animated cursors.")
(sha256
(base32 "1xd7iap0x4sidmy9dv02cdnxjhnbk9li7r7f39x9cg0i8xs50ly6"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-wayland-sys" ,rust-wayland-sys-0.28))))
(inputs
`(("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-wayland-sys" ,rust-wayland-sys-0.28)))
;; For the PKG_CONFIG_PATH environment variable.
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis "Bindings to libwayland-egl")
(description
@ -2529,13 +2547,14 @@ initializing an OpenGL or Vulkan context.")
(base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-wayland-commons" ,rust-wayland-commons-0.28)
("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
("rust-wayland-server" ,rust-wayland-server-0.28))))
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1))))
(inputs
`(("rust-bitflags" ,rust-bitflags-1)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-wayland-commons" ,rust-wayland-commons-0.28)
("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
("rust-wayland-server" ,rust-wayland-server-0.28)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis "Generated API for the officials Wayland protocol extensions")
(description
@ -2558,12 +2577,14 @@ extensions.")
(base32
"1ygwbzqlnks5xzafka3c8ag6k92g2h6ygj2xsmvjfx2n6rj8dhkc"))))
(arguments
`(#:cargo-inputs
`(#:skip-build? #t
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-wayland-client" ,rust-wayland-client-0.23)
("rust-wayland-commons" ,rust-wayland-commons-0.23)
("rust-wayland-server" ,rust-wayland-server-0.23)
("rust-wayland-scanner" ,rust-wayland-scanner-0.23))))))
("rust-wayland-scanner" ,rust-wayland-scanner-0.23))))
(inputs `())))
(define-public rust-wayland-protocols-0.21
(package
@ -2600,12 +2621,10 @@ extensions.")
(sha256
(base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-xml-rs" ,rust-xml-rs-0.8))))
(inputs
`(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-xml-rs" ,rust-xml-rs-0.8)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis "Generate Rust APIs from XML Wayland protocol files")
(description
@ -2630,7 +2649,8 @@ wayland-client crate for usable bindings.")
(base32
"0g8wcphykjrcpslznyi3qccx1pckw97rckq5b295nfbg6r3j5c4k"))))
(arguments
`(#:cargo-inputs
`(#:skip-build? #t
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-0.4)
("rust-quote" ,rust-quote-0.6)
("rust-xml-rs" ,rust-xml-rs-0.8))))))
@ -2663,18 +2683,25 @@ wayland-client crate for usable bindings.")
(base32 "09jfdjfqhjfcpiz4csgh60ymfkmz1cl3jmxyzq9hzcp0kyyxix93"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-downcast-rs" ,rust-downcast-rs-1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-nix" ,rust-nix-0.18)
("rust-parking-lot" ,rust-parking-lot-0.11)
("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-wayland-commons" ,rust-wayland-commons-0.28)
("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
("rust-wayland-sys" ,rust-wayland-sys-0.28))))
("rust-scoped-tls" ,rust-scoped-tls-1))))
(inputs
`(("rust-bitflags" ,rust-bitflags-1)
("rust-downcast-rs" ,rust-downcast-rs-1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-nix" ,rust-nix-0.18)
("rust-parking-lot" ,rust-parking-lot-0.11)
("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-wayland-commons" ,rust-wayland-commons-0.28)
("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
("rust-wayland-sys" ,rust-wayland-sys-0.28)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis
"Bindings to the standard C implementation of the wayland protocol")
@ -2698,7 +2725,8 @@ the wayland protocol, server side.")
(base32
"1ccsalq6gnf07klnbjx2dxcbibhw03rqsgi578p913s3zsjlcg8a"))))
(arguments
`(#:cargo-inputs
`(#:skip-build? #t
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-calloop" ,rust-calloop-0.4)
("rust-downcast-rs" ,rust-downcast-rs-1)
@ -2707,7 +2735,8 @@ the wayland protocol, server side.")
("rust-nix" ,rust-nix-0.14)
("rust-wayland-commons" ,rust-wayland-commons-0.23)
("rust-wayland-sys" ,rust-wayland-sys-0.23)
("rust-wayland-scanner" ,rust-wayland-scanner-0.23))))))
("rust-wayland-scanner" ,rust-wayland-scanner-0.23))))
(inputs `())))
(define-public rust-wayland-server-0.21
(package
@ -2748,12 +2777,27 @@ the wayland protocol, server side.")
(base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-dlib" ,rust-dlib-0.4)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3))))
("rust-pkg-config" ,rust-pkg-config-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-libraries
(lambda* (#:key inputs #:allow-other-keys)
(let ((libwayland (assoc-ref inputs "wayland")))
(substitute* (find-files "src" "\\.rs$")
(("libwayland.*\\.so" shared-lib)
(string-append libwayland "/lib/" shared-lib)))
#t))))))
(inputs
`(("rust-dlib" ,rust-dlib-0.4)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3)))
(propagated-inputs
`(("wayland" ,wayland)))
(home-page "https://github.com/smithay/wayland-rs")
(synopsis "FFI bindings to the various @file{libwayland-*.so} libraries")
(description
@ -2778,10 +2822,13 @@ crate @code{rust-wayland-client} for usable bindings.")
(base32
"1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr"))))
(arguments
`(#:cargo-inputs
`(#:skip-build? #t
#:cargo-inputs
(("rust-dlib" ,rust-dlib-0.4)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2))))))
("rust-libc" ,rust-libc-0.2))))
(inputs `())
(propagated-inputs `())))
(define-public rust-wayland-sys-0.21
(package
@ -2836,10 +2883,11 @@ crate @code{rust-wayland-client} for usable bindings.")
("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12)
("rust-stdweb" ,rust-stdweb-0.4)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-web-sys" ,rust-web-sys-0.3)
("rust-winapi" ,rust-winapi-0.3)
("rust-x11-dl" ,rust-x11-dl-2))))
(inputs
`(("rust-wayland-client" ,rust-wayland-client-0.28)))
(home-page "https://github.com/rust-windowing/winit")
(synopsis "Window creation library")
(description

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

File diff suppressed because it is too large Load Diff

63
gnu/packages/crypto.scm
View File

@ -47,9 +47,11 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libbsd)
@ -88,6 +90,57 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
(define-public libdecaf
(package
(name "libdecaf")
(version "1.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://git.code.sf.net/p/ed448goldilocks/code")
(commit
(string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "1ajgmyvc6a4m1h2hg1g4wz7ibx10x1xys9m6ancnmmf1f2srlfly"))))
(build-system cmake-build-system)
(outputs '("out" "python" "doc"))
(arguments
`(#:configure-flags '("-DENABLE_STATIC=OFF")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-python-binding
(lambda _
(substitute* "python/setup.py"
(("gmake")
"make")
(("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'")
"'..', '..', 'build', 'src', 'libdecaf.so'"))))
(add-after 'install 'install-python-binding
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion "../source/python"
(invoke "python" "setup.py" "install"
(string-append "--prefix=" (assoc-ref outputs "python"))
"--root=/"))))
(add-after 'install-python-binding 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "doc")
(let* ((doc (assoc-ref outputs "doc"))
(dest (string-append doc "/share/doc")))
(copy-recursively "doc" dest)))))))
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)
("python" ,python-wrapper)))
(synopsis "Decaf Elliptic Curve Library")
(description "The libdecaf library is an implementation of elliptic curve
cryptography using the Montgomery and Edwards curves Curve25519, Ed25519,
Ed448-Goldilocks and Curve448, using the Decaf encoding.")
(home-page "http://ed448goldilocks.sourceforge.net/")
(license (list license:expat ;library
license:bsd-2)))) ;python bindings
(define-public libsodium
(package
(name "libsodium")
@ -114,7 +167,7 @@ communication, encryption, decryption, signatures, etc.")
(define-public libmd
(package
(name "libmd")
(version "1.0.1")
(version "1.0.3")
(source (origin
(method url-fetch)
(uri
@ -125,7 +178,7 @@ communication, encryption, decryption, signatures, etc.")
version ".tar.xz")))
(sha256
(base32
"0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1"))))
"0jmga8y94h857ilra3qjaiax3wd5pd6mx1h120zhl9fcjmzhj0js"))))
(build-system gnu-build-system)
(synopsis "Message Digest functions from BSD systems")
(description
@ -887,14 +940,14 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
(define-public botan
(package
(name "botan")
(version "2.12.1")
(version "2.17.3")
(source (origin
(method url-fetch)
(uri (string-append "https://botan.randombit.net/releases/"
"Botan-" version ".tar.xz"))
(sha256
(base32
"1ada3ga7b0z4m0vjmxlvfi4nsic2l8kjcy85jwss3z2i58a5y0vy"))))
"121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -916,6 +969,8 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
;; Recommended by upstream
"--with-zlib" "--with-bzip2" "--with-sqlite3"))))
(add-before 'check 'library-path-for-tests
(lambda _ (setenv "LD_LIBRARY_PATH" (getcwd))))
(replace 'check
(lambda _ (invoke "./botan-test"))))))
(native-inputs

19
gnu/packages/cups.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017–2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@ -487,14 +487,14 @@ should only be used as part of the Guix cups-pk-helper service.")
(define-public hplip
(package
(name "hplip")
(version "3.20.11")
(version "3.21.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb"))
"0hbwx9d4c8177vi0gavz9pxi7rc97jciacndp90ms8327shj2121"))
(modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet
@ -671,8 +671,7 @@ should only be used as part of the Guix cups-pk-helper service.")
("pkg-config" ,pkg-config)))))
(define-public hplip-minimal
(package
(inherit hplip)
(package/inherit hplip
(name "hplip-minimal")
(arguments
(substitute-keyword-arguments (package-arguments hplip)
@ -850,7 +849,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.8")
(version "1.7.9")
;; 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
@ -858,11 +857,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/04/32/"
"1a455ef8618def65700ca4e446311c2fb43cd839/"
"epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz"))
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/50/95/"
"322b8d6b915ab85add33d41f04ba5130866aadbe/"
"epson-inkjet-printer-escpr-1.7.9-1lsb3.2.tar.gz"))
(sha256
(base32 "1pygg2bd2gh27dc65h3dzwrpvi6bq5c87wl0ldchqlc2b3blsx6p"))))
(base32 "136hhvhimxfnrdn3ksbiswjxgsifrwlp3zz8h0v63w4k1vkzpgc0"))))
(build-system gnu-build-system)
(arguments
`(#:modules

6
gnu/packages/curl.scm
View File

@ -192,14 +192,14 @@ not offer a replacement for libcurl.")
(define-public guile-curl
(package
(name "guile-curl")
(version "0.7")
(version "0.9")
(source (origin
(method url-fetch)
(uri (string-append "http://www.lonelycactus.com/tarball/"
"guile_curl-" version ".tar.gz"))
(sha256
(base32
"1zk0ijx6bj212k0j0ma84cpvpvn0x6raaxnby3wdx3w4wnhnscn7"))))
"0y7wfhilfm6vzs0wyifrrc2pj9nsxfas905c7qa5cw4i6s74ypmi"))))
(build-system gnu-build-system)
(arguments
`(#:modules (((guix build guile-build-system)
@ -224,7 +224,7 @@ not offer a replacement for libcurl.")
(modify-phases %standard-phases
(add-after 'unpack 'patch-undefined-references
(lambda* _
(substitute* "src/curl.scm"
(substitute* "module/curl.scm"
;; The following #defines are missing from our curl package
;; and therefore result in the evaluation of undefined symbols.
((",CURLOPT_HAPROXYPROTOCOL") "#f")

18
gnu/packages/cyrus-sasl.scm
View File

@ -45,6 +45,7 @@
(sha256 (base32
"1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"))
(patches (search-patches "cyrus-sasl-ac-try-run-fix.patch"))))
(replacement cyrus-sasl/fixed)
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -80,3 +81,20 @@ server writers.")
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))
(home-page "https://cyrusimap.org/sasl/")))
(define cyrus-sasl/fixed
(package
(inherit cyrus-sasl)
(version "2.1.27")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://cyrusimap.org/releases/cyrus-sasl-"
version ".tar.gz")
(string-append
"ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-"
version ".tar.gz")))
(sha256 (base32
"1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"))
(patches (search-patches "cyrus-sasl-ac-try-run-fix.patch"
"cyrus-sasl-CVE-2019-19906.patch"))))))

374
gnu/packages/databases.scm
View File

@ -32,7 +32,7 @@
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
@ -193,52 +193,6 @@
either single machines or networked clusters.")
(license license:gpl3+)))
(define-public go-gopkg.in-mgo.v2
(package
(name "go-gopkg.in-mgo.v2")
(version "2016.08.01")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-mgo/mgo")
(commit (string-append "r" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0rwbi1z63w43b0z9srm8m7iz1fdwx7bq7n2mz862d6liiaqa59jd"))))
(build-system go-build-system)
(arguments
`(#:import-path "gopkg.in/mgo.v2"
;; TODO: The tests fail as MongoDB fails to start
;; Error parsing command line: unrecognised option '--chunkSize'
#:tests? #f
#:phases
(modify-phases %standard-phases
(delete 'reset-gzip-timestamps)
(add-before 'check 'start-mongodb
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion "src/gopkg.in/mgo.v2"
(invoke "make" "startdb")))
#t))
(add-after 'check 'stop'mongodb
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion "src/gopkg.in/mgo.v2"
(invoke "make" "stopdb")))
#t)))))
(native-inputs
`(("go-gopkg.in-check.v1" ,go-gopkg.in-check.v1)
("mongodb" ,mongodb)
("daemontools" ,daemontools)))
(synopsis "@code{mgo} offers a rich MongoDB driver for Go.")
(description
"@code{mgo} (pronounced as mango) is a MongoDB driver for the Go language.
It implements a rich selection of features under a simple API following
standard Go idioms.")
(home-page "https://labix.org/mgo")
(license license:bsd-2)))
(define-public ephemeralpg
(package
(name "ephemeralpg")
@ -572,7 +526,8 @@ applications.")
("cyrus-sasl" ,cyrus-sasl)))
(outputs '("out" "doc"))
(arguments
'(#:phases
'(#:tests? #f ;many tests fail and use too much time
#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'fix-configure.ac
;; Move the AC_CONFIG_AUX_DIR macro use under AC_INIT, otherwise we
@ -584,24 +539,9 @@ applications.")
(delete-file "bootstrap.sh") ;not useful in the context of Guix
(substitute* "configure.ac"
(("^AC_CONFIG_AUX_DIR\\(\\[build-aux\\]\\).*") "")
(("(^AC_INIT.*)" anchor)
(string-append anchor "AC_CONFIG_AUX_DIR([build-aux])\n")))
#t))
(add-before 'bootstrap 'disable-failing-tests
;; See: https://bugs.launchpad.net/libmemcached/+bug/1803926
(lambda _
;; Mark some heavily failing test suites as expected to fail.
(substitute* "Makefile.am"
(("(XFAIL_TESTS =[^\n]*)" xfail_tests)
(string-append xfail_tests " tests/testudp"
" tests/libmemcached-1.0/testapp"
" tests/libmemcached-1.0/testsocket")))
;; Disable two tests of the unittest test suite.
(substitute* "libtest/unittest.cc"
((".*echo_fubar_BINARY \\},.*") "")
((".*application_doesnotexist_BINARY \\},.*") ""))
#t))
(add-after 'disable-dns-tests 'build-and-install-html-doc
(("^AC_INIT.*" anchor)
(string-append anchor "AC_CONFIG_AUX_DIR([build-aux])\n")))))
(add-before 'build 'build-and-install-html-doc
(lambda* (#:key outputs #:allow-other-keys)
(let ((html (string-append (assoc-ref outputs "doc")
"/share/doc/libmemcached/html/")))
@ -609,9 +549,8 @@ applications.")
;; Cleanup useless files.
(for-each delete-file-recursively
(map (lambda (x) (string-append html x))
'("_sources" ".doctrees" ".buildinfo"))))
#t)))))
(home-page "https://libmemcached.org/")
'("_sources" ".doctrees" ".buildinfo")))))))))
(home-page "https://libmemcached.org/libMemcached.html")
(synopsis "C++ library for memcached")
(description "libMemcached is a library to use memcached in C/C++
applications. It comes with a complete reference guide and documentation of
@ -661,143 +600,6 @@ replacement for the code@{python-memcached} library.")
(define-public python2-pylibmc
(package-with-python2 python-pylibmc))
(define-public mongodb
(package
(name "mongodb")
(version "3.4.10")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mongodb/mongo/archive/r"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0676lvkljj7a5hdhv78dbykqnqrj9lbn9799mi84b8vbnzsq961r"))
(modules '((guix build utils)))
(snippet
'(begin
(for-each (lambda (dir)
(delete-file-recursively
(string-append "src/third_party/" dir)))
'("pcre-8.41" "scons-2.5.0" "snappy-1.1.3"
"valgrind-3.11.0" "wiredtiger"
"yaml-cpp-0.5.3" "zlib-1.2.8"))
#t))
(patches
(list
(search-patch "mongodb-support-unknown-linux-distributions.patch")))))
(build-system scons-build-system)
(inputs
`(("openssl" ,openssl-1.0)
("pcre" ,pcre)
,@(match (%current-system)
((or "x86_64-linux" "aarch64-linux" "mips64el-linux")
`(("wiredtiger" ,wiredtiger)))
(_ `()))
("yaml-cpp" ,yaml-cpp)
("zlib" ,zlib)
("snappy" ,snappy)))
(native-inputs
`(("valgrind" ,valgrind)
("perl" ,perl)
("python" ,python-2)
("python2-pymongo" ,python2-pymongo)
("python2-pyyaml" ,python2-pyyaml)
("tzdata" ,tzdata-for-tests)))
(arguments
`(#:scons ,scons-python2
#:phases
(let ((common-options
`(;; "--use-system-tcmalloc" TODO: Missing gperftools
"--use-system-pcre"
;; wiredtiger is 64-bit only
,,(if (any (cute string-prefix? <> (or (%current-target-system)
(%current-system)))
'("i686-linux" "armhf-linux"))
``"--wiredtiger=off"
``"--use-system-wiredtiger")
;; TODO
;; build/opt/mongo/db/fts/unicode/string.o failed: Error 1
;; --use-system-boost
"--use-system-snappy"
"--use-system-zlib"
"--use-system-valgrind"
;; "--use-system-stemmer" TODO: Missing relevant package
"--use-system-yaml"
"--disable-warnings-as-errors"
,(format #f "--jobs=~a" (parallel-job-count))
"--ssl")))
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
;; Remove use of GNU extensions in parse_number_test.cpp, to
;; allow compiling with GCC 7 or later
;; https://jira.mongodb.org/browse/SERVER-28063
(substitute* "src/mongo/base/parse_number_test.cpp"
(("0xabcab\\.defdefP-10")
"687.16784283419838"))
#t))
(add-after 'unpack 'scons-propagate-environment
(lambda _
;; Modify the SConstruct file to arrange for
;; environment variables to be propagated.
(substitute* "SConstruct"
(("^env = Environment\\(")
"env = Environment(ENV=os.environ, "))
#t))
(add-after 'unpack 'create-version-file
(lambda _
(call-with-output-file "version.json"
(lambda (port)
(display ,(simple-format #f "{
\"version\": \"~A\"
}" version) port)))
#t))
(replace 'build
(lambda _
(apply invoke `("scons"
,@common-options
"mongod" "mongo" "mongos"))))
(replace 'check
(lambda* (#:key tests? inputs #:allow-other-keys)
(setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo"))
(when tests?
;; Note that with the tests, especially the unittests, the
;; build can take up to ~45GB of space, as many tests are
;; individual executable files, with some being hundreds of
;; megabytes in size.
(apply invoke `("scons" ,@common-options "dbtest" "unittests"))
(substitute* "build/unittests.txt"
;; TODO: Don't run the async_stream_test, as it hangs
(("^build\\/opt\\/mongo\\/executor\\/async\\_stream\\_test\n$")
"")
;; TODO: This test fails
;; Expected 0UL != disks.size() (0 != 0) @src/mongo/util/procparser_test.cpp:476
(("^build\\/opt\\/mongo\\/util\\/procparser\\_test\n$")
""))
(invoke "python" "buildscripts/resmoke.py"
"--suites=dbtest,unittests"
(format #f "--jobs=~a" (parallel-job-count))))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "mongod" bin)
(install-file "mongos" bin)
(install-file "mongo" bin))
#t))))))
(home-page "https://www.mongodb.org/")
(synopsis "High performance and high availability document database")
(description
"Mongo is a high-performance, high availability, schema-free
document-oriented database. A key goal of MongoDB is to bridge the gap
between key/value stores (which are fast and highly scalable) and traditional
RDBMS systems (which are deep in functionality).")
(license (list license:agpl3
;; Some parts are licensed under the Apache License
license:asl2.0))))
(define-public mycli
(package
(name "mycli")
@ -833,7 +635,7 @@ auto-completion and syntax highlighting.")
(define-public mysql
(package
(name "mysql")
(version "5.7.27")
(version "5.7.33")
(source (origin
(method url-fetch)
(uri (list (string-append
@ -845,7 +647,7 @@ auto-completion and syntax highlighting.")
name "-" version ".tar.gz")))
(sha256
(base32
"1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"))))
"1bb343mf7n0qg2qz497gxjsqprygrjz1q1pbz76hgqxnsy08sfxd"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -2499,7 +2301,7 @@ database.")
(define-public lmdb
(package
(name "lmdb")
(version "0.9.27")
(version "0.9.28")
(source
(origin
(method git-fetch)
@ -2508,7 +2310,7 @@ database.")
(commit (string-append "LMDB_" version))))
(file-name (git-file-name name version))
(sha256
(base32 "09xqqm8yjsf1gv4gd4llal48sms76hfhxadx6rik1j2g5v3d3f1k"))))
(base32 "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -2648,17 +2450,25 @@ can autogenerate peewee models using @code{pwiz}, a model generator.")
(define-public python-tortoise-orm
(package
(name "python-tortoise-orm")
(version "0.16.7")
(version "0.16.21")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tortoise-orm" version))
(sha256
(base32
"0wr7p4v0b16ypm9fcpwpl99kf491m6w3jkd13xcsgq13fy73fbqc"))))
"1dallk0q8q4v37klm0v3rppf2w8sjkqmypc1w8r9rraqxg1ylacp"))))
(build-system python-build-system)
;; Disable tests for now. They pull in a lot of dependencies.
(arguments `(#:tests? #f))
(arguments
`(#:tests? #f ; Pypi does not have tests and Git snapshot depends on
; poetry.
#:phases (modify-phases %standard-phases
(add-after 'unpack 'relax-version-requirements
(lambda _
(substitute* "setup.py"
(("pypika>=0\\.44\\.0,<0\\.45\\.0") "pypika")
(("aiosqlite>=0.16.0,<0.17.0") "aiosqlite"))
#t)))))
(native-inputs
`(("python-asynctest" ,python-asynctest)
("python-nose2" ,python-nose2)))
@ -3239,15 +3049,25 @@ translate the complete SQLite API into Python.")
(define-public python-aiosqlite
(package
(name "python-aiosqlite")
(version "0.12.0")
(version "0.17.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiosqlite" version))
(sha256
(base32
"1w8248yz85xyzvvh4jaxnc59fqil45aka6h82kn1rcih4rjxbnn1"))))
"0lgfpbkcd730hbgj3zlrbx2y8fzvdns2zj3s4r4l31n49g1arrph"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "python" "-m" "unittest" "aiosqlite.tests")
(format #t "test suite not run~%"))
#t)))))
(propagated-inputs
`(("python-typing-extensions" ,python-typing-extensions)))
(native-inputs
`(("python-aiounittest" ,python-aiounittest)))
(home-page "https://github.com/jreese/aiosqlite")
@ -3535,9 +3355,6 @@ processing them in the background with workers. It is backed by Redis and it
is designed to have a low barrier to entry.")
(license license:bsd-2)))
(define-public python2-rq
(package-with-python2 python-rq))
(define-public python-rq-scheduler
(package
(name "python-rq-scheduler")
@ -3650,7 +3467,7 @@ transforms idiomatic python function calls to well-formed SQL queries.")
(define-public python-pypika
(package
(name "python-pypika")
(version "0.44.0")
(version "0.47.6")
(source
(origin (method git-fetch)
(uri (git-reference
@ -3659,7 +3476,7 @@ transforms idiomatic python function calls to well-formed SQL queries.")
(file-name (git-file-name name version))
(sha256
(base32
"0mpddrw9z1pzcc40j3pzhd583hlgjx96aa8ak6m9zzhpm4bv3ard"))))
"001pg36sw9a36zdd1kccbymcxndphjcjbbrsy6ri7ng8h4dgz549"))))
(build-system python-build-system)
(native-inputs
`(("python-parameterized" ,python-parameterized)))
@ -3670,121 +3487,6 @@ transforms idiomatic python function calls to well-formed SQL queries.")
the SQL language using a syntax that reflects the resulting query.")
(license license:asl2.0)))
(define-public mongo-tools
(package
(name "mongo-tools")
(version "3.4.0")
(source
(origin (method git-fetch)
(uri (git-reference
(url "https://github.com/mongodb/mongo-tools")
(commit (string-append "r" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1bcsz5cvj39a7nsxsfqmz9igrw33j6yli9kffigqyscs52amw7x1"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/mongodb/mongo-tools"
#:modules ((srfi srfi-1)
(guix build go-build-system)
(guix build utils))
#:install-source? #f
#:phases
(let ((all-tools
'("bsondump" "mongodump" "mongoexport" "mongofiles"
"mongoimport" "mongooplog" "mongorestore"
"mongostat" "mongotop")))
(modify-phases %standard-phases
(add-after 'unpack 'delete-bundled-source-code
(lambda _
(delete-file-recursively
"src/github.com/mongodb/mongo-tools/vendor")
#t))
(add-after 'delete-bundled-source-code 'patch-source
(lambda _
;; Remove a redundant argument that causes compilation to fail.
(substitute*
"src/github.com/mongodb/mongo-tools/mongorestore/filepath.go"
(("skipping restore of system.profile collection\", db)")
"skipping restore of system.profile collection\")"))
#t))
(replace 'build
(lambda _
(for-each (lambda (tool)
(let ((command
`("go" "build"
;; This is where the tests expect to find the
;; executables
"-o" ,(string-append
"src/github.com/mongodb/mongo-tools/bin/"
tool)
"-v"
"-tags=\"ssl sasl\""
"-ldflags"
"-extldflags=-Wl,-z,now,-z,relro"
,(string-append
"src/github.com/mongodb/mongo-tools/"
tool "/main/" tool ".go"))))
(simple-format #t "build: running ~A\n"
(string-join command))
(apply invoke command)))
all-tools)
#t))
(replace 'check
(lambda _
(with-directory-excursion "src"
(for-each (lambda (tool)
(invoke
"go" "test" "-v"
(string-append "github.com/mongodb/mongo-tools/"
tool)))
all-tools))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (tool)
(install-file
(string-append "src/github.com/mongodb/mongo-tools/bin/"
tool)
(string-append (assoc-ref outputs "out")
"/bin")))
all-tools)
#t))))))
(native-inputs
`(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass)
("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags)
("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
("go-gopkg.in-mgo.v2" ,go-gopkg.in-mgo.v2)
("go-gopkg.in-tomb.v2" ,go-gopkg.in-tomb.v2)
("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go)
("go-github.com-smartystreets-goconvey" ,go-github.com-smartystreets-goconvey)))
(home-page "https://github.com/mongodb/mongo-tools")
(synopsis "Various tools for interacting with MongoDB and BSON")
(description
"This package includes a collection of tools related to MongoDB.
@table @code
@item bsondump
Display BSON files in a human-readable format
@item mongoimport
Convert data from JSON, TSV or CSV and insert them into a collection
@item mongoexport
Write an existing collection to CSV or JSON format
@item mongodump/mongorestore
Dump MongoDB backups to disk in the BSON format
@item mongorestore
Read MongoDB backups in the BSON format, and restore them to a live database
@item mongostat
Monitor live MongoDB servers, replica sets, or sharded clusters
@item mongofiles
Read, write, delete, or update files in GridFS
@item mongooplog
Replay oplog entries between MongoDB servers
@item mongotop
Monitor read/write activity on a mongo server
@end table")
(license license:asl2.0)))
;; There are many wrappers for this in other languages. When touching, please
;; be sure to ensure all dependencies continue to build.
(define-public apache-arrow

6
gnu/packages/dbm.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -76,6 +77,11 @@
'("--build=aarch64-unknown-linux-gnu")
'())
;; Bdb doesn't recognize powerpc64le as an architecture.
,@(if (string=? "powerpc64le-linux" (%current-system))
'("--build=powerpc64le-unknown-linux-gnu")
'())
,@(if (%current-target-system) ; cross building
'((string-append "--host=" target))
'())

11
gnu/packages/diffoscope.scm
View File

@ -72,7 +72,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "168")
(version "170")
(source (origin
(method git-fetch)
(uri (git-reference
@ -81,7 +81,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"18rs4jfx50d7vkaqcc46r7pccgizp0is56267sq13vbfvz758dhh"))))
"0s1z4yc5d10ns4x28d2lm8py30r7sq4764q6b8yxcwxwfrjibmb0"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -121,13 +121,6 @@
;; This requires /sbin to be in $PATH.
(delete-file "tests/test_tools.py")
#t))
(add-before 'check 'skip-dex-test-with-missing-procyon
(lambda _
;; This test actually requires procyon decompiler
(substitute* "tests/comparators/test_dex.py"
(("skip_unless_tools_exist.\"enjarify\", \"zipinfo\", \"javap\"")
"skip_unless_tools_exist(\"enjarify\", \"zipinfo\", \"javap\", \"procyon\""))
#t))
(add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))

9
gnu/packages/disk.scm
View File

@ -1119,7 +1119,7 @@ that support this feature).")
(define-public memkind
(package
(name "memkind")
(version "1.10.1")
(version "1.11.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1128,7 +1128,7 @@ that support this feature).")
(file-name (git-file-name name version))
(sha256
(base32
"11iz887f3cp5pzf1bzm644wzab8gkbhz3b7x1w6pcps71yd94ylj"))))
"0w5hws12l167mbr4n6a6fl0mhf8mci61fsn55lh2cxz33f7q8n2x"))))
(build-system gnu-build-system)
(inputs
`(;; memkind patched jemalloc to add je_arenalookupx,
@ -1141,7 +1141,10 @@ that support this feature).")
("automake" ,automake)
("libtool" ,libtool)))
(arguments
`(#:tests? #f ; Tests require a NUMA-enabled system.
`(#:configure-flags
(list (string-append "--docdir=" (assoc-ref %outputs "out")
"/share/doc/" ,name "-" ,version))
#:tests? #f ; Tests require a NUMA-enabled system.
#:phases
(modify-phases %standard-phases
(add-before 'build 'autogen-jemalloc

10
gnu/packages/django.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@ -48,13 +48,13 @@
(define-public python-django
(package
(name "python-django")
(version "3.1.3")
(version "3.1.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
"13rz3v0bwk8i3xcccn5awbafahab3cyk8wwv57v2xazdzxspgf0l"))))
"19v5lfijnjx18y9ax962z3gnbxy9k8i3w4j0qfzcp85nx4p7kkij"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -120,13 +120,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(define-public python-django-2.2
(package
(inherit python-django)
(version "2.2.17")
(version "2.2.19")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
"0qdq0h2gw45j0h9j22c2sdn49ybl7jsrcyraskb9snknsyj70lyg"))))
"0hysjf8bz4g8xrn2cdx6pmawimpyr6ag2fg3jxsnc1byr3g3bhih"))))
(native-inputs
`(;; XXX: In 2.2 and 3.0, selenium is required for the test suite.
("python-selenium" ,python-selenium)

8
gnu/packages/dns.scm
View File

@ -319,7 +319,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here:
;; https://www.isc.org/bind/
(version "9.16.12")
(version "9.16.13")
(source (origin
(method url-fetch)
(uri (string-append
@ -327,7 +327,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/bind-" version ".tar.xz"))
(sha256
(base32
"0zys8hk08zzrw57x0vmzv6zx0a7vjj6qk5qh8jmrqd7x269sy54r"))))
"026cliyj570wxvvij96mrzsxyf421xv9a80gc5gv6savza9wfk55"))))
(build-system gnu-build-system)
(outputs `("out" "utils"))
(inputs
@ -1287,14 +1287,14 @@ and TCP-capable recursive DNS server for finding domains on the internet.")
(define-public openresolv
(package
(name "openresolv")
(version "3.10.0")
(version "3.12.0")
(source (origin
(method url-fetch)
(uri (string-append "https://roy.marples.name/downloads/openresolv/"
"openresolv-" version ".tar.xz"))
(sha256
(base32
"01ms6c087la4hk0f0w6n2vpsb7dg4kklah2rqyhz88p0vr9bqy20"))
"15qvp5va2yrqpz0ba54clvn8cbc66v4sl7k3bi9ji8jpx040bcs2"))
(patches
(search-patches "openresolv-restartcmd-guix.patch"))))
(build-system gnu-build-system)

4
gnu/packages/docbook.scm
View File

@ -254,7 +254,7 @@ by no means limited to these applications.) This package provides XML DTDs.")
(inputs
`(("docbook-dsssl-doc" ,docbook-dsssl-doc)))
(native-inputs
`(("bzip2", bzip2)
`(("bzip2" ,bzip2)
("tar" ,tar)))
(home-page "https://docbook.org/")
(synopsis "DSSSL style sheets for DocBook")
@ -292,7 +292,7 @@ by no means limited to these applications.) This package provides XML DTDs.")
"--no-same-owner" "-C" docdir
(string-append "docbook-dsssl-" ,version "/doc"))))))
(native-inputs
`(("bzip2", bzip2)
`(("bzip2" ,bzip2)
("tar" ,tar)))
(home-page "https://docbook.org/")
(synopsis "DocBook DSSSL style sheets documentation")

32
gnu/packages/docker.scm
View File

@ -52,7 +52,7 @@
;; Note - when changing Docker versions it is important to update the versions
;; of several associated packages (docker-libnetwork and go-sctp).
(define %docker-version "19.03.13")
(define %docker-version "19.03.15")
(define-public python-docker
(package
@ -177,18 +177,16 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd
(package
(name "containerd")
(version "1.2.5")
(version "1.3.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/containerd/containerd")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"))
(patches
(search-patches "containerd-test-with-go1.13.patch"))))
(method git-fetch)
(uri (git-reference
(url "https://github.com/containerd/containerd")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "10fz7359aydbz0yb01qkrsq2diypayfal618lvvb1x0gvgkp526i"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/containerd/containerd"
@ -252,7 +250,7 @@ network attachments.")
;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that
;; this version is kept in sync with the version of Docker being used.
;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf.
(let ((commit "026aabaa659832804b01754aaadd2c0f420c68b6")
(let ((commit "55e924b8a84231a065879156c0de95aefc5f5435")
(version (version-major+minor %docker-version))
(revision "1"))
(package
@ -267,7 +265,7 @@ network attachments.")
(file-name (git-file-name name version))
(sha256
(base32
"0bli21vn5v7bssw3ydym4jfdjsldhb47fld88kng7d138wl70lkw"))
"19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp"))
;; Delete bundled ("vendored") free software source code.
(modules '((guix build utils)))
(snippet '(begin
@ -316,11 +314,11 @@ built-in registry server of Docker.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/docker/engine")
(url "https://github.com/moby/moby")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mg3jjisdbqrqrrhyslj3715lslial2kcgjrpprb6q63i52963gj"))
(base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8"))
(patches
(search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system)
@ -517,6 +515,8 @@ built-in registry server of Docker.")
(delete-file "runconfig/config_test.go")
;; This file uses /var.
(delete-file "daemon/oci_linux_test.go")
;; Signal tests fail in bizarre ways
(delete-file "pkg/signal/signal_linux_test.go")
#t))
(replace 'configure
(lambda _
@ -611,7 +611,7 @@ provisioning etc.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0wm5x8b8jll78h2zzncfdpxj0y3gv571z0nd39f036wsy7r23dsi"))))
(base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"

22
gnu/packages/dunst.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;;
;;; This file is part of GNU Guix.
;;;
@ -23,6 +24,7 @@
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages base)
#:use-module (gnu packages freedesktop)
@ -36,7 +38,7 @@
(define-public dunst
(package
(name "dunst")
(version "1.5.0")
(version "1.6.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -45,25 +47,20 @@
(file-name (git-file-name name version))
(sha256
(base32
"0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c"))))
"0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no check target
#:make-flags (list "CC=gcc"
`(#:tests? #f ; no check target
#:make-flags (list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" %output)
(string-append "SYSCONFDIR=" %output "/etc")
;; Otherwise it tries to install service file
;; to "dbus" store directory.
(string-append "SERVICEDIR_DBUS=" %output
"/share/dbus-1/services")
"dunstify")
#:phases (modify-phases %standard-phases
(delete 'configure)
(add-after 'install 'install-dunstify
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "dunstify"
(string-append out "/bin")))
#t)))))
(delete 'configure))))
(native-inputs
`(("pkg-config" ,pkg-config)
("perl" ,perl) ; for pod2man
@ -79,7 +76,8 @@
("libxscrnsaver" ,libxscrnsaver)
("libxinerama" ,libxinerama)
("libxrandr" ,libxrandr)
("libxdg-basedir" ,libxdg-basedir)))
("libxdg-basedir" ,libxdg-basedir)
("wayland" ,wayland))) ; for wayland support
(home-page "https://dunst-project.org/")
(synopsis "Customizable and lightweight notification daemon")
(description

6
gnu/packages/ebook.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017, 2019, 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
@ -542,7 +542,7 @@ Some of the current features:
(define-public xchm
(package
(name "xchm")
(version "1.31")
(version "1.32")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/rzvncj/xCHM"
@ -550,7 +550,7 @@ Some of the current features:
version "/xchm-" version ".tar.gz"))
(sha256
(base32
"0aw6bysqiwbw75n3ad229ihlmh7chqs1wlxm0398z3lfp2y6n7qf"))))
"0b12ym7cn65wy268kbksyhakicwb053c8xfn76q2dawrvbras9dj"))))
(build-system gnu-build-system)
(inputs
`(("wxwidgets" ,wxwidgets)

8
gnu/packages/education.scm
View File

@ -276,7 +276,7 @@ easy.")
(define-public snap
(package
(name "snap")
(version "6.5.0")
(version "6.6.0")
(source
(origin
(method git-fetch)
@ -285,7 +285,7 @@ easy.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sqd4ddkfc7f7gx02wffvwbqgfbhpkcgyv7v5rh3gx60jca02p4w"))))
(base32 "1k0j0sp6zz2hnh7zc7f086zc3sld01h7sk277j6fak914yv6slzy"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@ -614,14 +614,14 @@ Portuguese, Spanish and Italian.")
(define-public fet
(package
(name "fet")
(version "5.49.0")
(version "5.49.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
"fet-" version ".tar.bz2"))
(sha256
(base32 "011bgr46bfi41hah1gr54va6arvr5zsvkk9zq2gfgavynwfnmny4"))))
(base32 "1aa8xnhwvbhvp7yigcdk7qdwqh59yyfknqbpn3ybgjljc22m8w5n"))))
(build-system gnu-build-system)
(arguments
`(#:phases

6
gnu/packages/electronics.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
@ -220,7 +220,7 @@ format support.")
(define-public sigrok-cli
(package
(name "sigrok-cli")
(version "0.7.1")
(version "0.7.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -228,7 +228,7 @@ format support.")
version ".tar.gz"))
(sha256
(base32
"15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"))))
"1f0a2k8qdcin0pqiqq5ni4khzsnv61l21v1dfdjzayw96qzl9l3i"))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs

5
gnu/packages/elf.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Mark Wielaard <mark@klomp.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -211,6 +212,10 @@ static analysis of the ELF binaries at hand.")
(setenv "CONFIG_SHELL" (which "bash"))
(invoke "./configure"
(string-append "--prefix=" out)
,@(if (string=? "powerpc64le-linux"
(%current-system))
'("--host=powerpc64le-unknown-linux-gnu")
'())
,@(if (string=? "aarch64-linux"
(%current-system))
'("--host=aarch64-unknown-linux-gnu")

6
gnu/packages/elixir.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 nee <nee.git@cock.li>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nikita <nikita@n0.is>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;;
@ -34,7 +34,7 @@
(define-public elixir
(package
(name "elixir")
(version "1.11.3")
(version "1.11.4")
(source
(origin
(method git-fetch)
@ -43,7 +43,7 @@
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ivah4117z75pinvb3gr22d05ihfwcdgw5zvvpv7kbgiqaj8ma8f"))
(base32 "1y8fbhli29agf84ja0fwz6gf22a46738b50nwy26yvcl2n2zl9d8"))
(patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system)
(arguments

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

@ -40,7 +40,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2018, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019, 2020, 2021 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io>
;;; Copyright © 2019, 2020 Brian Leung <bkleung89@gmail.com>
@ -90,10 +90,11 @@
;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com>
;;; Copyright © 2020, 2021 Noah Evans <noah@nevans.me>
;;; Copyright © 2020 Brit Butler <brit@kingcons.io>
;;; Copyright © 2021 Alexandr Vityazev <avityazew@gmail.com>
;;; Copyright © 2021 Alexandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2021 Yurii Kholodkov <urist.mckorobochka@gmail.com>
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
;;; This file is part of GNU Guix.
;;;
@ -389,14 +390,13 @@ when typing parentheses directly or commenting out code line by line.")
(define-public emacs-project
(package
(name "emacs-project")
(version "0.5.3")
(version "0.5.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"project-" version ".el"))
(uri (string-append "https://elpa.gnu.org/packages/project-" version ".tar"))
(sha256
(base32 "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx"))))
(base32 "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-xref" ,emacs-xref)))
(home-page "http://elpa.gnu.org/packages/project.html")
@ -1306,8 +1306,8 @@ provides an optional IDE-like error list.")
(define-public emacs-flymake-shellcheck
;; No tag, version grabbed from source .el file.
(let ((commit "78956f0e5bb9c4d35989657a55929e8e3f5691e6")
(revision "0"))
(let ((commit "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7")
(revision "1"))
(package
(name "emacs-flymake-shellcheck")
(version (git-version "0.1" revision commit))
@ -1319,7 +1319,7 @@ provides an optional IDE-like error list.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix"))))
(base32 "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl"))))
(build-system emacs-build-system)
(home-page "https://github.com/federicotdn/flymake-shellcheck")
(synopsis "Flymake backend for Bash/Sh powered by ShellCheck")
@ -2058,7 +2058,7 @@ is set.")
(define-public emacs-ctrlf
(package
(name "emacs-ctrlf")
(version "1.2")
(version "1.3")
(source
(origin
(method git-fetch)
@ -2067,7 +2067,7 @@ is set.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1f0k3432brc96am6az6xr1nks1vacqzixhdgwfn2xklb8if9a5xi"))))
(base32 "06wq6scqy2ax0h6aahy2r7hn3bbmkzl4w99bkrc3cqd4ij78sc8g"))))
(build-system emacs-build-system)
(home-page "https://github.com/raxod502/ctrlf/")
(synopsis "Single-buffer text search in Emacs")
@ -2210,14 +2210,14 @@ as a library for other Emacs packages.")
(define-public emacs-auctex
(package
(name "emacs-auctex")
(version "13.0.4")
(version "13.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar"))
(sha256
(base32 "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65"))))
(base32 "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319"))))
(build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus).
@ -5313,6 +5313,28 @@ view the build status of those servers' build jobs, and possibly to trigger
build jobs.")
(license license:gpl3+)))
(define-public emacs-tup-mode
(package
(name "emacs-tup-mode")
(version "1.3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ejmr/tup-mode")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y"))))
(build-system emacs-build-system)
(home-page "https://github.com/ejmr/tup-mode")
(synopsis "Major mode for editing ``tupfiles'' used by the Tup build system")
(description
"Tup mode provides syntax highlighting for all of the elements of
tupfiles, such as rule definitions, user-defined variables, macros, flags, bin
variables, and so on. The mode also allows you to execute Tup commands.")
(license license:gpl3+)))
(define-public emacs-company
(package
(name "emacs-company")
@ -6636,6 +6658,32 @@ useful for sending tables, fontified source code, and inline images in
email.")
(license license:gpl3+)))
(define-public emacs-org-msg
;; No git tags. The commit below corresponds to the release of version 3.3.
(let ((commit "89e746c0a864031eef940758230bc7263a6f2289"))
(package
(name "emacs-org-msg")
(version "3.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jeremy-compostella/org-msg")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "15gd5zbxvdallyra9lmpb9i1r2mmwz0j0i0ra7j9imnbfiz3ln9r"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-htmlize" ,emacs-htmlize)))
(home-page "https://github.com/jeremy-compostella/org-msg")
(synopsis "Mix Org mode and Message mode to compose emails")
(description
"OrgMsg is a GNU Emacs global minor mode mixing up Org mode and your
Mail User Agent Mode (Message, mu4e, or Notmuch) to compose and reply to
emails in a Outlook HTML friendly style.")
(license license:gpl3+))))
(define-public emacs-org-superstar
(package
(name "emacs-org-superstar")
@ -7311,7 +7359,7 @@ list of candidates.")
(define-public emacs-marginalia
(package
(name "emacs-marginalia")
(version "0.3")
(version "0.4")
(source
(origin
(method git-fetch)
@ -7320,7 +7368,7 @@ list of candidates.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1qihw1vq9sysrl6ha23ggycp0n2n1dx1ajkaqfm5vmv8480al07i"))))
(base32 "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"))))
(build-system emacs-build-system)
(home-page "https://github.com/minad/marginalia")
(synopsis "Marginalia in the minibuffer completions")
@ -7780,13 +7828,13 @@ hydras with one column per group of heads.")))
(define-public emacs-ivy
(package
(name "emacs-ivy")
(version "0.13.1")
(version "0.13.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar"))
(sha256
(base32 "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx"))))
(base32 "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-hydra" ,emacs-hydra)))
@ -7804,14 +7852,14 @@ expression.")
(define-public emacs-counsel
(package
(name "emacs-counsel")
(version "0.13.1")
(version "0.13.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"counsel-" version ".el"))
"counsel-" version ".tar"))
(sha256
(base32 "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli"))))
(base32 "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-swiper" ,emacs-swiper)))
@ -7837,14 +7885,13 @@ The following completions are currently available:
(define-public emacs-swiper
(package
(name "emacs-swiper")
(version "0.13.1")
(version "0.13.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"swiper-" version ".el"))
(uri (string-append "https://elpa.gnu.org/packages/swiper-" version ".tar"))
(sha256
(base32 "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y"))))
(base32 "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)))
@ -7941,30 +7988,35 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled
@code{yas-minor-mode} first).")
(license license:gpl3+))))
;; The 0.1.6 release is incompatible with newer ivy versions, so we instead
;; pick a more recent snapshot of the repository, see
;; https://github.com/Yevgnen/ivy-rich/pull/80.
(define-public emacs-ivy-rich
(package
(name "emacs-ivy-rich")
(version "0.1.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Yevgnen/ivy-rich")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1ra18v6lgz3m6asm6d5b92zn1x22yiz4cwxd9b54dnvwi11121m7"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)))
(home-page "https://github.com/Yevgnen/ivy-rich")
(synopsis "More friendly interface for @code{ivy}")
(description
"This package extends Ivy by showing more information in the minibuffer
(let ((commit "7b9b7b20c3ead81da90232cd6707dfad3c1f1eb3")
(revision "1"))
(package
(name "emacs-ivy-rich")
(version (git-version "0.1.6" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Yevgnen/ivy-rich")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "03p13z609ighdq4axls93alqfl7pclx12g4vdd7lwpcy0r0cgyf8"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)))
(home-page "https://github.com/Yevgnen/ivy-rich")
(synopsis "More friendly interface for @code{ivy}")
(description
"This package extends Ivy by showing more information in the minibuffer
for each candidate. It adds columns showing buffer modes, file sizes,
docstrings, etc. If @code{emacs-all-the-icons} is installed, it can show
icons as well.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-avy
(package
@ -9027,6 +9079,34 @@ duplicated a lot. Org-mode makes the book keeping of tags and feeds
much easier.")
(license license:gpl3+))))
(define-public emacs-elfeed-score
(package
(name "emacs-elfeed-score")
(version "0.7.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sp1ff/elfeed-score")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-elfeed" ,emacs-elfeed)))
(home-page "https://github.com/sp1ff/elfeed-score")
(synopsis "Gnus-style scoring for Elfeed")
(description
"Elfeed-score is an add-on for Elfeed, an RSS reader for Emacs. It
brings Gnus-style scoring to your RSS feeds. Elfeed, by default, displays
feed entries by date. This package allows you to setup rules for assigning
numeric scores to entries, and sorting entries with higher scores ahead of
those with lower, regardless of date. The idea is to prioritize content
important to you.")
(license license:gpl3+)))
(define-public emacs-el-x
(package
(name "emacs-el-x")
@ -10217,7 +10297,7 @@ Lua programming language}.")
(define-public emacs-ebuild-mode
(package
(name "emacs-ebuild-mode")
(version "1.51")
(version "1.52")
(source
(origin
(method url-fetch)
@ -10226,7 +10306,7 @@ Lua programming language}.")
"ebuild-mode-" version ".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32 "0sfmd6ns2qdmybcynlvc4fqzkbkzmm54rn87wyirdcqnpy0x03i2"))))
(base32 "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h"))))
(build-system emacs-build-system)
(arguments
'(#:phases
@ -12038,14 +12118,14 @@ performance-oriented and tidy.")
(define-public emacs-leaf
(package
(name "emacs-leaf")
(version "4.3.2")
(version "4.4.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"leaf-" version ".tar"))
(sha256
(base32 "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi"))))
(base32 "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1"))))
(build-system emacs-build-system)
(home-page "https://github.com/conao3/leaf.el")
(synopsis "Simplify your init.el configuration, extended use-package")
@ -12290,7 +12370,7 @@ using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.")
(define-public emacs-php-mode
(package
(name "emacs-php-mode")
(version "1.23.0")
(version "1.24.0")
(source
(origin
(method git-fetch)
@ -12299,8 +12379,17 @@ using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c"))))
(base32 "0bs9q62bd7885c39v7x1qz3w1fhpmpdgm72xwsk2yygw0ii425nn"))))
(build-system emacs-build-system)
(arguments
`(#:include (cons "^lisp/" %default-include)
#:phases
(modify-phases %standard-phases
(add-after 'add-source-to-load-path 'add-lisp-dir-to-emacs-load-path
(lambda _
(setenv "EMACSLOADPATH"
(string-append (getcwd) "/lisp:" (getenv "EMACSLOADPATH"))))))))
(propagated-inputs `(("emacs-projectile" ,emacs-projectile)))
(home-page "https://github.com/ejmr/php-mode")
(synopsis "Major mode for editing PHP code")
(description
@ -12384,14 +12473,14 @@ shuangpin, wubi and cangjie.")
(define-public emacs-posframe
(package
(name "emacs-posframe")
(version "0.8.7")
(version "0.8.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"posframe-" version ".tar"))
(sha256
(base32 "0n6r06fz51jwh2k67xdwwbxij7igwfihhmkp6r3a758bck9hhwxi"))))
(base32 "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd"))))
(build-system emacs-build-system)
;; emacs-minimal does not include the function font-info.
(arguments
@ -14120,7 +14209,7 @@ messaging service.")
;; HOME needs to exist for source compilation.
(add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp") #t)))))
(propagated-inputs `(("emacs-slack", emacs-slack)))
(propagated-inputs `(("emacs-slack" ,emacs-slack)))
(home-page "https://github.com/yuya373/helm-slack")
(synopsis "Helm extension for emacs-slack")
(description "This package provides an helm extension for emacs-slack
@ -14166,14 +14255,14 @@ and shell-command prompts that are based on Bash completion.")
(define-public emacs-easy-kill
(package
(name "emacs-easy-kill")
(version "0.9.3")
(version "0.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/easy-kill-"
version ".tar"))
(sha256
(base32
"17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb"))))
"1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x"))))
(build-system emacs-build-system)
(home-page "https://github.com/leoliu/easy-kill")
(synopsis "Kill and mark things easily in Emacs")
@ -14547,6 +14636,32 @@ navigation with the grails mode.")
from @code{groovy-mode} for editing Jenkins declarative pipeline files.")
(license license:gpl3+))))
(define-public emacs-kotlin-mode
(let ((commit "0e4bafb31d1fc2a0a420a521c2723d5526646c0b")
(revision "1"))
(package
(name "emacs-kotlin-mode")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "09inpgwmnnqaakyn4r4xs8kax8b89dw94kvl521x6d43h9zl5i70"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("ert-runner" "-L" "." "-L" "test")))
(native-inputs `(("emacs-ert-runner" ,emacs-ert-runner)))
(home-page "https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode")
(synopsis "Major major-mode for editing Kotlin files")
(description
"This package provides a @code{kotlin-mode} for editing Kotlin files.")
(license license:gpl3+))))
(define-public emacs-org-tree-slide
(let ((commit "036a36eec1cf712d3db155572aed325daa372eb5")
(revision "2"))
@ -15009,39 +15124,71 @@ close, copy, cut, paste, undo, redo.")
(license license:gpl3+))))
(define-public emacs-password-store
(package
(name "emacs-password-store")
(version "1.7.3")
(source (origin
(method url-fetch)
(uri
(string-append "https://git.zx2c4.com/password-store/snapshot/"
"password-store-" version ".tar.xz"))
(sha256
(base32
"1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'extract-el-file
(lambda _
(copy-file "contrib/emacs/password-store.el" "password-store.el")
(delete-file-recursively "contrib")
(delete-file-recursively "man")
(delete-file-recursively "src")
(delete-file-recursively "tests"))))))
(propagated-inputs
`(("emacs-f" ,emacs-f)
("emacs-s" ,emacs-s)
("emacs-with-editor" ,emacs-with-editor)
("password-store" ,password-store)))
(home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs")
(synopsis "Password store (pass) support for Emacs")
(description
"This package provides functions for working with pass (\"the
(let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4")
(revision "1"))
(package
(name "emacs-password-store")
;; The emacs package version does not match the password-store version,
;; even though it is part of the same repository. When updating, look
;; at the version declared in password-store.el.
(version (git-version "2.1.4" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://git.zx2c4.com/password-store")
(commit commit)))
(sha256
(base32
"0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'extract-el-file
(lambda _
(copy-file "contrib/emacs/password-store.el" "password-store.el")
(delete-file-recursively "contrib")
(delete-file-recursively "man")
(delete-file-recursively "src")
(delete-file-recursively "tests"))))))
(propagated-inputs
`(("emacs-auth-source-pass" ,emacs-auth-source-pass)
("emacs-s" ,emacs-s)
("emacs-with-editor" ,emacs-with-editor)
("password-store" ,password-store)))
(home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs")
(synopsis "Password store (pass) support for Emacs")
(description
"This package provides functions for working with pass (\"the
standard Unix password manager\").")
(license license:gpl2+)))
(license license:gpl2+))))
(define-public emacs-password-store-otp
(package
(name "emacs-password-store-otp")
(version "0.1.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/volrath/password-store-otp.el")
(commit version)))
(sha256
(base32 "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-password-store" ,emacs-password-store)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/volrath/password-store-otp.el")
(synopsis
"Interact with the @code{pass-otp} extension for @code{pass} from Emacs")
(description "This package provides Emacs functions to interact with the
@code{pass-otp} extension for @code{pass}. It includes functions to import
OTP URIs from screenshots of QR codes, and to export them back to QR codes if
needed.")
(license license:gpl3+)))
(define-public emacs-auth-source-pass
(let ((commit "847a1f54ed48856b4dfaaa184583ef2c84173edf")
@ -19391,6 +19538,8 @@ image, rotate it, save modified images, and more.")
(sha256
(base32
"1zifiqmpj9j14fnrm3jxapady25m1nlm514nfry0jfrhhikvj6i8"))))
(arguments
'(#:include (cons "^data/" %default-include)))
(build-system emacs-build-system)
(home-page "https://github.com/purcell/package-lint")
(synopsis "Linting library for elisp package authors")
@ -23892,6 +24041,52 @@ convert the resulting @code{.epub} to a @code{.mobi} file. Needs a working
zip utility (default is @code{zip}).")
(license license:gpl3+)))
(define-public emacs-ox-gemini
;; No releases yet
(let ((commit "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0")
(revision "0"))
(package
(name "emacs-ox-gemini")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~abrahms/ox-gemini")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29"))))
(build-system emacs-build-system)
(home-page "https://sr.ht/~abrahms/ox-gemini")
(synopsis "Export Org files in Gemini format")
(description
"@code{ox-gemini} adds support for exporting Org files in Gemini
format. Many things were taken from the ASCII exporter, from which
@code{ox-gemini} derives.")
(license license:gpl3+))))
(define-public emacs-ox-haunt
(package
(name "emacs-ox-haunt")
(version "0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~jakob/ox-haunt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25"))))
(build-system emacs-build-system)
(home-page "https://git.sr.ht/~jakob/ox-haunt")
(synopsis "Export Org files to HTML appropriate for Haunt")
(description
"This library implements an HTML back-end for the Org generic exporter,
producing output appropriate for Haunt's @code{html-reader}.")
(license license:gpl3+)))
(define-public emacs-ox-hugo
(package
(name "emacs-ox-hugo")
@ -24350,7 +24545,7 @@ Emacs that integrate with major modes like Org-mode.")
(define-public emacs-modus-themes
(package
(name "emacs-modus-themes")
(version "1.1.1")
(version "1.2.3")
(source
(origin
(method git-fetch)
@ -24359,7 +24554,7 @@ Emacs that integrate with major modes like Org-mode.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m"))))
(base32 "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk"))))
(build-system emacs-build-system)
(home-page "https://protesilaos.com/modus-themes/")
(synopsis "Accessible themes (WCAG AAA)")
@ -26923,15 +27118,15 @@ s-expression.")
(define-public emacs-map
(package
(name "emacs-map")
(version "2.1")
(version "3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/map-"
version ".el"))
version ".tar"))
(sha256
(base32
"0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0"))))
"00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/map.html")
(synopsis "Map manipulation functions")
@ -27084,3 +27279,49 @@ and prefered services can easily be configured.")
"This package provides an Elisp wrapper around the Java
@command{keytool} command and major mode for viewing Java keystores.")
(license license:expat))))
(define-public emacs-ivy-avy
(package
(name "emacs-ivy-avy")
(version "0.13.4")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/"
"ivy-avy-" version ".tar"))
(sha256
(base32 "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)
("emacs-avy" ,emacs-avy)))
(home-page "https://github.com/abo-abo/swiper")
(synopsis "Avy integration for Ivy")
(description
"This package adds a \"C-'\" binding to Ivy minibuffer that uses Avy.")
(license license:gpl3+)))
(define-public emacs-ivy-hydra
(package
(name "emacs-ivy-hydra")
(version "0.13.5")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/"
"ivy-hydra-" version ".tar"))
(sha256
(base32 "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)
("emacs-hydra" ,emacs-hydra)))
(home-page "https://github.com/abo-abo/swiper")
(synopsis "Additional key bindings for Ivy")
(description
"This package provides the `hydra-ivy/body' command, which is a
quasi-prefix map, with many useful bindings. These bindings are
shorter than usual, using mostly unprefixed keys.")
(license license:gpl3+)))

4
gnu/packages/embedded.scm
View File

@ -1469,7 +1469,7 @@ and Zilog Z80 families, plus many of their variants.")
(define-public sdcc
(package
(name "sdcc")
(version "4.0.0")
(version "4.1.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -1477,7 +1477,7 @@ and Zilog Z80 families, plus many of their variants.")
"/" version "/sdcc-src-" version ".tar.bz2"))
(sha256
(base32
"042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8"))
"0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1"))
(modules '((guix build utils)))
(snippet
'(begin

54
gnu/packages/emulators.scm
View File

@ -285,7 +285,7 @@ older games.")
(define-public qtmips
(package
(name "qtmips")
(version "0.7.3")
(version "0.7.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -294,7 +294,7 @@ older games.")
(file-name (git-file-name name version))
(sha256
(base32
"1khvwgqz4h6q6mhbbq0yx43ajz8gx9wmwzs8784vmfrglndbxgax"))))
"1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp"))))
(build-system cmake-build-system)
(arguments
'(#:phases
@ -2083,7 +2083,7 @@ framework based on QEMU.")
(define-public ppsspp
(package
(name "ppsspp")
(version "1.10.3")
(version "1.11.3")
(source
(origin
(method git-fetch)
@ -2091,7 +2091,7 @@ framework based on QEMU.")
(url "https://github.com/hrydgard/ppsspp")
(commit (string-append "v" version))))
(sha256
(base32 "0znxlbj6cfw7gn0naay0mzhc0k5saw8nrwpspcn7gap1023p06w2"))
(base32 "1dpxnwvl6jq7z67lbjws4lqc1bxc31xi6ddlmg5n3aig008yi2fp"))
(file-name (git-file-name name version))
(patches
(search-patches "ppsspp-disable-upgrade-and-gold.patch"))
@ -2102,16 +2102,16 @@ framework based on QEMU.")
;; There are still a number of external sources, that we don't
;; remove here. Some may be packaged, others are not.
;; First, we patch existing sources to include the right headers.
(substitute* (append (list "ext/native/thin3d/vulkan_utils.cpp"
"ext/native/thin3d/thin3d_vulkan.cpp")
(find-files "Common" ".*\\.(h|cpp)")
(substitute* (append (find-files "Common" ".*\\.(h|cpp)")
(find-files "Core" ".*\\.(h|cpp)")
(find-files "GPU" ".*\\.(h|cpp)")
(find-files "SDL" ".*\\.(h|cpp)")
(find-files "UI" ".*\\.(h|cpp)"))
;; These headers are all hard-coded in the original source.
(("ext/cityhash/") "")
(("ext/glslang/") "")
(("ext/glslang/glslang/") "glslang/")
(("ext/glslang/") "glslang/")
(("ext/miniupnp/") "")
(("ext/SPIRV-Cross/") "spirv_cross/")
(("ext/vulkan/") "vulkan/")
(("ext/xxhash.h") "xxhash.h")
@ -2134,7 +2134,12 @@ framework based on QEMU.")
;; Don't search for cityhash/xxhash, we already have them.
(("add_library\\((city|xx)hash STATIC") "if()\nendif(")
(("ext/xxhash\\.[ch]") "")
(("ext/native/ext/cityhash/.*\\.(cpp|h)") "")
(("ext/cityhash/.*\\.(cpp|h)") "")
(("if\\(USE_MINIUPNPC\\)" all)
(string-append all "
find_package(miniupnpc)
target_link_libraries(${CoreLibName} miniupnpc ${LDLIBS})
elseif(FALSE)"))
;; Link all of spirv-cross.
(("spirv-cross-glsl" all)
(string-append all
@ -2147,12 +2152,12 @@ framework based on QEMU.")
(("add_subdirectory\\(SPIRV-Cross-build\\)") ""))
;; Finally, we can delete the bundled sources.
(for-each delete-file-recursively
'("ext/cmake"
'("MoltenVK"
"ext/cmake"
"ext/glew"
"ext/glslang" "ext/glslang-build"
"ext/native/ext/cityhash"
"ext/native/ext/libpng17"
"ext/native/ext/libzip"
"ext/miniupnp" "ext/miniupnp-build"
"ext/native"
"ext/snappy"
"ext/SPIRV-Cross" "ext/SPIRV-Cross-build"
"ext/vulkan"
@ -2175,6 +2180,7 @@ framework based on QEMU.")
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)
("miniupnpc" ,miniupnpc)
("sdl2" ,sdl2)
("snappy" ,snappy)
("spirv-cross" ,spirv-cross)
@ -2185,24 +2191,24 @@ framework based on QEMU.")
;; TODO: unbundle armips.
("armips-source" ,(package-source armips))
("lang"
,(let ((commit "1c64b8fbd3cb6bd87935eb53f302f7de6f86e209"))
,(let ((commit "6bd5b4bc983917ea8402f73c726b46e36f3de0b4"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/ppsspp-lang")
(commit commit)))
(sha256
(base32 "0rprn3yd8xfrvi0fm62sgpqa8n73jk7zmlscp8cp0h2fawqpiamd"))
(base32 "08npr3a4xskf85gnlxidl4ksc3rhc7m5rgnj7vsbjvhvw5ap02qx"))
(file-name (git-file-name "ppsspp-lang" commit)))))
("tests"
,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7"))
,(let ((commit "1047400eaec6bcbdb2a64d326375ef6a6617c4ac"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/pspautotests")
(commit commit)))
(sha256
(base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm"))
(base32 "0nxv1lskcr8zbg6nrfai21mxsw0n5vaqhbsa41c3cxfyx5c4w2pg"))
(file-name (git-file-name "pspautotests" commit)))))))
(arguments
`(#:out-of-source? #f
@ -2225,13 +2231,23 @@ framework based on QEMU.")
(copy-recursively (assoc-ref inputs "lang")
"assets/lang")
#t))
(add-after 'unpack 'fix-unittest-build
(lambda _
(substitute* "CMakeLists.txt"
(("unittest/TestVertexJit.cpp" all)
(string-append all " unittest/TestShaderGenerators.cpp")))
(substitute* "unittest/TestVertexJit.cpp"
(("#include \"unittest/UnitTest.h\"" all)
(string-append all "\n#include <cmath>")))
#t))
(replace 'check
(lambda _
(for-each
(lambda (t) (invoke "./unitTest" t))
'("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin"
"SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit"
"MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap"))
"SinCos" #|"VFPUSinCos" SIGSEGV|# "MathUtil" "Parsers" "Jit"
"MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ"
#|"ShaderGenerators"|#))
(invoke "python3" "test.py" "-g")
#t))
(replace 'install

89
gnu/packages/engineering.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Gerd Heber <gerd.heber@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -127,7 +128,7 @@
(define-public librecad
(package
(name "librecad")
(version "2.1.3")
(version "2.2.0-rc2")
(source (origin
(method url-fetch)
(uri (string-append
@ -136,7 +137,7 @@
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"01nvc1g3si05r5np1pzn62ah9w84p8nxa32wqrjh6gdi17jfvi3l"))))
"0a7fzhxkkn2s3hkgqrw3s3wyspzfla3c5lgbsjyqzvlnrp3anxnm"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -2458,7 +2459,7 @@ engineers for reverse engineers.")
(define-public lib3mf
(package
(name "lib3mf")
(version "1.8.1")
(version "2.1.1")
(source
(origin
(method git-fetch)
@ -2467,20 +2468,21 @@ engineers for reverse engineers.")
(file-name (git-file-name name version))
(sha256
(base32
"11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"))))
"1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"))))
(build-system cmake-build-system)
(native-inputs
`(("googletest-source" ,(package-source googletest))))
(inputs
`(("libuuid" ,util-linux "lib")))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-googletest
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "googletest-source")
"UnitTests/googletest")
#t)))))
`(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0"
"-DUSE_INCLUDED_LIBZIP=0"
"-DUSE_INCLUDED_GTEST=0"
"-DUSE_INCLUDED_SSL=0")))
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)))
(inputs
`(("libuuid" ,util-linux "lib")
("libzip" ,libzip)
("libressl" ,libressl)
("zlib" ,zlib)))
(synopsis "Implementation of the 3D Manufacturing Format (3MF) file standard")
(description
"Lib3MF is a C++ implementation of the 3D Manufacturing Format (3MF) file
@ -2553,7 +2555,18 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
"echotest_allexpressions"
"lazyunion-*"
"pdfexporttest_centered"
"pdfexporttest_simple-pdf")
"pdfexporttest_simple-pdf"
;; Broken due since cgal@5.2 +
;; https://github.com/CGAL/cgal/pull/5371 (security)
;; FIXME: Investigate or wait for future releases to
;; fix it.
;; Unsure if wrong test-suite or wrong security
;; patch.
"cgalpngtest_nef3_broken"
"opencsgtest_nef3_broken"
"csgpngtest_nef3_broken"
"throwntogethertest_nef3_broken")
"|")))
;; strip python test files since lib dir ends up in out/share
(for-each delete-file
@ -2949,18 +2962,14 @@ GUI.")
(define-public poke
(package
(name "poke")
(version "1.0")
(version "1.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/poke/poke-" version
".tar.gz"))
(sha256
(base32
"02jvla69xd0nnlg2bil2vxxxglqgylswml6h5hy2nxy0023hp4yy"))))
;; XXX: Version 1.0 only supports 64-bit systems.
(supported-systems '("x86_64-linux" "aarch64-linux"))
"1mkaq19a8d951n9l6d3f8rwq45a7gkr05snb285idd21qxixys6d"))))
(build-system gnu-build-system)
;; The GUI, which we elide, requires tcl and tk.
(native-inputs `(("bison" ,bison)
@ -3024,3 +3033,39 @@ and drilling of PCBs. It takes Gerber files as input and outputs G-code files
for the milling of PCBs. It also includes an autoleveller for the automatic
dynamic calibration of the milling depth.")
(license license:gpl3+)))
(define-public syscall-intercept
;; Upstream provides no tag. Also, last version update is 4 years old.
(let ((commit "304404581c57d43478438d175099d20260bae74e")
(revision "0"))
(package
(name "syscall-intercept")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/pmem/syscall_intercept/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "17sw78xp5wjzv25adpbq3khl8fi0avj7bgpi57q3jnvl3c68xy5z"))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
`(("capstone" ,capstone)))
(build-system cmake-build-system)
(arguments
`(#:build-type "Release"
;; FIXME: "syscall_format_logging" test fails.
#:tests? #f))
(home-page "https://github.com/pmem/syscall_intercept")
(synopsis "System call intercepting library")
(description
"The system call intercepting library provides a low-level interface
for hooking Linux system calls in user space. This is achieved by
hot-patching the machine code of the standard C library in the memory of
a process.")
(license license:bsd-2))))

4
gnu/packages/enlightenment.scm
View File

@ -567,14 +567,14 @@ directories.
(define-public evisum
(package
(name "evisum")
(version "0.5.8")
(version "0.5.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.enlightenment.org/rel/apps/"
"evisum/evisum-" version ".tar.xz"))
(sha256
(base32 "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"))))
(base32 "0cbfg393nlf0k91a2hdlyakns3dpzvs3isd95dm3zizydyf9h8wc"))))
(build-system meson-build-system)
(arguments
'(#:tests? #f)) ; no tests

37
gnu/packages/esolangs.scm
View File

@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;;
@ -22,6 +24,8 @@
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
@ -56,6 +60,39 @@ written in C. It supports several @dfn{fingerprints} (opt-in language extension
identified by unique ID codes).")
(license license:gpl3)))
(define-public lolcode-lci
(package
(name "lolcode-lci")
(version "0.11.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/justinmeza/lci")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0syw60b93iajgh91ffchirwwhm2kix2753ibx845kyrhzggmdh2l"))))
(build-system cmake-build-system)
(inputs
`(("readline" ,readline)))
(native-inputs
`(("python-2" ,python-2))) ; for the tests
(synopsis "LOLCODE interpreter written in C")
(description
"@code{lci} is a LOLCODE interpreter written in C and is designed to be
correct, portable, fast, and precisely documented.
@enumerate
@item correct: Every effort has been made to test lci's conformance to the
LOLCODE language specification. Unit tests come packaged with the lci source code.
@item portable: lci follows the widely ported ANSI C specification allowing it
to compile on a broad range of systems.
@item fast: Much effort has gone into producing simple and efficient code
whenever possible to the extent that the above points are not compromized.
@end enumerate")
(home-page "http://lolcode.org/")
(license license:gpl3+)))
(define-public shakespeare-spl
(package
(name "shakespeare-spl")

17
gnu/packages/fcitx5.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,7 +52,7 @@
(define-public xcb-imdkit
(package
(name "xcb-imdkit")
(version "1.0.2")
(version "1.0.3")
(source
(origin
(method url-fetch)
@ -59,7 +60,7 @@
"https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-"
version ".tar.xz"))
(sha256
(base32 "16f7jdnrr8lrll7qvnj0gh3gwzgn5idfsc9rwi1gp1n2mnjrs7w0"))
(base32 "1s58vjkdrgr8h183jz4b4mjn7pbvdc9cli01cn66mgczl9p65hh9"))
(modules '((guix build utils)))
(snippet
'(begin
@ -86,7 +87,7 @@ client.")
(define-public fcitx5
(package
(name "fcitx5")
(version "5.0.4")
(version "5.0.5")
(source
(origin
(method url-fetch)
@ -94,7 +95,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz"))
(sha256
(base32 "14pqbjbdc3b5xlycm92gs1rgkmpykfnyls3gfr608902lk2lw5as"))))
(base32 "16j716xawbszkb3fxzpdza1a4czh0fvkysikjc9bfyvbwp72p6an"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -171,14 +172,14 @@ client.")
(define-public libime
(package
(name "libime")
(version "1.0.3")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.xz"))
(sha256
(base32 "1gi9ylqha9x3dhjsa2i7x9wh2g9vgqkkfr6s1facs2ky65vgvdrv"))))
(base32 "1w3cxk11kbfmz7snivxq948zfav6dy2245j12ghlxcmdxjshrlhq"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
@ -249,7 +250,7 @@ for GTK+2/GTK+3 application.")
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
(version "5.0.2")
(version "5.0.5")
(source
(origin
(method url-fetch)
@ -257,7 +258,7 @@ for GTK+2/GTK+3 application.")
"/fcitx5-qt/fcitx5-qt-"
version ".tar.xz"))
(sha256
(base32 "15rn111mrp6lcgm0ka3vb6a6qwkv6kqkqn563wsm49n16iy1dhqj"))))
(base32 "0vsvrfv0b21pfrz5n0v6p458vfr8k7km50h9bhjp1bnssampjfsb"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags

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

@ -7,6 +7,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
;;; This file is part of GNU Guix.
;;;
@ -151,14 +152,14 @@ large and/or frequently changing (network) environment.")
(define-public bindfs
(package
(name "bindfs")
(version "1.14.8")
(version "1.15.1")
(source (origin
(method url-fetch)
(uri (string-append "https://bindfs.org/downloads/bindfs-"
version ".tar.gz"))
(sha256
(base32
"15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"))))
"1av8dj9i1g0105fs5r9srqqsp7yahlhwc0yl8i1szyfdls23bp84"))))
(build-system gnu-build-system)
(arguments
;; XXX: The tests have no hope of passing until there is a "nogroup"
@ -264,7 +265,7 @@ always possible.")
(define-public fsarchiver
(package
(name "fsarchiver")
(version "0.8.5")
(version "0.8.6")
(source
(origin
(method git-fetch)
@ -274,7 +275,7 @@ always possible.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp"))))
(base32 "1ry2sdkfbg4bwcldk42g1i3wa3z4pr9yh9dil6ilhwcvhqiw41zc"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -849,7 +850,7 @@ APFS.")
(define-public zfs
(package
(name "zfs")
(version "2.0.3")
(version "2.0.4")
(outputs '("out" "module" "src"))
(source
(origin
@ -858,7 +859,7 @@ APFS.")
"/download/zfs-" version
"/zfs-" version ".tar.gz"))
(sha256
(base32 "0fg5hz1yy2z5ah0hzjv3xy5vcg1c214rps90dr80lfkalx5gd506"))))
(base32 "0v2zshimz5miyj8mbskb52pnzyl1s4rhpr6208zq549v8g2l84vx"))))
(build-system linux-module-build-system)
(arguments
`(;; The ZFS kernel module should not be downloaded since the license
@ -968,9 +969,9 @@ APFS.")
("util-linux:lib" ,util-linux "lib")
("zlib" ,zlib)))
(home-page "https://zfsonlinux.org/")
(synopsis "Native ZFS on Linux")
(synopsis "OpenZFS on Linux")
(description
"ZFS on Linux is an advanced file system and volume manager which was
"OpenZFS is an advanced file system and volume manager which was
originally developed for Solaris and is now maintained by the OpenZFS
community.")
(license license:cddl1.0)))
@ -978,7 +979,7 @@ community.")
(define-public mergerfs
(package
(name "mergerfs")
(version "2.31.0")
(version "2.32.4")
(source
(origin
(method url-fetch)
@ -986,7 +987,7 @@ community.")
version "/mergerfs-" version ".tar.gz"))
(sha256
(base32
"0k4asbg5n9dhy5jpjkw6simqqnr1zira2y4i71cq05091dfwm90p"))))
"0yz7nljx6axcj6hb09sgc0waspgfhp535228rjqvqgyd8y74jc3s"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests exist.
@ -1174,7 +1175,16 @@ local file system using FUSE.")
(build-system go-build-system)
(arguments
`(#:import-path "github.com/oniony/TMSU"
#:unpack-path ".."))
#:unpack-path ".."
#:install-source? #f
#:phases
(modify-phases %standard-phases
(add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; The go build system produces /bin/TMSU -> install as /bin/tmsu
(rename-file (string-append out "/bin/TMSU")
(string-append out "/bin/tmsu"))))))))
(inputs
`(("go-github-com-mattn-go-sqlite3" ,go-github-com-mattn-go-sqlite3)
("go-github-com-hanwen-fuse" ,go-github-com-hanwen-fuse)))

34
gnu/packages/finance.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2020 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>
;;;
;;; This file is part of GNU Guix.
;;;
@ -52,6 +53,7 @@
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system go)
#:use-module (guix build-system qt)
#:use-module (guix deprecation)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages aidc)
@ -108,10 +110,10 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages gnuzilla))
(define-public bitcoin-core
(define-public bitcoin-core-0.21
(package
(name "bitcoin-core")
(version "0.20.1")
(version "0.21.0")
(source (origin
(method url-fetch)
(uri
@ -119,7 +121,7 @@
version "/bitcoin-" version ".tar.gz"))
(sha256
(base32
"0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab"))))
"0dszcn4r43w0ffsmgwmyzkzr5lqws3bbhlkssmjgnjgfc8n2148s"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -186,6 +188,24 @@ of the bitcoin protocol. This package provides the Bitcoin Core command
line client and a client based on Qt.")
(license license:expat)))
(define-public bitcoin-core-0.20
(package
(inherit bitcoin-core-0.21)
(version "0.20.1")
(source (origin
(method url-fetch)
(uri
(string-append "https://bitcoincore.org/bin/bitcoin-core-"
version "/bitcoin-" version ".tar.gz"))
(sha256
(base32
"0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab"))))))
;; The support lifetimes for bitcoin-core versions can be found in
;; <https://bitcoincore.org/en/lifecycle/#schedule>.
(define-public bitcoin-core bitcoin-core-0.21)
(define-public hledger
(package
(name "hledger")
@ -559,7 +579,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(define-public electron-cash
(package
(name "electron-cash")
(version "4.2.3")
(version "4.2.4")
(source
(origin
(method git-fetch)
@ -568,7 +588,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1q18p86a3a3wpf9nbpymhyilmaw9vffvwxh4hhx29bywfzvav11f"))))
(base32 "1a4jqsfadv6xr7ydj79my71jyrp0sjlznsbxdxjsjgnsqk8r48w6"))))
(build-system python-build-system)
(inputs
`(("libevent" ,libevent)
@ -1109,13 +1129,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ")
(define-public python-duniterpy
(package
(name "python-duniterpy")
(version "0.61.0")
(version "0.62.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "duniterpy" version))
(sha256
(base32 "1dr5zx7hi1ps36p1zw2n66lmikp2frwi3sp4rf2zyd216dl3r1jp"))))
(base32 "1ldiw5j2g92cib9v06kgv4z8dw2zi0x1dmpisf8w78h4kg6712w1"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required

35
gnu/packages/fonts.scm
View File

@ -82,7 +82,7 @@
(define-public font-ibm-plex
(package
(name "font-ibm-plex")
(version "4.0.2")
(version "5.1.3")
(source (origin
(method url-fetch)
(uri (string-append
@ -90,7 +90,7 @@
"v" version "/OpenType.zip"))
(sha256
(base32
"17bd84ic7z9hkcjy4bwnh4z51bnkh2vrjzwvs9g6lwzmxjswa5b6"))))
"0zlz8kxx54i4hpgaip9690bilvn5w14gp7jjkk6cz4h9p3xml231"))))
(build-system font-build-system)
(home-page "https://github.com/IBM/plex")
(synopsis "IBM Plex typeface")
@ -221,7 +221,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
(define-public font-cantarell
(package
(name "font-abattis-cantarell")
(version "0.201")
(version "0.301")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/cantarell-fonts/"
@ -229,7 +229,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
"/cantarell-fonts-" version ".tar.xz"))
(sha256
(base32
"0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn"))))
"10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x"))))
(build-system meson-build-system)
(native-inputs
`(("gettext" ,gettext-minimal))) ; for msgfmt
@ -334,14 +334,15 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over
(define-public font-liberation
(package
(name "font-liberation")
(version "2.1.2")
(version "2.1.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/liberationfonts/liberation-fonts/"
"files/5722233/liberation-fonts-ttf-" version ".tar.gz"))
(uri (string-append
"https://github.com/liberationfonts/liberation-fonts/"
"files/6060976/liberation-fonts-ttf-" version ".tar.gz"))
(sha256
(base32 "1q7qx9bpn1gqjh1zbb8n9fkzwz8skn41hyy61186g4c3y8q4js8l"))))
(base32 "0bv8i47iq2irxkkjlqwdli4zz01sb1qg2n6vbdqjrqqhx912zji2"))))
(build-system font-build-system)
(home-page "https://github.com/liberationfonts")
(synopsis "Fonts compatible with Arial, Times New Roman, and Courier New")
@ -357,9 +358,7 @@ Bitstream Vera Sans);
Bitstream Vera Serif);
@item Mono (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L,
and Bitstream Vera Sans Mono).
@end enumerate
The Liberation Fonts are sponsored by Red Hat.")
@end enumerate\n")
(license license:silofl1.1)))
(define-public font-linuxlibertine
@ -409,7 +408,7 @@ Biolinum is available in both Regular and Bold weights.")
(define-public font-libertinus
(package
(name "font-libertinus")
(version "6.12")
(version "7.040")
(source
(origin
(method url-fetch)
@ -417,7 +416,7 @@ Biolinum is available in both Regular and Bold weights.")
"/download/v" version "/libertinus-" version
".zip"))
(sha256
(base32 "06pcsd5pijjid7xjxak35jla089krm5hqnbglv8ldncq475q7kb2"))))
(base32 "1xkj993hwkr49q63dd2dnkvdkm9sckxm3zjwhdxsxn21fi80ikic"))))
(build-system font-build-system)
(home-page "https://github.com/alerque/libertinus")
(synopsis "Font family based on Linux Libertine")
@ -1756,7 +1755,7 @@ files (TTF).")
(define-public font-mononoki
(package
(name "font-mononoki")
(version "1.2")
(version "1.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1764,9 +1763,15 @@ files (TTF).")
(commit version)))
(sha256
(base32
"1rkzyxn30rn8qv2h2xz324j7q15hzg2lci8790a7cdl1dfgic4xi"))
"07gh84iw84g8fha3gx4yjyl1rsksqhy2kk38f01m048sgjp6ww5j"))
(file-name (git-file-name name version))))
(build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-files-writable
(lambda _
(for-each make-file-writable (find-files ".")))))))
(synopsis "Font for programming and code review")
(description
"Mononoki is a typeface by Matthias Tellen, created to enhance code

4
gnu/packages/fpga.scm
View File

@ -502,7 +502,7 @@ using different abstraction levels.")
(define-public verilator
(package
(name "verilator")
(version "4.108")
(version "4.110")
(source
(origin
(method git-fetch)
@ -511,7 +511,7 @@ using different abstraction levels.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0kcs0p8i2hiw348xqqh49pmllqspbzh2ljwmia03b42md5h4x5vf"))))
(base32 "1lm2nyn7wzxj5y0ffwazhb4ygnmqf4d61sl937vmnmrpvdihsrrq"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)

100
gnu/packages/freedesktop.scm
View File

@ -58,8 +58,10 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages databases)
#:use-module (gnu packages disk)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
@ -75,6 +77,7 @@
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages language)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb)
@ -101,6 +104,101 @@
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
(define-public appstream
(package
(name "appstream")
(version "0.13.1")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.freedesktop.org/software/"
"appstream/releases/"
"AppStream-" version ".tar.xz"))
(sha256
(base32 "09l6ixz1w29pi0nb0flz14m4r3f2hpqpp1fq8y66v9xa4c9fczds"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-libstemmer
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "meson.build"
(("/usr/include")
(string-append (assoc-ref inputs "libstemmer")
"/include")))
#t))
(add-after 'patch-libstemmer 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "docs/api"
(substitute* "appstream-docs.xml"
(("http://www.oasis-open.org/docbook/xml/4.3/")
(string-append (assoc-ref inputs "docbook-xml-4.3")
"/xml/dtd/docbook/"))))
(for-each (lambda (file)
(substitute* file
(("http://www.oasis-open.org/docbook/xml/4.5/")
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/"))))
(find-files "scripts/desc" "\\.xml$"))
#t))
(add-after 'patch-docbook-xml 'disable-failing-tests
(lambda _
(substitute* "tests/test-pool.c"
(("[ \t]*g_test_add_func \\(\"/AppStream/PoolRead?.*;")
"")
(("[ \t]*g_test_add_func \\(\"/AppStream/PoolReadAsync?.*;")
"")
(("[ \t]*g_test_add_func \\(\"/AppStream/PoolEmpty?.*;")
"")
(("[ \t]*g_test_add_func \\(\"/AppStream/Cache?.*;")
"")
(("[ \t]*g_test_add_func \\(\"/AppStream/Merges?.*;")
""))
#t))
(add-after 'disable-failing-tests 'patch-install-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "data/meson.build"
(("/etc")
(string-append (assoc-ref outputs "out")
"/etc")))
#t)))))
(native-inputs
`(("cmake" ,cmake)
("docbook-xml-4.3" ,docbook-xml-4.3)
("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("gperf" ,gperf)
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("xsltproc" ,libxslt)))
(inputs
`(("libsoup" ,libsoup)
("libstemmer" ,libstemmer)
("libxml2" ,libxml2)
("libyaml" ,libyaml)
("lmdb" ,lmdb)))
(propagated-inputs
`(("glib" ,glib)))
(synopsis "Tools and libraries to work with AppStream metadata")
(description "AppStream is a cross-distribution effort for enhancing the way
we interact with the software repositories provided by distributions by
standardizing software component metadata. It provides the foundation to build
software-center applications, by providing metadata necessary for an
application-centric view on package repositories. It additionally provides
specifications for things like an unified software metadata database, screenshot
services and various other things needed to create user-friendly
application-centers for distributions.")
(home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/")
;; XXX: meson.build claims both, headers just indicate lgpl2.1+
;; there are also some (irrelevant) wtfpl2 examples
(license (list license:gpl2+ license:lgpl2.1+))))
(define-public farstream
(package
(name "farstream")
@ -410,7 +508,7 @@ other applications that need to directly deal with input devices.")
(license license:x11)))
(define-public libinput-minimal
(package (inherit libinput)
(package/inherit libinput
(name "libinput-minimal")
(inputs
(fold alist-delete (package-inputs libinput)

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

@ -529,7 +529,7 @@ clone.")
all)))
#t))))))
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)
@ -638,7 +638,7 @@ sounds from presets such as \"explosion\" or \"powerup\".")
(define-public surgescript
(package
(name "surgescript")
(version "0.5.4.4")
(version "0.5.5")
(source
(origin
(method git-fetch)
@ -647,12 +647,13 @@ sounds from presets such as \"explosion\" or \"powerup\".")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1vck1wk6r6jrrw5xzpqldplz601dfgpk5s5p45fam00nfsid0p7p"))))
(base32 "0xwd4g7n0b0rxkpbyshkzyl472h1y606ghyvf8gv034n3jz2g4jk"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
(let ((share (string-append (assoc-ref %outputs "out") "/share")))
(list (string-append "-DICON_PATH=" share "/pixmaps")
(list "-DWANT_STATIC=NO"
(string-append "-DICON_PATH=" share "/pixmaps")
(string-append "-DMETAINFO_PATH=" share "/metainfo")))
#:tests? #f))
(home-page "https://docs.opensurge2d.org")
@ -2393,7 +2394,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.")
(define-public dhewm3
(package
(name "dhewm3")
(version "1.5.0")
(version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -2401,7 +2402,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.")
version "/dhewm3-" version "-src.tar.xz"))
(sha256
(base32
"0dmd1876az5q8gbjrd1jk8zidz11ydj607z3m8m5kvw2yj136jzv"))))
"0s2brx6wyljhjbpli97iy4lc4fqqsvdc09raz8njg0vgzcsiyrri"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No tests.

42
gnu/packages/games.scm
View File

@ -3464,7 +3464,7 @@ match, cannon keep, and grave-itation pit.")
(define-public minetest
(package
(name "minetest")
(version "5.3.0")
(version "5.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3473,7 +3473,7 @@ match, cannon keep, and grave-itation pit.")
(file-name (git-file-name name version))
(sha256
(base32
"03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"))
"1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j9"))
(modules '((guix build utils)))
(snippet
'(begin
@ -3482,7 +3482,7 @@ match, cannon keep, and grave-itation pit.")
#t))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
`(#:configure-flags
(list "-DRUN_IN_PLACE=0"
"-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1"
@ -3493,7 +3493,27 @@ match, cannon keep, and grave-itation pit.")
(string-append "-DCURL_INCLUDE_DIR="
(assoc-ref %build-inputs "curl")
"/include/curl"))
#:tests? #f)) ;no check target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-sources
(lambda _
(substitute* "src/CMakeLists.txt"
(("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") ""))
(substitute* "src/unittest/test_servermodmanager.cpp"
;; do no override MINETEST_SUBGAME_PATH
(("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);")
"(void)0;"))
(setenv "MINETEST_SUBGAME_PATH"
(string-append (getcwd) "/games")) ; for check
#t))
(replace 'check
(lambda _
;; Thanks to our substitutions, the tests should also run
;; when invoked on the target outside of `guix build'.
(unless ,(%current-target-system)
(setenv "HOME" "/tmp")
(invoke "src/minetest" "--run-unittests"))
#t)))))
(native-search-paths
(list (search-path-specification
(variable "MINETEST_SUBGAME_PATH")
@ -3541,7 +3561,7 @@ in different ways.")
(file-name (git-file-name name version))
(sha256
(base32
"1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"))))
"11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w5"))))
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)))
@ -3566,7 +3586,7 @@ in different ways.")
(define-public minetest-mineclone
(package
(name "minetest-mineclone")
(version "0.66.2")
(version "0.71.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3575,7 +3595,7 @@ in different ways.")
(file-name (git-file-name name version))
(sha256
(base32
"0miszzlzplpvaj0j1yii9867ydr42wsaqa9g6grxdrci75p05g00"))))
"0qm809dqvxc7pa1cr9skmglq9vrbq5hhm4c4m5yi46ldh1v96dgf"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
@ -4071,7 +4091,7 @@ falling, themeable graphics and sounds, and replays.")
(define-public wesnoth
(package
(name "wesnoth")
(version "1.14.15")
(version "1.14.16")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@ -4080,7 +4100,7 @@ falling, themeable graphics and sounds, and replays.")
"wesnoth-" version ".tar.bz2"))
(sha256
(base32
"05iapxj3nzaqh10y42yq1jf7spxgm4iwjw4qj1c4lnb25xp4mc2h"))))
"1d9hq3dcx0sgs2v4400rg2nw98v46m7bwiqqjv8z8n7vw8kx8lhg"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no check target
@ -6301,14 +6321,14 @@ with the mouse isn’t always trivial.")
(define-public chroma
(package
(name "chroma")
(version "1.17")
(version "1.18")
(source (origin
(method url-fetch)
(uri (string-append "http://level7.org.uk/chroma/download/chroma-"
version ".tar.bz2"))
(sha256
(base32
"047sf00x71xbmi8bqrhfbmr9bk89l2gbykkqsfpw4wz6yfjscs6y"))))
"12bjisf5nlqinw8n4r223vld52p0p2mw3fca92vi175c46bycbzn"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests included

38
gnu/packages/gcc.scm
View File

@ -3,13 +3,14 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -273,6 +274,14 @@ where the OS part is overloaded to denote a specific ABI---into GCC
~a"
libc line))))
;; TODO: Make this unconditional in core-updates.
,@(if (target-powerpc?)
`((when (file-exists? "gcc/config/rs6000")
;; Force powerpc libdir to be /lib and not /lib64
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib"))))
`())
;; Don't retain a dependency on the build-time sed.
(substitute* "fixincludes/fixincl.x"
(("static char const sed_cmd_z\\[\\] =.*;")
@ -589,12 +598,27 @@ using compilers other than GCC."
(name "libstdc++")
(arguments
`(#:out-of-source? #t
#:phases (alist-cons-before
'configure 'chdir
(lambda _
(chdir "libstdc++-v3")
#t)
%standard-phases)
#:phases
;; TODO: Use the target-powerpc arm for everyone.
,(if (target-powerpc?)
`(modify-phases %standard-phases
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
(add-before 'chdir 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib")))
#t))
(add-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3")
#t)))
`(alist-cons-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3")
#t)
%standard-phases))
#:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")

10
gnu/packages/geo.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
@ -1170,7 +1170,13 @@ map display. Downloads map data from a number of websites, including
"0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "data/fonts") #t))))
'(begin
(delete-file-recursively "data/fonts")
;; Fixes compilation, can be removed with the next release.
;; Upstream link: https://github.com/opengribs/XyGrib/pull/255
(substitute* "src/SkewT.h"
(("QMessageBox>") "QMessageBox>\n#include <QPainterPath>"))
#t))))
(build-system cmake-build-system)
(arguments
`(#:phases

3
gnu/packages/gettext.scm
View File

@ -139,8 +139,7 @@ translated messages from the catalogs. Nearly all GNU packages use Gettext.")
;; module when there's a #:renamer, and that module may be empty at that point
;; in case or circular dependencies.
(define-public gnu-gettext
(package
(inherit gettext-minimal)
(package/inherit gettext-minimal
(name "gettext")
(arguments
(substitute-keyword-arguments (package-arguments gettext-minimal)

4
gnu/packages/gimp.scm
View File

@ -518,6 +518,8 @@ MyPaint.")
(mkdir-p target)
#t))))))
(native-inputs
;; avoid ./autogen.sh: ./configure: /bin/sh: bad interpreter:
;; No such file or directory
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
("glib" ,glib "bin") ; glib-gettextize
@ -590,7 +592,7 @@ transferring the style of an image.")
(format port "for dir in '~a'.split(':'):~%" pythonpath)
(format port " site.addsitedir(dir)~%")))))))))
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)

7
gnu/packages/gl.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -607,6 +607,11 @@ extension functionality is exposed in a single header file.")
"godir = $(moddir)\n"))))
(add-before 'build 'patch-dynamic-link
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "gl/runtime.scm"
(("\\(dynamic-link\\)")
(string-append "(dynamic-link \""
(assoc-ref inputs "mesa")
"/lib/libGL.so" "\")")))
(define (dynamic-link-substitute file lib input)
(substitute* file
(("dynamic-link \"lib([a-zA-Z]+)\"" _ lib)

116
gnu/packages/glib.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
@ -172,6 +172,7 @@ shared NFS home directories.")
(package
(name "glib")
(version "2.62.6")
(replacement glib/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
@ -235,7 +236,7 @@ shared NFS home directories.")
(lambda _
(substitute* "meson.build"
(("test_timeout = 60")
"test_timeout = 90")
"test_timeout = 120")
(("test_timeout_slow = 120")
"test_timeout_slow = 180")))))
'())
@ -394,6 +395,34 @@ dynamic loading, and an object system.")
(home-page "https://developer.gnome.org/glib/")
(license license:lgpl2.1+)))
(define glib/fixed
(package
(inherit glib)
(source (origin
(inherit (package-source glib))
(patches
(append (search-patches "glib-CVE-2021-27218.patch"
"glib-CVE-2021-27219-01.patch"
"glib-CVE-2021-27219-02.patch"
"glib-CVE-2021-27219-03.patch"
"glib-CVE-2021-27219-04.patch"
"glib-CVE-2021-27219-05.patch"
"glib-CVE-2021-27219-06.patch"
"glib-CVE-2021-27219-07.patch"
"glib-CVE-2021-27219-08.patch"
"glib-CVE-2021-27219-09.patch"
"glib-CVE-2021-27219-10.patch"
"glib-CVE-2021-27219-11.patch"
"glib-CVE-2021-27219-12.patch"
"glib-CVE-2021-27219-13.patch"
"glib-CVE-2021-27219-14.patch"
"glib-CVE-2021-27219-15.patch"
"glib-CVE-2021-27219-16.patch"
"glib-CVE-2021-27219-17.patch"
"glib-CVE-2021-27219-18.patch"
"glib-CVE-2021-28153.patch")
(origin-patches (package-source glib))))))))
(define-public glib-with-documentation
;; glib's doc must be built in a separate package since it requires gtk-doc,
;; which in turn depends on glib.
@ -421,6 +450,34 @@ dynamic loading, and an object system.")
(delete-file-recursively (string-append out html))
#t)))))))))
;;; TODO: Merge into glib as a 'static' output on core-updates.
(define-public glib-static
(hidden-package
(package
(inherit glib)
(name "glib-static")
(outputs '("out"))
(arguments
(substitute-keyword-arguments (package-arguments glib)
((#:configure-flags flags ''())
`(cons* "--default-library=static"
"-Dselinux=disabled"
"-Dman=false"
"-Dgtk_doc=false"
"-Dinternal_pcre=false"
,flags))
((#:phases phases)
`(modify-phases ,phases
(delete 'move-executables)
(replace 'install
;; Only install the static libraries.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")))
(for-each (lambda (f)
(install-file f lib))
(find-files "." "\\.a$"))))))))))))
(define gobject-introspection
(package
(name "gobject-introspection")
@ -777,32 +834,33 @@ useful for C++.")
(properties `((python2-variant . ,(delay python2-pygobject))))))
(define-public python2-pygobject
(package (inherit (strip-python2-variant python-pygobject))
(name "python2-pygobject")
(let ((base (strip-python2-variant python-pygobject)))
(package/inherit base
(name "python2-pygobject")
;; Note: We use python-build-system here, because Meson only supports
;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it
;; difficult to use for Python 2 projects.
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-broken-tests
(lambda _
;; FIXME: this test freezes and times out.
(delete-file "tests/test_mainloop.py")
;; FIXME: this test fails with this kind of error:
;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
(delete-file "tests/test_ossig.py")
#t)))))
(inputs
`(("python-pycairo" ,python2-pycairo)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
`(("glib-bin" ,glib "bin")
("pkg-config" ,pkg-config)
("python-pytest" ,python2-pytest)))))
;; Note: We use python-build-system here, because Meson only supports
;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it
;; difficult to use for Python 2 projects.
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-broken-tests
(lambda _
;; FIXME: this test freezes and times out.
(delete-file "tests/test_mainloop.py")
;; FIXME: this test fails with this kind of error:
;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
(delete-file "tests/test_ossig.py")
#t)))))
(inputs
`(("python-pycairo" ,python2-pycairo)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
`(("glib-bin" ,glib "bin")
("pkg-config" ,pkg-config)
("python-pytest" ,python2-pytest))))))
(define-public perl-glib
(package
@ -939,8 +997,8 @@ This package provides the library for GLib applications.")
#t)))))
(synopsis "D-Bus API for C++")
(description "This package provides D-Bus client API bindings for the C++
programming language. It also contains the utility
@command{dbuscxx-xml2cpp}.")
programming language. It also provides the @command{dbusxx-xml2cpp} and
@command{dbusxx-introspect} commands.")
(home-page "https://sourceforge.net/projects/dbus-cplusplus/")
(license license:lgpl2.1+)))

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

@ -781,6 +781,70 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(define-public numix-theme
(deprecated-package "numix-theme" numix-gtk-theme))
(define-public orchis-theme
(package
(name "orchis-theme")
(version "2021-02-28")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/vinceliuice/Orchis-theme")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1qp3phiza93qllrjm5xjjca5b7l2sbng8c382khy9m97grxvcq0y"))
(modules '((guix build utils)
(ice-9 regex)
(srfi srfi-26)))
(snippet
'(begin
(for-each
(lambda (f)
(let* ((r (make-regexp "\\.scss"))
(f* (regexp-substitute #f (regexp-exec r f) 'pre ".css")))
(if (file-exists? f*)
(delete-file f*))))
(find-files "." ".*\\.scss"))
#t))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list
"--dest" (string-append
(assoc-ref %outputs "out")
"/share/themes")
"--theme" "all"
"--radio-color")
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(delete 'bootstrap)
(delete 'configure)
(replace 'build (lambda _ (invoke "./parse-sass.sh")))
(replace 'install
(lambda* (#:key configure-flags #:allow-other-keys)
(mkdir-p
(cadr (or (member "--dest" configure-flags)
(member "-d" configure-flags))))
(apply invoke "./install.sh" configure-flags)
#t)))))
(inputs
`(("gtk-engines" ,gtk-engines)))
(native-inputs
`(;("coreutils" ,coreutils)
("gtk+" ,gtk+)
("sassc" ,sassc)))
(home-page "https://github.com/vinceliuice/Orchis-theme")
(synopsis "Material Design theme for a wide range of environments")
(description "Orchis is a Material Design them for GNOME/GTK based
desktop environments. It is based on materia-theme and adds more color
variants.")
(license (list license:gpl3 ; According to COPYING.
license:lgpl2.1 ; Some style sheets.
license:cc-by-sa4.0)))) ; Some icons
(define-public markets
(package
(name "markets")

166
gnu/packages/gnome.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2015, 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
@ -166,6 +166,7 @@
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
@ -1974,7 +1975,7 @@ access the common Google services, and has full asynchronous support.")
(define-public libgxps
(package
(name "libgxps")
(version "0.3.1")
(version "0.3.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -1982,7 +1983,7 @@ access the common Google services, and has full asynchronous support.")
name "-" version ".tar.xz"))
(sha256
(base32
"157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"))))
"07156nj7yrp3h9zyzx6mjwxwmfijialb4gi5d6dwyp53arr8c9vd"))))
(build-system meson-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
@ -2433,8 +2434,7 @@ GNOME Desktop.")
;;; A minimal variant used to break a cycle with Inkscape.
(define-public gdl-minimal
(package
(inherit gdl)
(package/inherit gdl
(name "gdl-minimal")
(arguments
'(#:phases
@ -3227,6 +3227,7 @@ the GNOME desktop environment.")
(sha256
(base32
"1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"))))
(replacement libcroco/fixed)
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -3245,6 +3246,21 @@ XML/CSS rendering engine.")
;; LGPLv2.1-only.
(license license:lgpl2.1)))
(define libcroco/fixed
(package
(inherit libcroco)
(name "libcroco")
(version "0.6.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"))
(patches (search-patches "libcroco-CVE-2020-12825.patch"))))))
(define-public libgsf
(package
(name "libgsf")
@ -3301,7 +3317,8 @@ dealing with different structured file formats.")
(build-system cargo-build-system)
(outputs '("out" "doc"))
(arguments
`(#:modules
`(#:install-source? #f
#:modules
((guix build cargo-build-system)
(guix build utils)
((guix build gnu-build-system) #:prefix gnu:))
@ -4043,14 +4060,14 @@ Hints specification (EWMH).")
(define-public goffice
(package
(name "goffice")
(version "0.10.48")
(version "0.10.49")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/goffice/"
(version-major+minor version) "/"
"goffice-" version ".tar.xz"))
(sha256
(base32 "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"))))
(base32 "1s87ngs3g3nfvcn96aq4lgzx5cscbfg4n9f6ns2zpvc5ngdiiz2z"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 4.0 MiB of gtk-doc
@ -4107,7 +4124,7 @@ Hints specification (EWMH).")
(define-public gnumeric
(package
(name "gnumeric")
(version "1.12.48")
(version "1.12.49")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnumeric/"
@ -4115,7 +4132,7 @@ Hints specification (EWMH).")
"gnumeric-" version ".tar.xz"))
(sha256
(base32
"14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"))))
"0mzdhhpa7kwkc51l344g6vgqwaxkjdf03s7zasqh0bn3jpn75h4i"))))
(build-system glib-or-gtk-build-system)
(arguments
`(;; The gnumeric developers don't worry much about failing tests.
@ -4793,8 +4810,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
(define-public libsoup-minimal
(package
(inherit libsoup)
(package/inherit libsoup
(name "libsoup-minimal")
(outputs (delete "doc" (package-outputs libsoup)))
(arguments
@ -6354,7 +6370,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.")
(define-public gvfs
(package
(name "gvfs")
(version "1.40.1")
(version "1.40.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gvfs/"
@ -6362,7 +6378,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.")
"gvfs-" version ".tar.xz"))
(sha256
(base32
"1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"))
"07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"))
;; This patch may be removed when upgrading to version 1.46.x.
(patches
(search-patches "gvfs-add-support-for-libplist-2.2.patch"))))
@ -6409,6 +6425,10 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.")
("openssh" ,openssh)
("polkit" ,polkit)
("udisks" ,udisks)))
;; CVE-2019-{12447,12448,12449} are fixed in the 1.40.2 release.
(properties '((lint-hidden-cve . ("CVE-2019-12447"
"CVE-2019-12448"
"CVE-2019-12449"))))
(home-page "https://wiki.gnome.org/gvfs/")
(synopsis "Userspace virtual file system for GIO")
(description
@ -6839,7 +6859,7 @@ classes for commonly used data structures.")
(define-public gexiv2
(package
(name "gexiv2")
(version "0.12.1")
(version "0.12.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -6847,7 +6867,7 @@ classes for commonly used data structures.")
name "-" version ".tar.xz"))
(sha256
(base32
"0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"))))
"0k4ljzzz5dwqndw8awvlw3ala8rh3b2rk9i4jzvywc53mi9ba8i3"))))
(build-system meson-build-system)
(native-inputs
`(("gcr" ,gcr)
@ -7390,7 +7410,9 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(patches (search-patches "evolution-data-server-locales.patch"
"evolution-data-server-libical-compat.patch"))
"evolution-data-server-libical-compat.patch"
"evolution-data-server-CVE-2020-14928.patch"
"evolution-data-server-CVE-2020-16117.patch"))
(sha256
(base32
"16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"))))
@ -8333,7 +8355,7 @@ properties, screen resolution, and other GNOME parameters.")
(define-public gnome-shell
(package
(name "gnome-shell")
(version "3.34.2")
(version "3.34.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -8341,8 +8363,9 @@ properties, screen resolution, and other GNOME parameters.")
name "-" version ".tar.xz"))
(sha256
(base32
"0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh"))
(patches (search-patches "gnome-shell-theme.patch"
"0l3mdn7g2c22mdhrqkxvvc1pk2w0v32f2v4a6n1phvaalwcg75nj"))
(patches (search-patches "gnome-shell-CVE-2020-17489.patch"
"gnome-shell-theme.patch"
"gnome-shell-disable-test.patch"))
(modules '((guix build utils)))
(snippet
@ -8484,6 +8507,9 @@ properties, screen resolution, and other GNOME parameters.")
;; Missing propagation? See also: <https://bugs.gnu.org/27264>
("librsvg" ,librsvg)
("geoclue" ,geoclue)))
;; CVE-2019-3820 was fixed before GNOME 3.34 was released, in upstream
;; commit f0a7395b3006360905ccdc642982f9fc67378927.
(properties '((lint-hidden-cve . ("CVE-2019-3820"))))
(synopsis "Desktop shell for GNOME")
(home-page "https://wiki.gnome.org/Projects/GnomeShell")
(description
@ -8540,7 +8566,7 @@ core C library, and bindings for Python (PyGTK).")
(define-public gnome-autoar
(package
(name "gnome-autoar")
(version "0.2.4")
(version "0.3.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -8548,7 +8574,7 @@ core C library, and bindings for Python (PyGTK).")
name "-" version ".tar.xz"))
(sha256
(base32
"0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"))))
"1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
@ -8940,7 +8966,7 @@ associations for GNOME.")
(define-public libgovirt
(package
(name "libgovirt")
(version "0.3.6")
(version "0.3.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -8948,7 +8974,7 @@ associations for GNOME.")
name "-" version ".tar.xz"))
(sha256
(base32
"19pb71pag3vsi83kbv8h08kimwym4hpw36kjl6a5ik5nk50mc8sg"))))
"1y0x1wyakj3ya33hgj0w1jkbcn50q21gmn2zyalxysqp55i1ij8x"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -9983,8 +10009,7 @@ accessibility infrastructure.")
(properties '((upstream-name . "pyatspi")))))
(define-public python2-pyatspi
(package
(inherit python-pyatspi)
(package/inherit python-pyatspi
(name "python2-pyatspi")
(inputs
`(("python" ,python-2)))
@ -10620,7 +10645,8 @@ generic enough to work for everyone.")
"evolution-" version ".tar.xz"))
(sha256
(base32
"164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c"))))
"164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c"))
(patches (search-patches "evolution-CVE-2020-11879.patch"))))
(build-system cmake-build-system)
(arguments
`(#:imported-modules (,@%cmake-build-system-modules
@ -10683,7 +10709,7 @@ functionality.")
(define-public gthumb
(package
(name "gthumb")
(version "3.8.2")
(version "3.10.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gthumb/"
@ -10691,7 +10717,7 @@ functionality.")
"gthumb-" version ".tar.xz"))
(sha256
(base32
"15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q"))))
"14sw8d37g1lkp44dwsgyxjjsgh5pnpp4wq00mcy9p3rp30lf9spx"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -10730,19 +10756,20 @@ advanced image management tool")
(define-public terminator
(package
(name "terminator")
(version "1.92")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/gnome-" name "/" name "/"
"releases/download/v" version "/"
name "-" version ".tar.gz"))
(sha256
(base32
"1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z"))))
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/gnome-terminator/terminator/"
"releases/download/v" version "/"
name "-" version ".tar.gz"))
(sha256
(base32
"1vap4li2i24l1iz2q4b8wvhj8flamarf18xcmzq5ik2vzcrisbjy"))))
(build-system python-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources
("glib:bin" ,glib "bin") ; for glib-compile-resources
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
@ -10754,33 +10781,45 @@ advanced image management tool")
("dbus-glib" ,dbus-glib)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("python" ,python-wrapper)
("python-dbus" ,python-dbus)
("python-notify2" ,python-notify2)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
("vte" ,vte)))
(propagated-inputs
`(("python-configobj" ,python-configobj)))
(arguments
`(#:imported-modules ((guix build glib-or-gtk-build-system)
;; One test out of 28 fails due to dbus-python and python-notify; skip
;; tests.
`(#:tests? #f
#:imported-modules ((guix build glib-or-gtk-build-system)
,@%python-build-system-modules)
#:modules ((guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after
'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/terminator"))
(pylib (string-append (assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages")))
(wrap-program prog
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t)))
(add-after 'unpack 'handle-dbus-python
(lambda _
;; python-dbus cannot be found but it's really there. See
;; https://github.com/SpotlightKid/jack-select/issues/2
(substitute* "setup.py"
(("'dbus-python',") ""))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/terminator"))
(pylib (string-append (assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages")))
(wrap-program prog
`("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t)))
(add-after 'wrap-program 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(home-page "https://gnome-terminator.org/")
@ -10793,7 +10832,7 @@ tabs, and it supports drag and drop re-ordering of terminals.")
(define-public libhandy
(package
(name "libhandy")
(version "1.0.3")
(version "1.2.0")
(source
(origin
(method git-fetch)
@ -10802,7 +10841,7 @@ tabs, and it supports drag and drop re-ordering of terminals.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0flgwlm921801i3ns0dwqpnxl89f3rzn4y9h723i13bmflch3in7"))))
(base32 "1a8wfgm2jd3gcbk1nzhq6f2xq7vkxdc9qky8p9k0za9gqi7xfg4v"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
@ -11070,7 +11109,7 @@ index files needed for Adwaita to be used outside of GNOME.")
(define-public gnote
(package
(name "gnote")
(version "3.38.0")
(version "3.38.1")
(source
(origin
(method url-fetch)
@ -11078,7 +11117,7 @@ index files needed for Adwaita to be used outside of GNOME.")
(version-major+minor version) "/"
"gnote-" version ".tar.xz"))
(sha256
(base32 "1ingbaw4d8vpjn083xvzqw7kz8z0k2bx7msk78pbzd68bwgkadpx"))))
(base32 "1adjfjhmsm2d33999khjyzvli6kiz1jlzavn77jhd49kfzhxa9y4"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
@ -11231,7 +11270,8 @@ these services on the Guix System.")
(file-name (git-file-name name version))
(sha256
(base32
"01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7"))))
"01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7"))
(patches (search-patches "geary-CVE-2020-24661.patch"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -11821,7 +11861,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(define-public komikku
(package
(name "komikku")
(version "0.26.1")
(version "0.27.0")
(source
(origin
(method git-fetch)
@ -11831,7 +11871,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version))
(sha256
(base32
"1mas409c14p6g0v10w4cf5hsjbs0922h6h9k9pyj9s8y7yi2ikz2"))))
"0mj4bsy7jp9wjj1dqz9zdq5aj0ib813wkz5k1481k80jp9dnlqnv"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -11863,6 +11903,7 @@ integrated profiler via Sysprof, debugging support, and more.")
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-brotli" ,python-brotli)
("python-dateparser" ,python-dateparser)
("python-keyring" ,python-keyring)
("python-lxml" ,python-lxml)
@ -11872,7 +11913,8 @@ integrated profiler via Sysprof, debugging support, and more.")
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
("python-requests" ,python-requests)
("python-unidecode" ,python-unidecode)))
("python-unidecode" ,python-unidecode)
("webkitgtk" ,webkitgtk)))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal)

2
gnu/packages/gnunet.scm
View File

@ -368,7 +368,7 @@ kinds of basic applications for the foundation of a GNU internet.")
"0nqc18jh9j30y4l6yh6j35byfg6qalq7yr3frv9rk10qa041c2sv"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)))
(inputs `(("guile" ,guile-2.0)
("gnunet" ,gnunet)))

9
gnu/packages/gnupg.scm
View File

@ -695,6 +695,8 @@ PGP keysigning parties.")
"1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5"))))
(build-system gnu-build-system)
(native-inputs
;; autoconf-wrapper is required due to the non-standard
;; 'configure phase.
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)))
(inputs `(("perl" ,perl)
@ -1144,17 +1146,16 @@ over.")
(define-public jetring
(package
(name "jetring")
(version "0.29")
(version "0.30")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/debian/jetring")
(commit (string-append "debian/" version))))
(commit "535380166eb1b222ba34864af07f3e36f4fb52c9")))
(file-name (git-file-name name version))
(sha256
(base32
"1acbx2vnbkms1c0wgcnh05d4g359sg5z0aiw541vx2qq9sgdhlv6"))))
(base32 "19m7rj446pr4nql44khwq0cfxfrm8cslj5v9jll08p7nk6glq5px"))))
(build-system gnu-build-system)
(arguments
'(#:phases

6
gnu/packages/gnuzilla.scm
View File

@ -694,8 +694,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
(define %icecat-version "78.8.0-guix0-preview1")
(define %icecat-build-id "20210223000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "78.9.0-guix0-preview1")
(define %icecat-build-id "20210323000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -717,7 +717,7 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw"))))
"0r28wrsk2k6pc922zfs5wljh8ziqm4a98lisn7409j2szhfsq0wf"))))
(upstream-icecat-base-version "78.7.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))

284
gnu/packages/golang.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Sergei Trofimovich <slyfox@inbox.ru>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
@ -24,6 +24,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,14 +52,15 @@
#:use-module (guix build-system go)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages base)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pcre)
#:use-module (gnu packages lua)
#:use-module (gnu packages mp3)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
@ -235,7 +237,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(package
(inherit go-1.4)
(name "go")
(version "1.14.10")
(version "1.14.15")
(source
(origin
(method git-fetch)
@ -245,7 +247,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(file-name (git-file-name name version))
(sha256
(base32
"0h1nmqzjc0xxpn6n2hjq7692gdqkznagzdmiq9490yzkrrii2lgk"))))
"1crh90qkvhlx23hwsi4wxy3l3h8973lr18135y6h1nnzzwr3n3ps"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.4)
((#:system system)
@ -285,7 +287,10 @@ in the style of communicating sequential processes (@dfn{CSP}).")
"cmd/go/testdata/script/cover_cgo.txt"
"cmd/go/testdata/script/cover_cgo_xtest.txt"
"cmd/go/testdata/script/cover_cgo_extra_test.txt"
"cmd/go/testdata/script/cover_cgo_extra_file.txt"))
"cmd/go/testdata/script/cover_cgo_extra_file.txt"
"cmd/go/testdata/script/cgo_path_space.txt"
"cmd/go/testdata/script/ldflag.txt"
"cmd/go/testdata/script/cgo_path.txt"))
(for-each make-file-writable (find-files "."))
@ -1470,7 +1475,7 @@ optimized for performance yet simple to use.")
(define-public go-github-com-tomnomnom-gron
(package
(name "gron")
(version "0.6.0")
(version "0.6.1")
(home-page "https://github.com/tomnomnom/gron")
(source
(origin
@ -1480,7 +1485,7 @@ optimized for performance yet simple to use.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0"))))
(base32 "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m"))))
(build-system go-build-system)
(arguments
(let ((import-path "github.com/tomnomnom/gron"))
@ -6770,3 +6775,262 @@ compressed streams in Go.")
(description "Package ed25519 implements the Ed25519 signature
algorithm.")
(license license:bsd-3))))
(define-public go-github-com-akosmarton-papipes
(let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64")
(revision "0"))
(package
(name "go-github-com-akosmarton-papipes")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/akosmarton/papipes")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "16p77p3d1v26qd3knxn087jqlad2qm23q8m796cdr66hrdc0gahq"))))
(build-system go-build-system)
(inputs
`(("pulseaudio" ,pulseaudio)))
(arguments
`(#:import-path "github.com/akosmarton/papipes"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("src/github.com/akosmarton/papipes/common.go"
"src/github.com/akosmarton/papipes/sink.go"
"src/github.com/akosmarton/papipes/source.go")
(("exec.Command\\(\"pactl\"")
(string-append "exec.Command(\""
(assoc-ref inputs "pulseaudio")
"/bin/pactl\""))))))))
(home-page "https://github.com/akosmarton/papipes")
(synopsis "Pulseaudio client library for Go")
(description
"This is a Pulseaudio client library in Golang for creating virtual
sinks and sources.")
(license license:expat))))
(define-public go-github-com-mesilliac-pulse-simple
(let ((commit "75ac54e19fdff88f4fbd82f45125134b602230b0")
(revision "0"))
(package
(name "go-github-com-mesilliac-pulse-simple")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mesilliac/pulse-simple")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1awwczsa9yy99p035ckajqfs8m6mab0lz82mzlj1c5cj9lnmwplj"))))
(build-system go-build-system)
(propagated-inputs
`(("pkg-config" ,pkg-config)
("pulseaudio" ,pulseaudio)))
(arguments
'(#:import-path "github.com/mesilliac/pulse-simple"))
(home-page "https://github.com/mesilliac/pulse-simple")
(synopsis "Cgo bindings to PulseAudio's Simple API")
(description
"This packages provides Cgo bindings to PulseAudio's Simple API, to play
or capture raw audio.")
(license license:expat))))
(define-public go-github-com-pborman-getopt
(package
(name "go-github-com-pborman-getopt")
(version "2.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pborman/getopt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sacv6g8cxfibxd3gnfjnzp7fynrnc4s2aaz5wbxivqqhvflc22l"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/pborman/getopt"))
(home-page "https://github.com/pborman/getopt")
(synopsis "Getopt style option parsing for Go")
(description
"This package provides traditional getopt processing for implementing
programs that use traditional command lines.")
(license license:bsd-3)))
(define-public go-go-uber-org-atomic
(package
(name "go-go-uber-org-atomic")
(version "1.7.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber-go/atomic")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0yxvb5sixh76cl9j8dpa97gznj0p8pmg2cdw0ypfwhd3ipx9wph1"))))
(build-system go-build-system)
(arguments
'(#:import-path "go.uber.org/atomic"))
(native-inputs
`(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)
("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew)))
(home-page "https://go.uber.org/atomic")
(synopsis "Wrapper types for sync/atomic")
(description
"This package provides simple wrappers for primitive types to enforce
atomic access.")
(license license:expat)))
(define-public go-go-uber-org-multierr
(package
(name "go-go-uber-org-multierr")
(version "1.6.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber-go/multierr")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "162941s8f6a9x2w04qm4qa3zz0zylwag9149hywrj9ibp2nzcsqz"))))
(build-system go-build-system)
(arguments
'(#:import-path "go.uber.org/multierr"))
(native-inputs
`(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)))
(propagated-inputs
`(("go-go-uber-org-atomic" ,go-go-uber-org-atomic)))
(home-page "https://go.uber.org/multierr")
(synopsis "Error combination fo Go")
(description
"@code{multierr} allows combining one or more Go errors together.")
(license license:expat)))
(define-public go-golang-org-x-lint
(let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
(revision "0"))
(package
(name "go-golang-org-x-lint")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://go.googlesource.com/lint")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3"))))
(build-system go-build-system)
(arguments
'(#:import-path "golang.org/x/lint"
#:tests? #f)) ;; TODO: Fix tests
(propagated-inputs
`(("go-golang-org-x-tools" ,go-golang-org-x-tools)))
(home-page "https://golang.org/x/lint")
(synopsis "Linter for Go source code")
(description
"This is a linter for Go source code. Unlike gofmt, it doesn't
reformat the source code, it only prints out style mistakes.")
(license license:bsd-3))))
(define-public go-github-com-kisielk-gotool
(package
(name "go-github-com-kisielk-gotool")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kisielk/gotool")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/kisielk/gotool"))
(home-page "https://github.com/kisielk/gotool")
(synopsis "Go library of utility functions")
(description
"This package contains utility functions used to implement the standard
@code{cmd/go} tool, provided as a convenience to developers who want to write
tools with similar semantics.")
(license license:expat)))
(define-public go-honnef-co-go-tools
(package
(name "go-honnef-co-go-tools")
(version "0.1.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dominikh/go-tools")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "17li8jbw3cpn59kpcl3j3r2an4wkx3fc81xn0j4xgbjpkxh9493n"))))
(build-system go-build-system)
(arguments
`(#:import-path "honnef.co/go/tools"
#:tests? #f
;; Source-only package
#:phases
(modify-phases %standard-phases
(delete 'build))))
(propagated-inputs
`(("go-golang-org-x-tools" ,go-golang-org-x-tools)
("go-github-com-kisielk-gotool",go-github-com-kisielk-gotool)
("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)))
(home-page "https://honnef.co/go/tools")
(synopsis "Staticcheck advanced Go linter")
(description
"Staticcheck is a state of the art linter for the Go programming language.
Using static analysis, it finds bugs and performance issues, offers
simplifications, and enforces style rules.")
(license license:expat)))
(define-public go-go-uber-org-zap
(package
(name "go-go-uber-org-zap")
(version "1.16.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uber-go/zap")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "05ix5wg1r8pgi7fb6084lg4x7mrkvzkh1nxa7zj337w5b9xj0myr"))))
(build-system go-build-system)
(arguments
'(#:import-path "go.uber.org/zap"
#:tests? #f)) ; TODO: Fix tests
(native-inputs
`(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)
("go-golang-org-x-lint" ,go-golang-org-x-lint)
("go-honnef-co-go-tools" ,go-honnef-co-go-tools)))
(propagated-inputs
`(("go-github-com-pkg-errors" ,go-github-com-pkg-errors)
("go-go-uber-org-atomic" ,go-go-uber-org-atomic)
("go-go-uber-org-multierr" ,go-go-uber-org-multierr)
("go-gopkg-in-yaml-v2" ,go-gopkg-in-yaml-v2)))
(home-page "https://go.uber.org/zap")
(synopsis "Logging library for Go")
(description
"This package provides a library for fast, structured, leveled logging in
Go.")
(license license:expat)))

8
gnu/packages/graphics.scm
View File

@ -718,15 +718,15 @@ more.")
(define-public cgal
(package
(name "cgal")
(version "4.14.2")
(version "5.2.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/CGAL/cgal/releases/download/releases/"
"CGAL-" version "/CGAL-" version ".tar.xz"))
"https://github.com/CGAL/cgal/releases/download/v" version
"/CGAL-" version ".tar.xz"))
(sha256
(base32
"08lrp3hfwdypggz4138bnkh6bjxn441zg2y9xnq5mrjfc5ini6w1"))))
"1rhrpjsp4081nn2q215h78kc4msrj0081zg65k1gfp5hl88bg03y"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no test target

3
gnu/packages/groff.scm
View File

@ -128,8 +128,7 @@ is usually the formatter of \"man\" documentation pages.")
(define-public groff-minimal
;; Minimialist groff for use by man-db. Its closure size is less than half
;; that of the full-blown groff.
(package
(inherit groff)
(package/inherit groff
(name "groff-minimal")
(synopsis "Minimalist variant of Groff for use by man-db")
(outputs '("out"))

92
gnu/packages/gtk.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2017, 2018, 2019, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
@ -125,6 +125,7 @@ tools have full access to view and control running applications.")
(package
(name "cairo")
(version "1.16.0")
(replacement cairo/fixed)
(source (origin
(method url-fetch)
(uri (string-append "https://cairographics.org/releases/cairo-"
@ -175,6 +176,15 @@ affine transformation (scale, rotation, shear, etc.).")
(license license:lgpl2.1) ; or Mozilla Public License 1.1
(home-page "https://cairographics.org/")))
(define cairo/fixed
(package
(inherit cairo)
(source (origin
(inherit (package-source cairo))
(patches (append (search-patches "cairo-CVE-2018-19876.patch"
"cairo-CVE-2020-35492.patch")
(origin-patches (package-source cairo))))))))
(define-public cairo-sans-poppler
;; Variant used to break the dependency cycle between Poppler and Cairo.
(package/inherit cairo
@ -182,8 +192,7 @@ affine transformation (scale, rotation, shear, etc.).")
(properties `((hidden? . #t)))))
(define-public cairo-xcb
(package
(inherit cairo)
(package/inherit cairo
(name "cairo-xcb")
(inputs
`(("mesa" ,mesa)
@ -237,7 +246,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public libdatrie
(package
(name "libdatrie")
(version "0.2.12")
(version "0.2.13")
(source
(origin
(method url-fetch)
@ -245,7 +254,7 @@ affine transformation (scale, rotation, shear, etc.).")
(string-append "https://linux.thai.net/pub/ThaiLinux/software/"
"libthai/libdatrie-" version ".tar.xz"))
(sha256
(base32 "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"))))
(base32 "1gplcx9ddglpxmqm10qn38kjmvdh4hnhj14rzgqag095psr1n8qj"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(arguments
@ -558,6 +567,7 @@ highlighting and other features typical of a source code editor.")
(package
(name "gdk-pixbuf")
(version "2.42.2")
(replacement gdk-pixbuf/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -601,11 +611,20 @@ in the GNOME project.")
(license license:lgpl2.0+)
(home-page "https://developer.gnome.org/gdk-pixbuf/")))
(define gdk-pixbuf/fixed
(package
(inherit gdk-pixbuf)
(source (origin
(inherit (package-source gdk-pixbuf))
(patches
(append (search-patches "gdk-pixbuf-CVE-2020-29385.patch")
(origin-patches (package-source gdk-pixbuf))))))))
;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the
;; closure size.
(define-public gdk-pixbuf+svg
(package (inherit gdk-pixbuf)
(package/inherit gdk-pixbuf
(name "gdk-pixbuf+svg")
(inputs
`(("librsvg" ,librsvg)
@ -2055,6 +2074,53 @@ shell scripts. Example of how to use @code{yad} can be consulted at
@url{https://sourceforge.net/p/yad-dialog/wiki/browse_pages/}.")
(license license:gpl3+)))
(define-public dragon-drop
(package
(name "dragon-drop")
(version "1.1.1")
(source (origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/mwh/dragon")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"))))
(build-system gnu-build-system)
(inputs `(("gtk+" ,gtk+)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments
`(#:tests? #f ; no check
#:make-flags
(list (string-append "CC=" ,(cc-for-target))
;; makefile uses PREFIX for the binary location
(string-append "PREFIX=" (assoc-ref %outputs "out")
"/bin"))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(synopsis "Drag and drop source/target for X")
(description
"Dragon is a lightweight drag-and-drop source for X where you can run:
@example
dragon file.tar.gz
@end example
to get a window with just that file in it, ready to be dragged where you need it.
What if you need to drag into something? Using:
@example
dragon --target
@end example
you get a window you can drag files and text into. Dropped items are
printed to standard output.")
(home-page "https://github.com/mwh/dragon")
(license license:gpl3+)))
(define-public libdbusmenu
(package
(name "libdbusmenu")
@ -2118,16 +2184,18 @@ displayed on the other side of the bus.")
(define-public gtk-layer-shell
(package
(name "gtk-layer-shell")
(version "0.1.0")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/wmww/gtk-layer-shell/releases/download/v"
version "/gtk-layer-shell-" version ".tar.xz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/wmww/gtk-layer-shell")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ncklk3z0fzlz6p76jdcrr1ykyp1f4ykjjch4x2hfp9bwsnl4a3m"))))
(base32 "1kcp4p3s7sdh9lwniybjdarfy8z69j2j23hfrw98amhwhq39gdcc"))))
(build-system meson-build-system)
(arguments `(#:configure-flags (list "-Dtests=true")))
(native-inputs `(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)))
(inputs `(("wayland" ,wayland)

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

@ -15,14 +15,14 @@
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019, 2021 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
@ -34,6 +34,8 @@
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020, 2021 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -116,6 +118,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system guile)
#:use-module (guix utils)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (alist-delete)))
@ -236,6 +239,30 @@ more.")
(home-page "https://www.gnu.org/software/artanis/")
(license (list license:gpl3+ license:lgpl3+)))) ;dual license
(define-public guile-f-scm
(package
(name "guile-f-scm")
(version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~brown121407/f.scm")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "14wyrs3m1649l3km4pl2175dmap1372j5h8nkhykrbxg5xqp6ivd"))))
(build-system guile-build-system)
(native-inputs
`(("guile" ,guile-3.0)))
(home-page "https://git.sr.ht/~brown121407/f.scm")
(synopsis "Library for working with files and directories")
(description
"f.scm is a library intended to facilitate working with files and
directories (the file system in general). It was initially inspired by the
f library for Emacs.")
(license license:gpl3+)))
;; There has not been any release yet.
(define-public guildhall
(let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778")
@ -367,7 +394,7 @@ dictionary and suggesting spelling corrections.")
(string-append "--libdir=" (assoc-ref %outputs "out")
"/lib/bash"))))
(native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
@ -634,7 +661,7 @@ is not available for Guile 2.0.")
"1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
@ -1001,8 +1028,8 @@ convenient nested tree operations.")
(license license:gpl3+)))
(define-public guile-simple-zmq
(let ((commit "e9446173280117e98ab4208e2aa5273128650e19")
(revision "8"))
(let ((commit "b2ea97e5a0e7417ce718b27b6fd55a3146364b82")
(revision "9"))
(package
(name "guile-simple-zmq")
(version (git-version "0.0.0" revision commit))
@ -1014,7 +1041,7 @@ convenient nested tree operations.")
(commit commit)))
(sha256
(base32
"1nhlp5kl1095k1irvv0kgdbc7lp5qki3d3wg9rla6f7822hkmrzw"))
"08qvcxx0njz9545xa0lq3wpf55v9cl9nbb640ry1lig11wpymqxb"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -1211,7 +1238,7 @@ format.")
(license license:agpl3+)))
(define-public guile-email-latest
(let ((commit "03e9cacb826bd4a56d3d834fe5526e497d7c57eb")
(let ((commit "ca0520a33c9042a68691d85c6849f88412ca8357")
(revision "1"))
(package
(inherit guile-email)
@ -1226,7 +1253,7 @@ format.")
(file-name (git-file-name name version))
(sha256
(base32
"1a15gdlbmzx220xg82fgyd0zk2wqn13ddmzs13nhgfzx8d5cns68"))))
"1l5mikalawq83786rnb9zky908ncsd5dna9vyz6bx6kc2frrl7xv"))))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
@ -1697,7 +1724,7 @@ provides tight coupling to Guix.")
#t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
@ -1830,7 +1857,7 @@ users and in some situations.")
"1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
@ -2166,29 +2193,17 @@ library.")
(define-public guile-lib
(package
(name "guile-lib")
(version "0.2.6.1")
(version "0.2.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/guile-lib/guile-lib-"
version ".tar.gz"))
(sha256
(base32
"0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"))
(modules '((guix build utils)))
(snippet
'(begin
;; Work around miscompilation on Guile 3.0.0 at -O2:
;; <https://bugs.gnu.org/39251>.
(substitute* "src/md5.scm"
(("\\(define f-ash ash\\)")
"(define f-ash (@ (guile) ash))\n")
(("\\(define f-add \\+\\)")
"(define f-add (@ (guile) +))\n"))
#t))))
"1ph4z4a64m75in36pdb4dw63dzdq3hdgh16gq33q460jby23pvz4"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags
'("GUILE_AUTO_COMPILE=0") ; to prevent guild errors
'(#:make-flags '("GUILE_AUTO_COMPILE=0") ;placate guild warnings
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-module-dir
@ -2198,13 +2213,15 @@ library.")
"moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n")
(("^godir = ([[:graph:]]+)")
"godir = \
$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
#t)))))
$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")))))))
(native-inputs
`(("guile" ,guile-3.0)
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-3.0)))
`(("guile" ,guile-3.0))) ;for cross-compilation
(home-page "https://www.nongnu.org/guile-lib/")
(synopsis "Collection of useful Guile Scheme modules")
(description
@ -2212,7 +2229,6 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
modules, allowing for people to cooperate integrating their generic Guile
modules into a coherent library. Think \"a down-scaled, limited-scope CPAN
for Guile\".")
;; The whole is under GPLv3+, but some modules are under laxer
;; distribution terms such as LGPL and public domain. See `COPYING' for
;; details.
@ -2222,15 +2238,23 @@ for Guile\".")
(package
(inherit guile-lib)
(name "guile2.0-lib")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0)))))
(native-inputs
(alist-replace "guile" (list guile-2.0)
(package-native-inputs guile-lib)))
(inputs
(alist-replace "guile" (list guile-2.0)
(package-inputs guile-lib)))))
(define-public guile2.2-lib
(package
(inherit guile-lib)
(name "guile2.2-lib")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2)))))
(native-inputs
(alist-replace "guile" (list guile-2.2)
(package-native-inputs guile-lib)))
(inputs
(alist-replace "guile" (list guile-2.2)
(package-inputs guile-lib)))))
(define-public guile3.0-lib
(deprecated-package "guile3.0-lib" guile-lib))
@ -3254,6 +3278,13 @@ in C using Gtk+-3 and WebKitGtk.")
(sha256
(base32 "03ym14g9qhjqmryr5z065kynqm8yhmvnbs2djl6vp3i9cmqln8cl"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("makeinfo" ,texinfo)
("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib)
@ -4232,6 +4263,9 @@ errors.")
,@%gnu-build-system-modules)
#:make-flags
'("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
;; Parallel builds fail on powerpc64le-linux.
;; See https://lists.nongnu.org/archive/html/guile-avahi-bugs/2021-01/msg00000.html
#:parallel-build? #f
#:phases
(modify-phases %standard-phases
(add-before 'check 'fix-guile-avahi-file-name
@ -4589,3 +4623,28 @@ binary which is smaller and faster to generate and parse. This package provides
a Guile implementation of CBOR.")
(home-page "https://inqlab.net/git/guile-cbor.git")
(license license:gpl3+)))
(define-public guile-quickcheck
(package
(name "guile-quickcheck")
(version "0.1.0")
(source (origin
(method url-fetch)
(uri (string-append "https://files.ngyro.com/"
"guile-quickcheck/guile-quickcheck-"
version ".tar.gz"))
(sha256
(base32
"03mwi1l3354x52nar0zwhcm0x29yai9xjln4p4gbchwvx5dsr6fb"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-3.0)))
(home-page "https://ngyro.com/software/guile-quickcheck.html")
(synopsis "Randomized property-based testing for Guile")
(description "Guile-Quickcheck is a library for random testing of program
properties inspired by ghc-quickcheck. You can use it to express properties,
which functions should satisfy, as Scheme code and then check whether they hold
in a large number of randomly generated test cases.")
(license license:gpl3+)))

53
gnu/packages/guile.scm
View File

@ -44,6 +44,7 @@
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gperf)
#:use-module (gnu packages hurd)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libunistring)
@ -318,9 +319,6 @@ without requiring the source code to be rewritten.")
;; The latest 3.0.x version.
guile-3.0)
(define-public guile-next
(deprecated-package "guile-next" guile-3.0))
(define-public guile-3.0/libgc-7
;; Using libgc-7 avoid crashes that can occur, particularly when loading
;; data in to the Guix Data Service:
@ -342,6 +340,44 @@ without requiring the source code to be rewritten.")
(max-silent-time . 36000))))) ;10 hours (needed on ARM
; when heavily loaded)
(define-public guile-next
(let ((version "3.0.5")
(revision "0")
(commit "91547abf54d5e0795afda2781259ab8923eb527b"))
(package
(inherit guile-3.0)
(name "guile-next")
(version (git-version version revision commit))
(source (origin
;; The main goal here is to allow for '--with-branch'.
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/guile.git")
(commit commit)))
(sha256
(base32
"09i1c77h2shygylfk0av31jsc1my6zjl230b2cx6vyl58q8c0cqy"))))
(arguments
(substitute-keyword-arguments (package-arguments guile-3.0)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'skip-failing-tests
(lambda _
(substitute* "test-suite/standalone/test-out-of-memory"
(("!#") "!#\n\n(exit 77)\n"))
(delete-file "test-suite/tests/version.test")
#t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("flex" ,flex)
("gettext" ,gnu-gettext)
("texinfo" ,texinfo)
("gperf" ,gperf)
,@(package-native-inputs guile-3.0)))
(synopsis "Development version of GNU Guile"))))
(define* (make-guile-readline guile #:optional (name "guile-readline"))
(package
(name name)
@ -683,7 +719,7 @@ Guile's foreign function interface.")
(define-public guile-bytestructures
(package
(name "guile-bytestructures")
(version "1.0.9")
(version "1.0.10")
(home-page "https://github.com/TaylanUB/scheme-bytestructures")
(source (origin
(method git-fetch)
@ -693,7 +729,7 @@ Guile's foreign function interface.")
(file-name (git-file-name name version))
(sha256
(base32
"0r59sqrvwbsknw21bf44bppi6wdhd2rl2v5dw9i2vij3v8w7pgkm"))))
"14k50jln32kkxv41hvsdgjkkfj6xlv06vc1caz01qkgk1fzh72nk"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
@ -773,7 +809,7 @@ manipulate repositories of the Git version control system.")
(define-public guile-zlib
(package
(name "guile-zlib")
(version "0.0.1")
(version "0.1.0")
(source
(origin
;; XXX: Do not use "git-fetch" method here that would create and
@ -781,12 +817,13 @@ manipulate repositories of the Git version control system.")
;; in the same method.
(method url-fetch)
(uri
(string-append "https://notabug.org/guile-zlib/guile-zlib/archive/"
(string-append "https://notabug.org/guile-zlib/guile-zlib/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
;; content hash: 1ip18nzwnczqyhn9cpzxkm9vzpi5fz5sy96cgjhmp7cwhnkmv6zv
(base32
"1caz6cbl6sg5567nk68z88rshp0m26zmb0a9ry1jkc1ivpk0n47i"))))
"1safz7rrbdf1d98x3lgx5v74kivpyf9n1v6pdyy22vd0f2sjdir5"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags

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

@ -342,14 +342,14 @@ to @code{cabal repl}).")
(define-public git-annex
(package
(name "git-annex")
(version "8.20210223")
(version "8.20210310")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz"))
(sha256
(base32 "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832"))))
(base32 "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx"))))
(build-system haskell-build-system)
(arguments
`(#:configure-flags

26
gnu/packages/ibus.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@ -173,7 +173,7 @@ may also simplify input method development.")
(define-public ibus-libpinyin
(package
(name "ibus-libpinyin")
(version "1.11.1")
(version "1.12.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libpinyin/ibus-libpinyin/"
@ -181,10 +181,12 @@ may also simplify input method development.")
"/ibus-libpinyin-" version ".tar.gz"))
(sha256
(base32
"1bl1cgicd2df797dx1x0q904438bsn8i23djzcfcai4dp3631xc0"))))
"0xl2lmffy42f6h6za05z4vpazpza1a9gsrva65giwyv3kpf652dd"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:phases
`(#:configure-flags
'("--enable-opencc")
#:phases
(modify-phases %standard-phases
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
@ -195,18 +197,22 @@ may also simplify input method development.")
`("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH")
,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")))
"/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-libpinyin/setup/")))
`("GI_TYPELIB_PATH" ":" prefix
(,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0"))))
"/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-libpinyin/setup/"))))
#t))))))
(inputs
`(("ibus" ,ibus)
("libpinyin" ,libpinyin)
("bdb" ,bdb)
("sqlite" ,sqlite)
("opencc" ,opencc)
("python" ,python)
("pyxdg" ,python-pyxdg)
("pygobject2" ,python-pygobject)
("gtk+" ,gtk+)))
(native-inputs
@ -218,12 +224,12 @@ may also simplify input method development.")
"This package includes a Chinese pinyin input method and a Chinese
ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
(home-page "https://github.com/libpinyin/ibus-libpinyin")
(license gpl2+)))
(license gpl3+)))
(define-public libpinyin
(package
(name "libpinyin")
(version "2.3.0")
(version "2.6.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libpinyin/libpinyin/"
@ -231,7 +237,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
"/libpinyin-" version ".tar.gz"))
(sha256
(base32
"14969v6w8n1aiqphl2386dws7dmsdwbzyqnlz4kr8ppm39m9rp5k"))))
"10h5mjgv4ibhispvr3s1k36a4aclx4dcvcc2knd4sg1xibw0dp4w"))))
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)

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

@ -9,10 +9,11 @@
;;; Copyright © 2018 Lprndn <guix@lprndn.info>
;;; Copyright © 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -58,6 +59,7 @@
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages maths)
@ -84,7 +86,7 @@
(define-public dcmtk
(package
(name "dcmtk")
(version "3.6.5")
(version "3.6.6")
(source
(origin
(method url-fetch)
@ -93,11 +95,10 @@
"dcmtk" (string-join (string-split version #\.) "")
"/dcmtk-" version ".tar.gz"))
(sha256
(base32 "1fdyz5wwjp4grys61mxb2ia9fi6i3ax6s43l16xnv291bxk7hld0"))))
(base32 "13j5yf3p6qj3mr17d77r3kcqchf055hgvk1w15vmdr8f54mwcnb8"))))
(build-system cmake-build-system)
(inputs
`(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“.
;; ("icu4c" ,icu4c)
`(("icu4c" ,icu4c)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
@ -254,6 +255,8 @@ many popular formats.")
(sha256
(base32
"1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))
(patches
(search-patches "vtk-fix-freetypetools-build-failure.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -603,17 +606,28 @@ due to its architecture which automatically parallelises the image workflows.")
(define-public gmic
(package
(name "gmic")
(version "2.9.2")
(version "2.9.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://gmic.eu/files/source/gmic_"
version ".tar.gz"))
(sha256
(base32 "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q"))))
(base32 "06n1dcskky7aqg3a0cp7biwz8agc4xqvr8091l2wsvgib98yhbyj"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;there are no tests
`(#:tests? #f ;there are no tests
#:configure-flags '("-DBUILD_LIB_STATIC=OFF"
"-DENABLE_DYNAMIC_LINKING=ON"
"-DENABLE_LTO=ON")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-LDFLAGS
(lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "LDFLAGS"
(string-append
"-Wl,-rpath="
(assoc-ref outputs "out") "/lib")))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@ -637,6 +651,42 @@ including 2D color images.")
;; Dual-licensed, either license applies.
(license (list license:cecill license:cecill-c))))
(define-public gmic-qt
(package
(inherit gmic)
(name "gmic-qt")
(arguments
(substitute-keyword-arguments (package-arguments gmic)
((#:configure-flags _)
`(list "-DGMIC_QT_HOST=none" "-DENABLE_DYNAMIC_LINKING=ON"
(string-append "-DGMIC_LIB_PATH="
(assoc-ref %build-inputs "gmic") "/lib")))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'qt-chdir
(lambda _ (chdir "gmic-qt") #t))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("gmic" ,gmic)
("qtbase" ,qtbase)
,@(package-inputs gmic)))
(synopsis "Qt frontend for the G'MIC image processing framework")
(license license:gpl3+)))
(define-public gmic-qt-krita
(package
(inherit gmic-qt)
(name "gmic-qt-krita")
(arguments
(substitute-keyword-arguments (package-arguments gmic-qt)
((#:configure-flags flags)
'(list "-DGMIC_QT_HOST=krita" "-DENABLE_DYNAMIC_LINKING=ON"
(string-append "-DGMIC_LIB_PATH="
(assoc-ref %build-inputs "gmic") "/lib")))))
(synopsis "Krita plugin for the G'MIC image processing framework")))
(define-public nip2
(package
(name "nip2")

38
gnu/packages/image-viewers.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2021 Rovanion Luckey <rovanion.luckey@gmail.com>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
;;; This file is part of GNU Guix.
;;;
@ -748,3 +749,40 @@ allows creating false color images. A unique feature of Nomacs is the
synchronization of multiple instances.")
(home-page "https://nomacs.org/")
(license license:gpl3+)))
(define-public xzgv
(package
(name "xzgv")
(version "0.9.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/xzgv/"
version "/xzgv-" version ".tar.gz"))
(sha256
(base32 "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-target-directory
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "config.mk"
(("/usr/local") (assoc-ref outputs "out")))))
(delete 'configure) ; no configure script
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(install-file "src/xzgv" bin))))) ; just install the executable
#:tests? #f)) ; no rule for target 'test'
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+-2)
("libexif" ,libexif)))
(home-page "https://sourceforge.net/projects/xzgv/")
(synopsis "Picture viewer for X with a thumbnail-based selector")
(description
"xzgv is a fast image viewer that provides extensive keyboard support.")
(license license:gpl2+)))

55
gnu/packages/image.scm
View File

@ -596,11 +596,12 @@ extracting icontainer icon files.")
"doc")) ;1.8 MiB of HTML documentation
(arguments
;; Instead of using --docdir, this package has its own --with-docdir.
`(#:configure-flags (list (string-append "--with-docdir="
(assoc-ref %outputs "doc")
"/share/doc/"
,name "-" ,version)
"--disable-static")))
`(#:configure-flags
(list (string-append "--with-docdir="
(assoc-ref %outputs "doc")
"/share/doc/"
,name "-" ,(package-version this-package))
"--disable-static")))
(inputs `(("zlib" ,zlib)
("libjpeg" ,libjpeg-turbo)))
(synopsis "Library for handling TIFF files")
@ -1417,7 +1418,7 @@ convert, manipulate, filter and display a wide variety of image formats.")
(define-public jasper
(package
(name "jasper")
(version "2.0.25")
(version "2.0.27")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1426,7 +1427,7 @@ convert, manipulate, filter and display a wide variety of image formats.")
(file-name (git-file-name name version))
(sha256
(base32
"06s6z7qrcnbi9mbj2d0a6k7lxbjdh3ppjpx8bcdv73lxhm4z7pzr"))))
"0mrnazk8qla7nn59xad86gmrf5fzqcv74j5xhcdrxbgfw67l17zd"))))
(build-system cmake-build-system)
(inputs
`(("libjpeg" ,libjpeg-turbo)))
@ -2135,7 +2136,7 @@ This package can be used to create @code{favicon.ico} files for web sites.")
(define-public libavif
(package
(name "libavif")
(version "0.8.4")
(version "0.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2144,7 +2145,7 @@ This package can be used to create @code{favicon.ico} files for web sites.")
(file-name (git-file-name name version))
(sha256
(base32
"1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"))))
"1aw41m8ddrckq375w0lv2zd4ybhccsy1hw4f9kipppwxhgvk17gf"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON"
@ -2173,6 +2174,42 @@ by AOM, including with alpha.")
(license (list license:bsd-2 ; libavif itself
license:expat)))) ; cJSON in the test suite
(define-public libheif
(package
(name "libheif")
(version "1.11.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/strukturag/libheif")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "036n63vlk4sk7y25q2kzyvvw4r5vv323ysbmbrcaprg9hdyjqgf5"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no test target although there is a tests folder
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("dav1d" ,dav1d)
("gdk-pixbuf" ,gdk-pixbuf) ;optional
("libaom" ,libaom)
("libde265" ,libde265)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("x265" ,x265)))
(home-page "https://github.com/strukturag/libheif")
(synopsis "HEIF and AVIF file format decoder and encoder")
(description
"@code{libheif} is an ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File
Format) file format decoder and encoder.")
(license license:lgpl3+)))
(define-public mtpaint
(package
(name "mtpaint")

43
gnu/packages/imagemagick.scm
View File

@ -51,6 +51,7 @@
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API.
(version "6.9.11-48")
(replacement imagemagick/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
@ -84,7 +85,8 @@
(let ((doc (assoc-ref outputs "doc")))
(string-append "DOCUMENTATION_PATH = "
doc "/share/doc/"
,name "-" ,version "\n"))))
,name "-"
,(package-version this-package) "\n"))))
#t))
(add-before
'configure 'strip-configure-xml
@ -126,6 +128,45 @@ transform images, adjust image colors, apply various special effects, or draw
text, lines, polygons, ellipses and Bézier curves.")
(license (license:fsf-free "http://www.imagemagick.org/script/license.php"))))
(define-public imagemagick/fixed
(package
(inherit imagemagick)
(name "imagemagick")
;; 'g' for 'guix', appended character to retain version length so grafting
;; works properly.
(version "6.9.12-2g")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
;; Hardcode the version here since we had to
;; change it above.
"6.9.12-2.tar.xz"))
(sha256
(base32
"17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa"))))
(arguments
(substitute-keyword-arguments (package-arguments imagemagick)
((#:phases phases)
`(modify-phases ,phases
(add-after 'install 'fix-compat-cheat-rename-so
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion
(string-append (assoc-ref outputs "out")
"/lib")
(symlink "libMagick++-6.Q16.so.9.0.0"
"libMagick++-6.Q16.so.8.0.0")
(symlink "libMagick++-6.Q16.so.9"
"libMagick++-6.Q16.so.8")
(symlink "libMagickCore-6.Q16.so.7.0.0"
"libMagickCore-6.Q16.so.6.0.0")
(symlink "libMagickCore-6.Q16.so.7"
"libMagickCore-6.Q16.so.6")
(symlink "libMagickWand-6.Q16.so.7.0.0"
"libMagickWand-6.Q16.so.6.0.0")
(symlink "libMagickWand-6.Q16.so.7"
"libMagickWand-6.Q16.so.6"))
#t))))))))
(define-public perl-image-magick
(package
(name "perl-image-magick")

6
gnu/packages/irc.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@ -186,14 +186,14 @@ SILC and ICB protocols via plugins.")
(define-public weechat
(package
(name "weechat")
(version "3.0")
(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz"))
(sha256
(base32
"1yziv4cbcy61c9mb81c5sg3rmw6nh0srzwmry4svhriv6rdd5dvc"))))
"1xx4fx7785yw3ml3k1z08h3qvrizvcypwl0j6jc7d7qim9sjjnm5"))))
(build-system cmake-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)

3
gnu/packages/jami.scm
View File

@ -365,8 +365,7 @@ of Jami."
'())))
(define-public ffmpeg-jami
(package
(inherit ffmpeg)
(package/inherit ffmpeg
(name "ffmpeg-jami")
(native-inputs
`(("sfl-patches" ,%sfl-patches)

120
gnu/packages/java.scm
View File

@ -2696,10 +2696,101 @@ distribution.")))
`(#:jar-name "java-openjfx-graphics.jar"
#:source-dir "modules/graphics/src/main/java"
#:tests? #f; require X
#:test-dir "modules/graphics/src/test"))
#:test-dir "modules/graphics/src/test"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'copy-missing-file
(lambda* (#:key inputs #:allow-other-keys)
(let ((target "modules/graphics/src/main/native-prism-sw/JNativeSurface.c"))
(copy-file (assoc-ref inputs "JNativeSurface.c") target)
;; XXX: looks like the missing file we found isn't *quite*
;; compatible...
(substitute* target
(("case TYPE_INT_ARGB:") "")))))
(add-after 'build 'build-native
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((jdk (assoc-ref inputs "jdk"))
(class-file->class-name
(lambda (class-file)
(string-map (lambda (c)
(if (char=? c #\/) #\. c))
(string-drop-right class-file
(string-length ".class"))))))
(setenv "CPPFLAGS"
(string-append "-DINLINE=inline "
"-DLINUX "
"-I" jdk "/include "
"-I" jdk "/include/linux "
"-I " (getcwd) "/build/classes/include "
"-I " (getcwd) "/modules/graphics/src/main/native-prism-sw"))
;; Instructions have been adapted from buildSrc/linux.gradle
(with-directory-excursion "build/classes"
;; Build prism
(mkdir-p "include")
;; Generate headers for prism
(apply invoke "javah" "-d" "include" "-cp" "."
(map class-file->class-name
(append (find-files "com/sun/prism/impl" "\\.class$")
(find-files "com/sun/prism" "PresentableState.*\\.class$"))))
;; ...then for prism_sw
(apply invoke "javah" "-d" "include" "-cp" "."
(map class-file->class-name
(find-files "com/sun/pisces" "\\.class$")))
;; ...and for prism_es2
(apply invoke "javah" "-d" "include" "-cp" "."
(map class-file->class-name
(find-files "com/sun/prism/es2" "\\.class$")))))
(with-directory-excursion "netbeans/native-prism"
(invoke "make" "CONF=Release"))
(with-directory-excursion "netbeans/native-prism-sw"
(invoke "make" "CONF=Release"))
;; TODO: This fails due to unknown EGL procedure names
#;
(with-directory-excursion "netbeans/native-prism-es2"
(invoke "make" "CONF=Release"))
(let* ((out (assoc-ref outputs "out"))
(dir ,(match (%current-system)
("i686-linux"
"i386")
((or "armhf-linux" "aarch64-linux")
"arm")
((or "x86_64-linux")
"amd64")
(_ "unknown")))
(target (string-append out "/share/" dir "/")))
(mkdir-p target)
(for-each (lambda (file)
(let ((new-name
(string-append "lib"
(string-map
(lambda (c)
(if (char=? c #\-) #\_ c))
(string-drop (basename file)
(string-length "libnative-"))))))
(copy-file file
(string-append target new-name))))
(find-files "netbeans" "\\.so$"))))))))
(propagated-inputs
`(("java-openjfx-base" ,java-openjfx-base)
("java-swt" ,java-swt)))
;; XXX: for unknown reasons
;; modules/graphics/src/main/native-prism-sw/JNativeSurface.c is missing
;; in this revision.
(native-inputs
`(("JNativeSurface.c"
,(origin
(method url-fetch)
(uri "https://raw.githubusercontent.com/openjdk/jfx/8u20-b02\
/modules/graphics/src/main/native-prism-sw/JNativeSurface.c")
(sha256
(base32
"1kp15wbnd6rn0nciczp5ibq0ikby2yysvx1gnz5fa05vl2mm8mbm"))))))
(description "OpenJFX is a client application platform for desktop,
mobile and embedded systems built on Java. Its goal is to produce a
modern, efficient, and fully featured toolkit for developing rich client
@ -2721,6 +2812,33 @@ modern, efficient, and fully featured toolkit for developing rich client
applications. This package contains media-related classes for the
OpenJFX distribution.")))
(define-public java-openjfx-controls
(package (inherit java-openjfx-build)
(name "java-openjfx-controls")
(propagated-inputs
`(("java-openjxf-graphics" ,java-openjfx-graphics)))
(arguments
`(#:jar-name "java-openjfx-controls.jar"
#:source-dir "modules/controls/src/main/java"
#:test-dir "modules/controls/src/test"
;; TODO: tests require com.sun.javafx.pgstub,
;; javafx.collections.MockSetObserver, and
;; com.sun.javafx.binding.ExpressionHelperUtility
#:tests? #false
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'copy-resources
(lambda _
(copy-recursively "modules/controls/src/test/resources"
"build/test-classes")
(copy-recursively "modules/controls/src/main/resources"
"build/classes"))))))
(description "OpenJFX is a client application platform for desktop,
mobile and embedded systems built on Java. Its goal is to produce a
modern, efficient, and fully featured toolkit for developing rich client
applications. This package contains UI control classes for the
OpenJFX distribution.")))
(define-public javacc-4
(package
(name "javacc")

280
gnu/packages/julia-xyz.scm
View File

@ -20,7 +20,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system julia))
#:use-module (guix build-system julia)
#:use-module (gnu packages tls))
(define-public julia-adapt
(package
@ -32,7 +33,7 @@
(uri (git-reference
(url "https://github.com/JuliaGPU/Adapt.jl")
(commit (string-append "v" version))))
(file-name "Adapt")
(file-name (git-file-name name version))
(sha256
(base32 "1lks6k3a1gvwlplld47nh6xfy3nnlpc0vhkzg6zg0qn33qdmavrg"))))
(build-system julia-build-system)
@ -44,6 +45,56 @@ acts like @code{convert(T, x)}, but without the restriction of returning a
be GPU compatible without throwing away the wrapper.")
(license license:expat)))
(define-public julia-benchmarktools
(package
(name "julia-benchmarktools")
(version "0.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaCI/BenchmarkTools.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0nsx21m3i5h22lkgyrmfj6r085va6ag40khwssqs8y7l0wz98lvp"))))
(build-system julia-build-system)
(propagated-inputs `(("julia-json" ,julia-json)))
(home-page "https://github.com/JuliaCI/BenchmarkTools.jl")
(synopsis "Benchmarking framework for the Julia language")
(description "@code{BenchmarkTools.jl} makes performance tracking of Julia
code easy by supplying a framework for writing and running groups of
benchmarks as well as comparing benchmark results.")
(license license:expat)))
(define-public julia-bufferedstreams
(package
(name "julia-bufferedstreams")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/BioJulia/BufferedStreams.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sf4sxbq55mg2pwxyxf0c839z1lk0yxg8nmb7617bfbvw31cp88z"))))
(build-system julia-build-system)
;; The package is old and tests are using undefined functions. They also
;; freeze, see
;; https://travis-ci.org/BioJulia/BufferedStreams.jl/jobs/491050182
(arguments
'(#:tests? #f
#:julia-package-name "BufferedStreams"))
(propagated-inputs `(("julia-compat" ,julia-compat)))
(home-page "https://github.com/BioJulia/BufferedStreams.jl")
(synopsis "Fast composable IO streams")
(description "@code{BufferedStreams.jl} provides buffering for IO
operations. It can wrap any @code{IO} type automatically making incremental
reading and writing faster.")
(license license:expat)))
(define-public julia-compat
(package
(name "julia-compat")
@ -125,6 +176,127 @@ scaled by a constant factor. Consequently, they have a fixed number of
digits (bits) after the decimal (radix) point.")
(license license:expat)))
(define-public julia-http
(package
(name "julia-http")
(version "0.9.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaWeb/HTTP.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ij0yci13c46p92m4zywvcs02nn8pm0abyfffiyhxvva6hq48lyl"))))
(build-system julia-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'disable-network-tests
(lambda _
(substitute* "test/runtests.jl"
(("\"async.jl") "# \"async.jl")
(("\"client.jl") "# \"client.jl"))
(substitute* "test/aws4.jl"
(("@testset.*HTTP.request with AWS authentication.*" all)
(string-append all "return\n")))
(substitute* "test/insert_layers.jl"
(("@testset.*Inserted final layer runs handler.*" all)
(string-append all "return\n")))
(substitute* "test/multipart.jl"
(("@testset \"Setting of Content-Type.*" all)
(string-append all "return\n"))
(("@testset \"Deprecation of .*" all)
(string-append all "return\n")))
(substitute* "test/websockets.jl"
(("@testset.*External Host.*" all)
(string-append all "return\n")))
(substitute* "test/messages.jl"
(("@testset.*Read methods.*" all)
(string-append all "return\n"))
(("@testset.*Body - .*" all)
(string-append all "return\n"))
(("@testset.*Write to file.*" all)
(string-append all "return\n")))
#t)))))
(propagated-inputs
`(("julia-inifile" ,julia-inifile)
("julia-mbedtls" ,julia-mbedtls)
("julia-uris" ,julia-uris)))
;; required for tests
(inputs
`(("julia-json" ,julia-json)
("julia-bufferedstreams" ,julia-bufferedstreams)))
(home-page "https://juliaweb.github.io/HTTP.jl/")
(synopsis "HTTP support for Julia")
(description "@code{HTTP.jl} is a Julia library for HTTP Messages,
implementing both a client and a server.")
(license license:expat)))
(define-public julia-inifile
(package
(name "julia-inifile")
(version "0.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaIO/IniFile.jl")
(commit "8ba59958495fa276d6489d2c3903e765d75e0bc0")))
(file-name (git-file-name name version))
(sha256
(base32 "11h6f99jpbg729lplw841m68jprka7q3n8yw390bndlmcdsjabpd"))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaIO/IniFile.jl")
(synopsis "Reading Windows-style INI files")
(description "This is a Julia package that defines an IniFile type that
allows to interface with @file{.ini} files.")
(license license:expat)))
(define-public julia-jllwrappers
(package
(name "julia-jllwrappers")
(version "1.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaPackaging/JLLWrappers.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1sj3mi2dcc13apqfpy401wic5n0pgbck1p98b2g3zw0mln9s83m4"))))
(arguments
;; Wants to download stuff
'(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'custom-override-path
(lambda* (#:key inputs #:allow-other-keys)
;; Make @generate_wrapper_header take an optional argument that
;; guix packagers can pass to override the default "override"
;; binary path. This won't be needed when something like
;; https://github.com/JuliaPackaging/JLLWrappers.jl/pull/27
;; will be merged.
(substitute* "src/wrapper_generators.jl"
(("generate_wrapper_header.*")
"generate_wrapper_header(src_name, override_path = nothing)\n")
(("pkg_dir = .*" all)
(string-append
all "\n" "override = something(override_path,"
"joinpath(dirname(pkg_dir), \"override\"))\n"))
(("@static if isdir.*") "@static if isdir($override)\n")
(("return joinpath.*") "return $override\n"))
#t)))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaPackaging/JLLWrappers.jl")
(synopsis "Julia macros used by JLL packages")
(description "This package contains Julia macros that enable JLL packages
to generate themselves. It is not intended to be used by users, but rather is
used in autogenerated packages via @code{BinaryBuilder.jl}.")
(license license:expat)))
(define-public julia-json
(package
(name "julia-json")
@ -150,6 +322,76 @@ digits (bits) after the decimal (radix) point.")
and printing JSON documents.")
(license license:expat)))
(define-public julia-mbedtls
(package
(name "julia-mbedtls")
(version "1.0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaLang/MbedTLS.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0zjzf2r57l24n3k0gcqkvx3izwn5827iv9ak0lqix0aa5967wvfb"))))
(build-system julia-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'disable-network-tests
;; Tries to connect to httpbin.org
(lambda _
(substitute* "test/runtests.jl"
(("testhost =") "return #"))
#t)))))
(propagated-inputs `(("julia-mbedtls-jll" ,julia-mbedtls-jll)))
(home-page "https://github.com/JuliaLang/MbedTLS.jl")
(synopsis "Apache's mbed TLS library wrapper")
(description "@code{MbedTLS.jl} provides a wrapper around the @code{mbed
TLS} and cryptography C libary for Julia.")
(license license:expat)))
(define-public julia-mbedtls-jll
(package
(name "julia-mbedtls-jll")
;; version 2.25.0+0 is not compatible with current mbedtls 2.23.0,
;; upgrade this when mbedtls is updated in guix
(version "2.24.0+1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl")
(commit (string-append "MbedTLS-v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0kk9dlxdh7yms21npgrdfmjbj8q8ng6kdhrzw3jr2d7rp696kp99"))))
(build-system julia-build-system)
(arguments
'(#:tests? #f ; No runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
(substitute* wrapper
(("generate_wrapper_header.*")
(string-append
"generate_wrapper_header(\"MbedTLS\", \""
(assoc-ref inputs "mbedtls-apache") "\")\n"))))
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$"))
#t)))))
(inputs `(("mbedtls-apache" ,mbedtls-apache)))
(propagated-inputs `(("julia-jllwrappers" ,julia-jllwrappers)))
(home-page "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl")
(synopsis "Apache's mbed TLS binary wrappers")
(description "This Julia module provides @code{mbed TLS} libraries and
wrappers.")
(license license:expat)))
(define-public julia-orderedcollections
(package
(name "julia-orderedcollections")
@ -216,3 +458,37 @@ languages like Fortran.")
(description "@code{Parsers.jl} is a collection of type parsers and
utilities for Julia.")
(license license:expat)))
(define-public julia-uris
(package
(name "julia-uris")
(version "1.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaWeb/URIs.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0fqyagsqks5za7m0czafr34m2xh5501f689k9cn5x3npajdnh2r3"))))
(build-system julia-build-system)
(arguments
'(#:julia-package-name "URIs" ;required to run tests
#:phases
(modify-phases %standard-phases
(add-before 'check 'change-dir
;; Tests must be run from the testdir
(lambda* (#:key source outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(chdir
(string-append out "/share/julia/packages/URIs/test")))
#t)))))
;; required for tests
(inputs `(("julia-json" ,julia-json)))
(home-page "https://github.com/JuliaWeb/URIs.jl")
(synopsis "URI parsing in Julia")
(description "@code{URIs.jl} is a Julia package that allows parsing and
working with @acronym{URIs,Uniform Resource Identifiers}, as defined in RFC
3986.")
(license license:expat)))

2
gnu/packages/kde-multimedia.scm
View File

@ -68,7 +68,7 @@
("ki18n" ,ki18n)
("kio" ,kio)
("libkcddb" ,libkcddb)
("libkcompactdisc", libkcompactdisc)
("libkcompactdisc" ,libkcompactdisc)
("libvorbis" ,libvorbis)
("phonon" ,phonon)
("qtbase" ,qtbase)))

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