summaryrefslogtreecommitdiff
path: root/common/misc.js
diff options
context:
space:
mode:
Diffstat (limited to 'common/misc.js')
0 files changed, 0 insertions, 0 deletions
8b9e61.zip
Merge branch 'staging' into core-updates
Diffstat
-rw-r--r--HACKING7
-rw-r--r--build-aux/run-system-tests.scm2
-rw-r--r--doc/guix.texi1189
-rw-r--r--gnu/installer/connman.scm2
-rw-r--r--gnu/installer/newt/keymap.scm2
-rw-r--r--gnu/installer/newt/page.scm2
-rw-r--r--gnu/installer/newt/timezone.scm5
-rw-r--r--gnu/installer/newt/utils.scm2
-rw-r--r--gnu/installer/newt/wifi.scm8
-rw-r--r--gnu/installer/parted.scm6
-rw-r--r--gnu/installer/timezone.scm10
-rw-r--r--gnu/local.mk26
-rw-r--r--gnu/packages.scm53
-rw-r--r--gnu/packages/admin.scm54
-rw-r--r--gnu/packages/aidc.scm29
-rw-r--r--gnu/packages/algebra.scm146
-rw-r--r--gnu/packages/assembly.scm12
-rw-r--r--gnu/packages/audio.scm38
-rw-r--r--gnu/packages/aux-files/chromium/master-preferences.json26
-rw-r--r--gnu/packages/backup.scm44
-rw-r--r--gnu/packages/base.scm5
-rw-r--r--gnu/packages/bioconductor.scm23
-rw-r--r--gnu/packages/bioinformatics.scm306
-rw-r--r--gnu/packages/bittorrent.scm22
-rw-r--r--gnu/packages/bootloaders.scm12
-rw-r--r--gnu/packages/busybox.scm6
-rw-r--r--gnu/packages/check.scm32
-rw-r--r--gnu/packages/chez.scm155
-rw-r--r--gnu/packages/chromium.scm705
-rw-r--r--gnu/packages/compression.scm77
-rw-r--r--gnu/packages/conky.scm18
-rw-r--r--gnu/packages/coq.scm81
-rw-r--r--gnu/packages/cran.scm150
-rw-r--r--gnu/packages/crypto.scm6
-rw-r--r--gnu/packages/cups.scm52
-rw-r--r--gnu/packages/curl.scm10
-rw-r--r--gnu/packages/databases.scm37
-rw-r--r--gnu/packages/debug.scm36
-rw-r--r--gnu/packages/dictionaries.scm2
-rw-r--r--gnu/packages/disk.scm32
-rw-r--r--gnu/packages/dlang.scm4
-rw-r--r--gnu/packages/dns.scm28
-rw-r--r--gnu/packages/docker.scm13
-rw-r--r--gnu/packages/documentation.scm13
-rw-r--r--gnu/packages/efi.scm10
-rw-r--r--gnu/packages/emacs-xyz.scm183
-rw-r--r--gnu/packages/engineering.scm9
-rw-r--r--gnu/packages/file-systems.scm4
-rw-r--r--gnu/packages/finance.scm168
-rw-r--r--gnu/packages/flashing-tools.scm20
-rw-r--r--gnu/packages/fonts.scm51
-rw-r--r--gnu/packages/ftp.scm8
-rw-r--r--gnu/packages/game-development.scm12
-rw-r--r--gnu/packages/games.scm74
-rw-r--r--gnu/packages/gd.scm11
-rw-r--r--gnu/packages/genimage.scm194
-rw-r--r--gnu/packages/geo.scm27
-rw-r--r--gnu/packages/gimp.scm16
-rw-r--r--gnu/packages/gl.scm6
-rw-r--r--gnu/packages/gnome.scm334
-rw-r--r--gnu/packages/gnupg.scm19
-rw-r--r--gnu/packages/gnuzilla.scm4
-rw-r--r--gnu/packages/gtk.scm29
-rw-r--r--gnu/packages/guile-xyz.scm101
-rw-r--r--gnu/packages/hardware.scm12
-rw-r--r--gnu/packages/ibus.scm145
-rw-r--r--gnu/packages/image-processing.scm8
-rw-r--r--gnu/packages/image-viewers.scm6
-rw-r--r--gnu/packages/image.scm42
-rw-r--r--gnu/packages/irc.scm8
-rw-r--r--gnu/packages/java.scm41
-rw-r--r--gnu/packages/kde-frameworks.scm337
-rw-r--r--gnu/packages/kde-plasma.scm228
-rw-r--r--gnu/packages/kde.scm101
-rw-r--r--gnu/packages/kodi.scm6
-rw-r--r--gnu/packages/libffi.scm6
-rw-r--r--gnu/packages/libreoffice.scm36
-rw-r--r--gnu/packages/linux.scm42
-rw-r--r--gnu/packages/lisp.scm15
-rw-r--r--gnu/packages/llvm.scm88
-rw-r--r--gnu/packages/lxqt.scm2
-rw-r--r--gnu/packages/machine-learning.scm3
-rw-r--r--gnu/packages/magic-wormhole.scm160
-rw-r--r--gnu/packages/mail.scm42
-rw-r--r--gnu/packages/maths.scm110
-rw-r--r--gnu/packages/maven.scm12
-rw-r--r--gnu/packages/mpi.scm27
-rw-r--r--gnu/packages/multiprecision.scm15
-rw-r--r--gnu/packages/music.scm18
-rw-r--r--gnu/packages/musl.scm12
-rw-r--r--gnu/packages/ncdu.scm6
-rw-r--r--gnu/packages/ncurses.scm8
-rw-r--r--gnu/packages/netpbm.scm4
-rw-r--r--gnu/packages/networking.scm46
-rw-r--r--gnu/packages/ocaml.scm228
-rw-r--r--gnu/packages/package-management.scm87
-rw-r--r--gnu/packages/parallel.scm6
-rw-r--r--gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch41
-rw-r--r--gnu/packages/patches/clang-7.0-libc-search-path.patch82
-rw-r--r--gnu/packages/patches/dealii-mpi-deprecations.patch28
-rw-r--r--gnu/packages/patches/doxygen-test.patch8
-rw-r--r--gnu/packages/patches/gd-CVE-2019-6977.patch36
-rw-r--r--gnu/packages/patches/gd-CVE-2019-6978.patch301
-rw-r--r--gnu/packages/patches/glibc-CVE-2018-11236.patch149
-rw-r--r--gnu/packages/patches/glibc-CVE-2018-11237.patch55
-rw-r--r--gnu/packages/patches/kio-search-smbd-on-PATH.patch2
-rw-r--r--gnu/packages/patches/ledger-revert-boost-python-fix.patch39
-rw-r--r--gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch15
-rw-r--r--gnu/packages/patches/pius.patch38
-rw-r--r--gnu/packages/patches/qtbase-old-kernel.patch25
-rw-r--r--gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch52
-rw-r--r--gnu/packages/patches/ruby-safe-yaml-add-require-time.patch19
-rw-r--r--gnu/packages/patches/runc-CVE-2019-5736.patch343
-rw-r--r--gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch170
-rw-r--r--gnu/packages/patches/soundconverter-remove-gconf-dependency.patch104
-rw-r--r--gnu/packages/patches/tomsfastmath-constness.patch76
-rw-r--r--gnu/packages/patches/xf86-video-i128-remove-mibstore.patch23
-rw-r--r--gnu/packages/patches/xmodmap-asprintf.patch14
-rw-r--r--gnu/packages/pdf.scm17
-rw-r--r--gnu/packages/perl.scm17
-rw-r--r--gnu/packages/python-crypto.scm82
-rw-r--r--gnu/packages/python-web.scm116
-rw-r--r--gnu/packages/python-xyz.scm189
-rw-r--r--gnu/packages/python.scm62
-rw-r--r--gnu/packages/qt.scm33
-rw-r--r--gnu/packages/rails.scm372
-rw-r--r--gnu/packages/rdesktop.scm26
-rw-r--r--gnu/packages/rrdtool.scm6
-rw-r--r--gnu/packages/ruby.scm1777
-rw-r--r--gnu/packages/rust.scm16
-rw-r--r--gnu/packages/sagemath.scm59
-rw-r--r--gnu/packages/sdl.scm48
-rw-r--r--gnu/packages/search.scm6
-rw-r--r--gnu/packages/security-token.scm8
-rw-r--r--gnu/packages/simh.scm19
-rw-r--r--gnu/packages/skarnet.scm6
-rw-r--r--gnu/packages/statistics.scm23
-rw-r--r--gnu/packages/suckless.scm4
-rw-r--r--gnu/packages/sync.scm43
-rw-r--r--gnu/packages/terminals.scm55
-rw-r--r--gnu/packages/textutils.scm4
-rw-r--r--gnu/packages/tls.scm24
-rw-r--r--gnu/packages/tmux.scm23
-rw-r--r--gnu/packages/tor.scm7
-rw-r--r--gnu/packages/version-control.scm19
-rw-r--r--gnu/packages/video.scm62
-rw-r--r--gnu/packages/vim.scm12
-rw-r--r--gnu/packages/virtualization.scm16
-rw-r--r--gnu/packages/web-browsers.scm4
-rw-r--r--gnu/packages/web.scm103
-rw-r--r--gnu/packages/wine.scm6
-rw-r--r--gnu/packages/wm.scm66
-rw-r--r--gnu/packages/xdisorg.scm53
-rw-r--r--gnu/packages/xml.scm36
-rw-r--r--gnu/packages/xorg.scm123
-rw-r--r--gnu/services/desktop.scm109
-rw-r--r--gnu/services/xorg.scm121
-rw-r--r--gnu/system/vm.scm6
-rw-r--r--guix/build/ruby-build-system.scm53
-rw-r--r--guix/git.scm8
-rw-r--r--guix/gnu-maintenance.scm3
-rw-r--r--guix/inferior.scm26
-rw-r--r--guix/scripts/archive.scm2
-rw-r--r--guix/scripts/build.scm2
-rw-r--r--guix/scripts/copy.scm2
-rw-r--r--guix/scripts/environment.scm55
-rw-r--r--guix/scripts/pack.scm6
-rw-r--r--guix/scripts/package.scm3
-rw-r--r--guix/scripts/pull.scm65
-rw-r--r--guix/scripts/system.scm22
-rw-r--r--guix/self.scm20
-rw-r--r--guix/status.scm3
-rw-r--r--guix/ui.scm11
-rw-r--r--po/guix/da.po1439
-rw-r--r--po/guix/de.po1464
-rw-r--r--po/packages/da.po8527
-rw-r--r--po/packages/de.po22021
-rw-r--r--tests/guix-environment.sh15
-rw-r--r--tests/inferior.scm22
-rw-r--r--tests/packages.scm3
180 files changed, 37993 insertions, 7852 deletions
diff --git a/HACKING b/HACKING
index f68753fee9..de7bffea84 100644
--- a/HACKING
+++ b/HACKING
@@ -2,7 +2,7 @@
#+TITLE: Hacking GNU Guix and Its Incredible Distro
-Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+Copyright © 2012, 2013, 2014, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
Copyright © 2015, 2017 Mathieu Lirzin <mthl@gnu.org>
Copyright © 2017 Leo Famulari <leo@famulari.name>
Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@@ -41,8 +41,9 @@ make sure to run ‘git pull --rebase’.
All commits that are pushed to the central repository on Savannah must be
signed with an OpenPGP key, and the public key should be uploaded to your user
-account on Savannah and to public key servers, such as ‘pgp.mit.edu’. To
-configure Git to automatically sign commits, run:
+account on Savannah and to public key servers, such as
+‘pool.sks-keyservers.net’. To configure Git to automatically sign commits,
+run:
git config commit.gpgsign true
git config user.signingkey CABBA6EA1DC0FF33
diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm
index fd1f6653af..18f7393d81 100644
--- a/build-aux/run-system-tests.scm
+++ b/build-aux/run-system-tests.scm
@@ -19,7 +19,7 @@
(define-module (run-system-tests)
#:use-module (gnu tests)
#:use-module (guix store)
- #:use-module (guix status)
+ #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix monads)
#:use-module (guix derivations)
#:use-module (guix ui)
diff --git a/doc/guix.texi b/doc/guix.texi
index a1a37771cc..dc3b5448b1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -31,9 +31,10 @@ Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@*
Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016, 2017 Nils Gillmann@*
-Copyright @copyright{} 2016, 2017, 2018 Jan Nieuwenhuizen@*
+Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@*
Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@*
+Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@*
Copyright @copyright{} 2017, 2018 Clément Lassieur@*
Copyright @copyright{} 2017, 2018 Mathieu Othacehe@*
Copyright @copyright{} 2017 Federico Beffa@*
@@ -119,6 +120,7 @@ Project}.
* Installation:: Installing Guix.
* System Installation:: Installing the whole operating system.
* Package Management:: Package installation, upgrade, etc.
+* Development:: Guix-aided software development.
* Programming Interface:: Using Guix in Scheme.
* Utilities:: Package management commands.
* System Configuration:: Configuring the operating system.
@@ -137,6 +139,11 @@ Project}.
@detailmenu
--- The Detailed Node Listing ---
+Introduction
+
+* Managing Software the Guix Way:: What's special.
+* GNU Distribution:: The packages and tools.
+
Installation
* Binary Installation:: Getting Guix running in no time!
@@ -159,7 +166,7 @@ System Installation
* USB Stick and DVD Installation:: Preparing the installation medium.
* Preparing for Installation:: Networking, partitioning, etc.
* Proceeding with the Installation:: The real thing.
-* Installing Guix in a VM:: Guix System playground.
+* Installing Guix in a VM:: Guix System playground.
* Building the Installation Image:: How this comes to be.
Package Management
@@ -173,7 +180,6 @@ Package Management
* Channels:: Customizing the package collection.
* Inferiors:: Interacting with another revision of Guix.
* Invoking guix describe:: Display information about your Guix revision.
-* Invoking guix pack:: Creating software bundles.
* Invoking guix archive:: Exporting and importing store files.
Substitutes
@@ -185,6 +191,11 @@ Substitutes
* Substitution Failure:: What happens when substitution fails.
* On Trusting Binaries:: How can you trust that binary blob?
+Development
+
+* Invoking guix environment:: Setting up development environments.
+* Invoking guix pack:: Creating software bundles.
+
Programming Interface
* Package Modules:: Packages from the programmer's viewpoint.
@@ -212,7 +223,6 @@ Utilities
* Invoking guix lint:: Finding errors in package definitions.
* Invoking guix size:: Profiling disk usage.
* Invoking guix graph:: Visualizing the graph of packages.
-* Invoking guix environment:: Setting up development environments.
* Invoking guix publish:: Sharing substitutes.
* Invoking guix challenge:: Challenging substitute servers.
* Invoking guix copy:: Copying to and from a remote store.
@@ -242,7 +252,7 @@ System Configuration
* Initial RAM Disk:: Linux-Libre bootstrapping.
* Bootloader Configuration:: Configuring the boot loader.
* Invoking guix system:: Instantiating a system configuration.
-* Running Guix in a VM:: How to run Guix System in a virtual machine.
+* Running Guix in a VM:: How to run Guix System in a virtual machine.
* Defining Services:: Adding new service definitions.
Services
@@ -309,12 +319,18 @@ group everything under the ``Guix'' banner since, after all, Guix System is
readily available through the @command{guix system} command, even if you're
using a different distro underneath!}. @xref{GNU Distribution}.
+@menu
+* Managing Software the Guix Way:: What's special.
+* GNU Distribution:: The packages and tools.
+@end menu
+
@node Managing Software the Guix Way
@section Managing Software the Guix Way
@cindex user interfaces
Guix provides a command-line package management interface
-(@pxref{Invoking guix package}), a set of command-line utilities
+(@pxref{Package Management}), tools to help with software development
+(@pxref{Development}), command-line utilities for more advanced usage,
(@pxref{Utilities}), as well as Scheme programming interfaces
(@pxref{Programming Interface}).
@cindex build daemon
@@ -1762,7 +1778,7 @@ available.
* USB Stick and DVD Installation:: Preparing the installation medium.
* Preparing for Installation:: Networking, partitioning, etc.
* Proceeding with the Installation:: The real thing.
-* Installing Guix in a VM:: Guix System playground.
+* Installing Guix in a VM:: Guix System playground.
* Building the Installation Image:: How this comes to be.
@end menu
@@ -2253,7 +2269,7 @@ you are installing GRUB in the legacy way, or @code{grub-efi-bootloader}
for newer UEFI systems. For legacy systems, the @code{target} field
names a device, like @code{/dev/sda}; for UEFI systems it names a path
to a mounted EFI partition, like @code{/boot/efi}; do make sure the path is
-currently mounted and a @code{file-sytem} entry is specified in your
+currently mounted and a @code{file-system} entry is specified in your
configuration.
@item
@@ -2431,7 +2447,6 @@ guix package -i emacs-guix
* Channels:: Customizing the package collection.
* Inferiors:: Interacting with another revision of Guix.
* Invoking guix describe:: Display information about your Guix revision.
-* Invoking guix pack:: Creating software bundles.
* Invoking guix archive:: Exporting and importing store files.
@end menu
@@ -3705,9 +3720,8 @@ share your improvements, which are basic tenets of
email us at @email{guix-devel@@gnu.org} if you'd like to discuss this.
@end quotation
-Once you have a Git repository containing your own package modules, you can
-write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to
-pull from your personal channel @emph{in addition} to the default Guix
+To use a channel, write @code{~/.config/guix/channels.scm} to instruct
+@command{guix pull} to pull from it @emph{in addition} to the default Guix
channel(s):
@vindex %default-channels
@@ -3751,6 +3765,17 @@ the new and upgraded packages that are listed, some like @code{my-gimp} and
@code{my-emacs-with-cool-features} might come from
@code{my-personal-packages}, while others come from the Guix default channel.
+To create a channel, create a Git repository containing your own package
+modules and make it available. The repository can contain anything, but a
+useful channel will contain Guile modules that export packages. Once you
+start using a channel, Guix will behave as if the root directory of that
+channel's Git repository has been added to the Guile load path (@pxref{Load
+Paths,,, guile, GNU Guile Reference Manual}). For example, if your channel
+contains a file at @file{my-packages/my-tools.scm} that defines a Guile
+module, then the module will be available under the name @code{(my-packages
+my-tools)}, and you will be able to use it like any other module
+(@pxref{Modules,,, guile, GNU Guile Reference Manual}).
+
@cindex dependencies, channels
@cindex meta-data, channels
@subsection Declaring Channel Dependencies
@@ -4030,6 +4055,526 @@ produce a list of channel specifications in Recutils format.
Display information about @var{profile}.
@end table
+@node Invoking guix archive
+@section Invoking @command{guix archive}
+
+@cindex @command{guix archive}
+@cindex archive
+The @command{guix archive} command allows users to @dfn{export} files
+from the store into a single archive, and to later @dfn{import} them on
+a machine that runs Guix.
+In particular, it allows store files to be transferred from one machine
+to the store on another machine.
+
+@quotation Note
+If you're looking for a way to produce archives in a format suitable for
+tools other than Guix, @pxref{Invoking guix pack}.
+@end quotation
+
+@cindex exporting store items
+To export store files as an archive to standard output, run:
+
+@example
+guix archive --export @var{options} @var{specifications}...
+@end example
+
+@var{specifications} may be either store file names or package
+specifications, as for @command{guix package} (@pxref{Invoking guix
+package}). For instance, the following command creates an archive
+containing the @code{gui} output of the @code{git} package and the main
+output of @code{emacs}:
+
+@example
+guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar
+@end example
+
+If the specified packages are not built yet, @command{guix archive}
+automatically builds them. The build process may be controlled with the
+common build options (@pxref{Common Build Options}).
+
+To transfer the @code{emacs} package to a machine connected over SSH,
+one would run:
+
+@example
+guix archive --export -r emacs | ssh the-machine guix archive --import
+@end example
+
+@noindent
+Similarly, a complete user profile may be transferred from one machine
+to another like this:
+
+@example
+guix archive --export -r $(readlink -f ~/.guix-profile) | \
+ ssh the-machine guix-archive --import
+@end example
+
+@noindent
+However, note that, in both examples, all of @code{emacs} and the
+profile as well as all of their dependencies are transferred (due to
+@code{-r}), regardless of what is already available in the store on the
+target machine. The @code{--missing} option can help figure out which
+items are missing from the target store. The @command{guix copy}
+command simplifies and optimizes this whole process, so this is probably
+what you should use in this case (@pxref{Invoking guix copy}).
+
+@cindex nar, archive format
+@cindex normalized archive (nar)
+Archives are stored in the ``normalized archive'' or ``nar'' format, which is
+comparable in spirit to `tar', but with differences
+that make it more appropriate for our purposes. First, rather than
+recording all Unix metadata for each file, the nar format only mentions
+the file type (regular, directory, or symbolic link); Unix permissions
+and owner/group are dismissed. Second, the order in which directory
+entries are stored always follows the order of file names according to
+the C locale collation order. This makes archive production fully
+deterministic.
+
+When exporting, the daemon digitally signs the contents of the archive,
+and that digital signature is appended. When importing, the daemon
+verifies the signature and rejects the import in case of an invalid
+signature or if the signing key is not authorized.
+@c FIXME: Add xref to daemon doc about signatures.
+
+The main options are:
+
+@table @code
+@item --export
+Export the specified store files or packages (see below.) Write the
+resulting archive to the standard output.
+
+Dependencies are @emph{not} included in the output, unless
+@code{--recursive} is passed.
+
+@item -r
+@itemx --recursive
+When combined with @code{--export}, this instructs @command{guix
+archive} to include dependencies of the given items in the archive.
+Thus, the resulting archive is self-contained: it contains the closure
+of the exported store items.
+
+@item --import
+Read an archive from the standard input, and import the files listed
+therein into the store. Abort if the archive has an invalid digital
+signature, or if it is signed by a public key not among the authorized
+keys (see @code{--authorize} below.)
+
+@item --missing
+Read a list of store file names from the standard input, one per line,
+and write on the standard output the subset of these files missing from
+the store.
+
+@item --generate-key[=@var{parameters}]
+@cindex signing, archives
+Generate a new key pair for the daemon. This is a prerequisite before
+archives can be exported with @code{--export}. Note that this operation
+usually takes time, because it needs to gather enough entropy to
+generate the key pair.
+
+The generated key pair is typically stored under @file{/etc/guix}, in
+@file{signing-key.pub} (public key) and @file{signing-key.sec} (private
+key, which must be kept secret.) When @var{parameters} is omitted,
+an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt
+versions before 1.6.0, it is a 4096-bit RSA key.
+Alternatively, @var{parameters} can specify
+@code{genkey} parameters suitable for Libgcrypt (@pxref{General
+public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The
+Libgcrypt Reference Manual}).
+
+@item --authorize
+@cindex authorizing, archives
+Authorize imports signed by the public key passed on standard input.
+The public key must be in ``s-expression advanced format''---i.e., the
+same format as the @file{signing-key.pub} file.
+
+The list of authorized keys is kept in the human-editable file
+@file{/etc/guix/acl}. The file contains
+@url{http://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format
+s-expressions''} and is structured as an access-control list in the
+@url{http://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure
+(SPKI)}.
+
+@item --extract=@var{directory}
+@itemx -x @var{directory}
+Read a single-item archive as served by substitute servers
+(@pxref{Substitutes}) and extract it to @var{directory}. This is a
+low-level operation needed in only very narrow use cases; see below.
+
+For example, the following command extracts the substitute for Emacs
+served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:
+
+@example
+$ wget -O - \
+ https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \
+ | bunzip2 | guix archive -x /tmp/emacs
+@end example
+
+Single-item archives are different from multiple-item archives produced
+by @command{guix archive --export}; they contain a single store item,
+and they do @emph{not} embed a signature. Thus this operation does
+@emph{no} signature verification and its output should be considered
+unsafe.
+
+The primary purpose of this operation is to facilitate inspection of
+archive contents coming from possibly untrusted substitute servers.
+
+@end table
+
+
+@c *********************************************************************
+@node Development
+@chapter Development
+
+@cindex software development
+If you are a software developer, Guix provides tools that you should find
+helpful---independently of the language you're developing in. This is what
+this chapter is about.
+
+The @command{guix environment} command provides a convenient way to set up
+@dfn{development environments} containing all the dependencies and tools
+necessary to work on the software package of your choice. The @command{guix
+pack} command allows you to create @dfn{application bundles} that can be
+easily distributed to users who do not run Guix.
+
+@menu
+* Invoking guix environment:: Setting up development environments.
+* Invoking guix pack:: Creating software bundles.
+@end menu
+
+@node Invoking guix environment
+@section Invoking @command{guix environment}
+
+@cindex reproducible build environments
+@cindex development environments
+@cindex @command{guix environment}
+@cindex environment, package build environment
+The purpose of @command{guix environment} is to assist hackers in
+creating reproducible development environments without polluting their
+package profile. The @command{guix environment} tool takes one or more
+packages, builds all of their inputs, and creates a shell
+environment to use them.
+
+The general syntax is:
+
+@example
+guix environment @var{options} @var{package}@dots{}
+@end example
+
+The following example spawns a new shell set up for the development of
+GNU@tie{}Guile:
+
+@example
+guix environment guile
+@end example
+
+If the needed dependencies are not built yet, @command{guix environment}
+automatically builds them. The environment of the new shell is an augmented
+version of the environment that @command{guix environment} was run in.
+It contains the necessary search paths for building the given package
+added to the existing environment variables. To create a ``pure''
+environment, in which the original environment variables have been unset,
+use the @code{--pure} option@footnote{Users sometimes wrongfully augment
+environment variables such as @code{PATH} in their @file{~/.bashrc}
+file. As a consequence, when @code{guix environment} launches it, Bash
+may read @file{~/.bashrc}, thereby introducing ``impurities'' in these
+environment variables. It is an error to define such environment
+variables in @file{.bashrc}; instead, they should be defined in
+@file{.bash_profile}, which is sourced only by log-in shells.
+@xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for
+details on Bash start-up files.}.
+
+@vindex GUIX_ENVIRONMENT
+@command{guix environment} defines the @code{GUIX_ENVIRONMENT}
+variable in the shell it spawns; its value is the file name of the
+profile of this environment. This allows users to, say, define a
+specific prompt for development environments in their @file{.bashrc}
+(@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):
+
+@example
+if [ -n "$GUIX_ENVIRONMENT" ]
+then
+ export PS1="\u@@\h \w [dev]\$ "
+fi
+@end example
+
+@noindent
+...@: or to browse the profile:
+
+@example
+$ ls "$GUIX_ENVIRONMENT/bin"
+@end example
+
+Additionally, more than one package may be specified, in which case the
+union of the inputs for the given packages are used. For example, the
+command below spawns a shell where all of the dependencies of both Guile
+and Emacs are available:
+
+@example
+guix environment guile emacs
+@end example
+
+Sometimes an interactive shell session is not desired. An arbitrary
+command may be invoked by placing the @code{--} token to separate the
+command from the rest of the arguments:
+
+@example
+guix environment guile -- make -j4
+@end example
+
+In other situations, it is more convenient to specify the list of
+packages needed in the environment. For example, the following command
+runs @command{python} from an environment containing Python@tie{}2.7 and
+NumPy:
+
+@example
+guix environment --ad-hoc python2-numpy python-2.7 -- python
+@end example
+
+Furthermore, one might want the dependencies of a package and also some
+additional packages that are not build-time or runtime dependencies, but
+are useful when developing nonetheless. Because of this, the
+@code{--ad-hoc} flag is positional. Packages appearing before
+@code{--ad-hoc} are interpreted as packages whose dependencies will be
+added to the environment. Packages appearing after are interpreted as
+packages that will be added to the environment directly. For example,
+the following command creates a Guix development environment that
+additionally includes Git and strace:
+
+@example
+guix environment guix --ad-hoc git strace
+@end example
+
+Sometimes it is desirable to isolate the environment as much as
+possible, for maximal purity and reproducibility. In particular, when
+using Guix on a host distro that is not Guix System, it is desirable to
+prevent access to @file{/usr/bin} and other system-wide resources from
+the development environment. For example, the following command spawns
+a Guile REPL in a ``container'' where only the store and the current
+working directory are mounted:
+
+@example
+guix environment --ad-hoc --container guile -- guile
+@end example
+
+@quotation Note
+The @code{--container} option requires Linux-libre 3.19 or newer.
+@end quotation
+
+The available options are summarized below.
+
+@table @code
+@item --root=@var{file}
+@itemx -r @var{file}
+@cindex persistent environment
+@cindex garbage collector root, for environments
+Make @var{file} a symlink to the profile for this environment, and
+register it as a garbage collector root.
+
+This is useful if you want to protect your environment from garbage
+collection, to make it ``persistent''.
+
+When this option is omitted, the environment is protected from garbage
+collection only for the duration of the @command{guix environment}
+session. This means that next time you recreate the same environment,
+you could have to rebuild or re-download packages. @xref{Invoking guix
+gc}, for more on GC roots.
+
+@item --expression=@var{expr}
+@itemx -e @var{expr}
+Create an environment for the package or list of packages that
+@var{expr} evaluates to.
+
+For example, running:
+
+@example
+guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'
+@end example
+
+starts a shell with the environment for this specific variant of the
+PETSc package.
+
+Running:
+
+@example
+guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'
+@end example
+
+starts a shell with all the base system packages available.
+
+The above commands only use the default output of the given packages.
+To select other outputs, two element tuples can be specified:
+
+@example
+guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) "include")'
+@end example
+
+@item --load=@var{file}
+@itemx -l @var{file}
+Create an environment for the package or list of packages that the code
+within @var{file} evaluates to.
+
+As an example, @var{file} might contain a definition like this
+(@pxref{Defining Packages}):
+
+@example
+@verbatiminclude environment-gdb.scm
+@end example
+
+@item --manifest=@var{file}
+@itemx -m @var{file}
+Create an environment for the packages contained in the manifest object
+returned by the Scheme code in @var{file}.
+
+This is similar to the same-named option in @command{guix package}
+(@pxref{profile-manifest, @option{--manifest}}) and uses the same
+manifest files.
+
+@item --ad-hoc
+Include all specified packages in the resulting environment, as if an
+@i{ad hoc} package were defined with them as inputs. This option is
+useful for quickly creating an environment without having to write a
+package expression to contain the desired inputs.
+
+For instance, the command:
+
+@example
+guix environment --ad-hoc guile guile-sdl -- guile
+@end example
+
+runs @command{guile} in an environment where Guile and Guile-SDL are
+available.
+
+Note that this example implicitly asks for the default output of
+@code{guile} and @code{guile-sdl}, but it is possible to ask for a
+specific output---e.g., @code{glib:bin} asks for the @code{bin} output
+of @code{glib} (@pxref{Packages with Multiple Outputs}).
+
+This option may be composed with the default behavior of @command{guix
+environment}. Packages appearing before @code{--ad-hoc} are interpreted
+as packages whose dependencies will be added to the environment, the
+default behavior. Packages appearing after are interpreted as packages
+that will be added to the environment directly.
+
+@item --pure
+Unset existing environment variables when building the new environment, except
+those specified with @option{--inherit} (see below.) This has the effect of
+creating an environment in which search paths only contain package inputs.
+
+@item --inherit=@var{regexp}
+When used alongside @option{--pure}, inherit all the environment variables
+matching @var{regexp}---in other words, put them on a ``white list'' of
+environment variables that must be preserved. This option can be repeated
+several times.
+
+@example
+guix environment --pure --inherit=^SLURM --ad-hoc openmpi @dots{} \
+ -- mpirun @dots{}
+@end example
+
+This example runs @command{mpirun} in a context where the only environment
+variables defined are @code{PATH}, environment variables whose name starts
+with @code{SLURM}, as well as the usual ``precious'' variables (@code{HOME},
+@code{USER}, etc.)
+
+@item --search-paths
+Display the environment variable definitions that make up the
+environment.
+
+@item --system=@var{system}
+@itemx -s @var{system}
+Attempt to build for @var{system}---e.g., @code{i686-linux}.
+
+@item --container
+@itemx -C
+@cindex container
+Run @var{command} within an isolated container. The current working
+directory outside the container is mapped inside the container.
+Additionally, unless overridden with @code{--user}, a dummy home
+directory is created that matches the current user's home directory, and
+@file{/etc/passwd} is configured accordingly. The spawned process runs
+as the current user outside the container, but has root privileges in
+the context of the container.
+
+@item --network
+@itemx -N
+For containers, share the network namespace with the host system.
+Containers created without this flag only have access to the loopback
+device.
+
+@item --link-profile
+@itemx -P
+For containers, link the environment profile to
+@file{~/.guix-profile} within the container. This is equivalent to
+running the command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile}
+within the container. Linking will fail and abort the environment if
+the directory already exists, which will certainly be the case if
+@command{guix environment} was invoked in the user's home directory.
+
+Certain packages are configured to look in
+@code{~/.guix-profile} for configuration files and data;@footnote{For
+example, the @code{fontconfig} package inspects
+@file{~/.guix-profile/share/fonts} for additional fonts.}
+@code{--link-profile} allows these programs to behave as expected within
+the environment.
+
+@item --user=@var{user}
+@itemx -u @var{user}
+For containers, use the username @var{user} in place of the current
+user. The generated @file{/etc/passwd} entry within the container will
+contain the name @var{user}; the home directory will be
+@file{/home/USER}; and no user GECOS data will be copied. @var{user}
+need not exist on the system.
+
+Additionally, any shared or exposed path (see @code{--share} and
+@code{--expose} respectively) whose target is within the current user's
+home directory will be remapped relative to @file{/home/USER}; this
+includes the automatic mapping of the current working directory.
+
+@example
+# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target
+cd $HOME/wd
+guix environment --container --user=foo \
+ --expose=$HOME/test \
+ --expose=/tmp/target=$HOME/target
+@end example
+
+While this will limit the leaking of user identity through home paths
+and each of the user fields, this is only one useful component of a
+broader privacy/anonymity solution---not one in and of itself.
+
+@item --expose=@var{source}[=@var{target}]
+For containers, expose the file system @var{source} from the host system
+as the read-only file system @var{target} within the container. If
+@var{target} is not specified, @var{source} is used as the target mount
+point in the container.
+
+The example below spawns a Guile REPL in a container in which the user's
+home directory is accessible read-only via the @file{/exchange}
+directory:
+
+@example
+guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile
+@end example
+
+@item --share=@var{source}[=@var{target}]
+For containers, share the file system @var{source} from the host system
+as the writable file system @var{target} within the container. If
+@var{target} is not specified, @var{source} is used as the target mount
+point in the container.
+
+The example below spawns a Guile REPL in a container in which the user's
+home directory is accessible for both reading and writing via the
+@file{/exchange} directory:
+
+@example
+guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile
+@end example
+@end table
+
+@command{guix environment}
+also supports all of the common build options that @command{guix
+build} supports (@pxref{Common Build Options}) as well as package
+transformation options (@pxref{Package Transformation Options}).
+
@node Invoking guix pack
@section Invoking @command{guix pack}
@@ -4257,170 +4802,6 @@ In addition, @command{guix pack} supports all the common build options
options (@pxref{Package Transformation Options}).
-@node Invoking guix archive
-@section Invoking @command{guix archive}
-
-@cindex @command{guix archive}
-@cindex archive
-The @command{guix archive} command allows users to @dfn{export} files
-from the store into a single archive, and to later @dfn{import} them on
-a machine that runs Guix.
-In particular, it allows store files to be transferred from one machine
-to the store on another machine.
-
-@quotation Note
-If you're looking for a way to produce archives in a format suitable for
-tools other than Guix, @pxref{Invoking guix pack}.
-@end quotation
-
-@cindex exporting store items
-To export store files as an archive to standard output, run:
-
-@example
-guix archive --export @var{options} @var{specifications}...
-@end example
-
-@var{specifications} may be either store file names or package
-specifications, as for @command{guix package} (@pxref{Invoking guix
-package}). For instance, the following command creates an archive
-containing the @code{gui} output of the @code{git} package and the main
-output of @code{emacs}:
-
-@example
-guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar
-@end example
-
-If the specified packages are not built yet, @command{guix archive}
-automatically builds them. The build process may be controlled with the
-common build options (@pxref{Common Build Options}).
-
-To transfer the @code{emacs} package to a machine connected over SSH,
-one would run:
-
-@example
-guix archive --export -r emacs | ssh the-machine guix archive --import
-@end example
-
-@noindent
-Similarly, a complete user profile may be transferred from one machine
-to another like this:
-
-@example
-guix archive --export -r $(readlink -f ~/.guix-profile) | \
- ssh the-machine guix-archive --import
-@end example
-
-@noindent
-However, note that, in both examples, all of @code{emacs} and the
-profile as well as all of their dependencies are transferred (due to
-@code{-r}), regardless of what is already available in the store on the
-target machine. The @code{--missing} option can help figure out which
-items are missing from the target store. The @command{guix copy}
-command simplifies and optimizes this whole process, so this is probably
-what you should use in this case (@pxref{Invoking guix copy}).
-
-@cindex nar, archive format
-@cindex normalized archive (nar)
-Archives are stored in the ``normalized archive'' or ``nar'' format, which is
-comparable in spirit to `tar', but with differences
-that make it more appropriate for our purposes. First, rather than
-recording all Unix metadata for each file, the nar format only mentions
-the file type (regular, directory, or symbolic link); Unix permissions
-and owner/group are dismissed. Second, the order in which directory
-entries are stored always follows the order of file names according to
-the C locale collation order. This makes archive production fully
-deterministic.
-
-When exporting, the daemon digitally signs the contents of the archive,
-and that digital signature is appended. When importing, the daemon
-verifies the signature and rejects the import in case of an invalid
-signature or if the signing key is not authorized.
-@c FIXME: Add xref to daemon doc about signatures.
-
-The main options are:
-
-@table @code
-@item --export
-Export the specified store files or packages (see below.) Write the
-resulting archive to the standard output.
-
-Dependencies are @emph{not} included in the output, unless
-@code{--recursive} is passed.
-
-@item -r
-@itemx --recursive
-When combined with @code{--export}, this instructs @command{guix
-archive} to include dependencies of the given items in the archive.
-Thus, the resulting archive is self-contained: it contains the closure
-of the exported store items.
-
-@item --import
-Read an archive from the standard input, and import the files listed
-therein into the store. Abort if the archive has an invalid digital
-signature, or if it is signed by a public key not among the authorized
-keys (see @code{--authorize} below.)
-
-@item --missing
-Read a list of store file names from the standard input, one per line,
-and write on the standard output the subset of these files missing from
-the store.
-
-@item --generate-key[=@var{parameters}]
-@cindex signing, archives
-Generate a new key pair for the daemon. This is a prerequisite before
-archives can be exported with @code{--export}. Note that this operation
-usually takes time, because it needs to gather enough entropy to
-generate the key pair.
-
-The generated key pair is typically stored under @file{/etc/guix}, in
-@file{signing-key.pub} (public key) and @file{signing-key.sec} (private
-key, which must be kept secret.) When @var{parameters} is omitted,
-an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt
-versions before 1.6.0, it is a 4096-bit RSA key.
-Alternatively, @var{parameters} can specify
-@code{genkey} parameters suitable for Libgcrypt (@pxref{General
-public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The
-Libgcrypt Reference Manual}).
-
-@item --authorize
-@cindex authorizing, archives
-Authorize imports signed by the public key passed on standard input.
-The public key must be in ``s-expression advanced format''---i.e., the
-same format as the @file{signing-key.pub} file.
-
-The list of authorized keys is kept in the human-editable file
-@file{/etc/guix/acl}. The file contains
-@url{http://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format
-s-expressions''} and is structured as an access-control list in the
-@url{http://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure
-(SPKI)}.
-
-@item --extract=@var{directory}
-@itemx -x @var{directory}
-Read a single-item archive as served by substitute servers
-(@pxref{Substitutes}) and extract it to @var{directory}. This is a
-low-level operation needed in only very narrow use cases; see below.
-
-For example, the following command extracts the substitute for Emacs
-served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:
-
-@example
-$ wget -O - \
- https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \
- | bunzip2 | guix archive -x /tmp/emacs
-@end example
-
-Single-item archives are different from multiple-item archives produced
-by @command{guix archive --export}; they contain a single store item,
-and they do @emph{not} embed a signature. Thus this operation does
-@emph{no} signature verification and its output should be considered
-unsafe.
-
-The primary purpose of this operation is to facilitate inspection of
-archive contents coming from possibly untrusted substitute servers.
-
-@end table
-
@c *********************************************************************
@node Programming Interface
@chapter Programming Interface
@@ -6966,7 +7347,6 @@ the Scheme programming interface of Guix in a convenient way.
* Invoking guix lint:: Finding errors in package definitions.
* Invoking guix size:: Profiling disk usage.
* Invoking guix graph:: Visualizing the graph of packages.
-* Invoking guix environment:: Setting up development environments.
* Invoking guix publish:: Sharing substitutes.
* Invoking guix challenge:: Challenging substitute servers.
* Invoking guix copy:: Copying to and from a remote store.
@@ -8882,325 +9262,6 @@ are some architecture-dependent bits that this option allows you to visualize.
@end table
-@node Invoking guix environment
-@section Invoking @command{guix environment}
-
-@cindex reproducible build environments
-@cindex development environments
-@cindex @command{guix environment}
-@cindex environment, package build environment
-The purpose of @command{guix environment} is to assist hackers in
-creating reproducible development environments without polluting their
-package profile. The @command{guix environment} tool takes one or more
-packages, builds all of their inputs, and creates a shell
-environment to use them.
-
-The general syntax is:
-
-@example
-guix environment @var{options} @var{package}@dots{}
-@end example
-
-The following example spawns a new shell set up for the development of
-GNU@tie{}Guile:
-
-@example
-guix environment guile
-@end example
-
-If the needed dependencies are not built yet, @command{guix environment}
-automatically builds them. The environment of the new shell is an augmented
-version of the environment that @command{guix environment} was run in.
-It contains the necessary search paths for building the given package
-added to the existing environment variables. To create a ``pure''
-environment, in which the original environment variables have been unset,
-use the @code{--pure} option@footnote{Users sometimes wrongfully augment
-environment variables such as @code{PATH} in their @file{~/.bashrc}
-file. As a consequence, when @code{guix environment} launches it, Bash
-may read @file{~/.bashrc}, thereby introducing ``impurities'' in these
-environment variables. It is an error to define such environment
-variables in @file{.bashrc}; instead, they should be defined in
-@file{.bash_profile}, which is sourced only by log-in shells.
-@xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for
-details on Bash start-up files.}.
-
-@vindex GUIX_ENVIRONMENT
-@command{guix environment} defines the @code{GUIX_ENVIRONMENT}
-variable in the shell it spawns; its value is the file name of the
-profile of this environment. This allows users to, say, define a
-specific prompt for development environments in their @file{.bashrc}
-(@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):
-
-@example
-if [ -n "$GUIX_ENVIRONMENT" ]
-then
- export PS1="\u@@\h \w [dev]\$ "
-fi
-@end example
-
-@noindent
-...@: or to browse the profile:
-
-@example
-$ ls "$GUIX_ENVIRONMENT/bin"
-@end example
-
-Additionally, more than one package may be specified, in which case the
-union of the inputs for the given packages are used. For example, the
-command below spawns a shell where all of the dependencies of both Guile
-and Emacs are available:
-
-@example
-guix environment guile emacs
-@end example
-
-Sometimes an interactive shell session is not desired. An arbitrary
-command may be invoked by placing the @code{--} token to separate the
-command from the rest of the arguments:
-
-@example
-guix environment guile -- make -j4
-@end example
-
-In other situations, it is more convenient to specify the list of
-packages needed in the environment. For example, the following command
-runs @command{python} from an environment containing Python@tie{}2.7 and
-NumPy:
-
-@example
-guix environment --ad-hoc python2-numpy python-2.7 -- python
-@end example
-
-Furthermore, one might want the dependencies of a package and also some
-additional packages that are not build-time or runtime dependencies, but
-are useful when developing nonetheless. Because of this, the
-@code{--ad-hoc} flag is positional. Packages appearing before
-@code{--ad-hoc} are interpreted as packages whose dependencies will be
-added to the environment. Packages appearing after are interpreted as
-packages that will be added to the environment directly. For example,
-the following command creates a Guix development environment that
-additionally includes Git and strace:
-
-@example
-guix environment guix --ad-hoc git strace
-@end example
-
-Sometimes it is desirable to isolate the environment as much as
-possible, for maximal purity and reproducibility. In particular, when
-using Guix on a host distro that is not Guix System, it is desirable to
-prevent access to @file{/usr/bin} and other system-wide resources from
-the development environment. For example, the following command spawns
-a Guile REPL in a ``container'' where only the store and the current
-working directory are mounted:
-
-@example
-guix environment --ad-hoc --container guile -- guile
-@end example
-
-@quotation Note
-The @code{--container} option requires Linux-libre 3.19 or newer.
-@end quotation
-
-The available options are summarized below.
-
-@table @code
-@item --root=@var{file}
-@itemx -r @var{file}
-@cindex persistent environment
-@cindex garbage collector root, for environments
-Make @var{file} a symlink to the profile for this environment, and
-register it as a garbage collector root.
-
-This is useful if you want to protect your environment from garbage
-collection, to make it ``persistent''.
-
-When this option is omitted, the environment is protected from garbage
-collection only for the duration of the @command{guix environment}
-session. This means that next time you recreate the same environment,
-you could have to rebuild or re-download packages. @xref{Invoking guix
-gc}, for more on GC roots.
-
-@item --expression=@var{expr}
-@itemx -e @var{expr}
-Create an environment for the package or list of packages that
-@var{expr} evaluates to.
-
-For example, running:
-
-@example
-guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'
-@end example
-
-starts a shell with the environment for this specific variant of the
-PETSc package.
-
-Running:
-
-@example
-guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'
-@end example
-
-starts a shell with all the base system packages available.
-
-The above commands only use the default output of the given packages.
-To select other outputs, two element tuples can be specified:
-
-@example
-guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) "include")'
-@end example
-
-@item --load=@var{file}
-@itemx -l @var{file}
-Create an environment for the package or list of packages that the code
-within @var{file} evaluates to.
-
-As an example, @var{file} might contain a definition like this
-(@pxref{Defining Packages}):
-
-@example
-@verbatiminclude environment-gdb.scm
-@end example
-
-@item --manifest=@var{file}
-@itemx -m @var{file}
-Create an environment for the packages contained in the manifest object
-returned by the Scheme code in @var{file}.
-
-This is similar to the same-named option in @command{guix package}
-(@pxref{profile-manifest, @option{--manifest}}) and uses the same
-manifest files.
-
-@item --ad-hoc
-Include all specified packages in the resulting environment, as if an
-@i{ad hoc} package were defined with them as inputs. This option is
-useful for quickly creating an environment without having to write a
-package expression to contain the desired inputs.
-
-For instance, the command:
-
-@example
-guix environment --ad-hoc guile guile-sdl -- guile
-@end example
-
-runs @command{guile} in an environment where Guile and Guile-SDL are
-available.
-
-Note that this example implicitly asks for the default output of
-@code{guile} and @code{guile-sdl}, but it is possible to ask for a
-specific output---e.g., @code{glib:bin} asks for the @code{bin} output
-of @code{glib} (@pxref{Packages with Multiple Outputs}).
-
-This option may be composed with the default behavior of @command{guix
-environment}. Packages appearing before @code{--ad-hoc} are interpreted
-as packages whose dependencies will be added to the environment, the
-default behavior. Packages appearing after are interpreted as packages
-that will be added to the environment directly.
-
-@item --pure
-Unset existing environment variables when building the new environment.
-This has the effect of creating an environment in which search paths
-only contain package inputs.
-
-@item --search-paths
-Display the environment variable definitions that make up the
-environment.
-
-@item --system=@var{system}
-@itemx -s @var{system}
-Attempt to build for @var{system}---e.g., @code{i686-linux}.
-
-@item --container
-@itemx -C
-@cindex container
-Run @var{command} within an isolated container. The current working
-directory outside the container is mapped inside the container.
-Additionally, unless overridden with @code{--user}, a dummy home
-directory is created that matches the current user's home directory, and
-@file{/etc/passwd} is configured accordingly. The spawned process runs
-as the current user outside the container, but has root privileges in
-the context of the container.
-
-@item --network
-@itemx -N
-For containers, share the network namespace with the host system.
-Containers created without this flag only have access to the loopback
-device.
-
-@item --link-profile
-@itemx -P
-For containers, link the environment profile to
-@file{~/.guix-profile} within the container. This is equivalent to
-running the command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile}
-within the container. Linking will fail and abort the environment if
-the directory already exists, which will certainly be the case if
-@command{guix environment} was invoked in the user's home directory.
-
-Certain packages are configured to look in
-@code{~/.guix-profile} for configuration files and data;@footnote{For
-example, the @code{fontconfig} package inspects
-@file{~/.guix-profile/share/fonts} for additional fonts.}
-@code{--link-profile} allows these programs to behave as expected within
-the environment.
-
-@item --user=@var{user}
-@itemx -u @var{user}
-For containers, use the username @var{user} in place of the current
-user. The generated @file{/etc/passwd} entry within the container will
-contain the name @var{user}; the home directory will be
-@file{/home/USER}; and no user GECOS data will be copied. @var{user}
-need not exist on the system.
-
-Additionally, any shared or exposed path (see @code{--share} and
-@code{--expose} respectively) whose target is within the current user's
-home directory will be remapped relative to @file{/home/USER}; this
-includes the automatic mapping of the current working directory.
-
-@example
-# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target
-cd $HOME/wd
-guix environment --container --user=foo \
- --expose=$HOME/test \
- --expose=/tmp/target=$HOME/target
-@end example
-
-While this will limit the leaking of user identity through home paths
-and each of the user fields, this is only one useful component of a
-broader privacy/anonymity solution---not one in and of itself.
-
-@item --expose=@var{source}[=@var{target}]
-For containers, expose the file system @var{source} from the host system
-as the read-only file system @var{target} within the container. If
-@var{target} is not specified, @var{source} is used as the target mount
-point in the container.
-
-The example below spawns a Guile REPL in a container in which the user's
-home directory is accessible read-only via the @file{/exchange}
-directory:
-
-@example
-guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile
-@end example
-
-@item --share=@var{source}[=@var{target}]
-For containers, share the file system @var{source} from the host system
-as the writable file system @var{target} within the container. If
-@var{target} is not specified, @var{source} is used as the target mount
-point in the container.
-
-The example below spawns a Guile REPL in a container in which the user's
-home directory is accessible for both reading and writing via the
-@file{/exchange} directory:
-
-@example
-guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile
-@end example
-@end table
-
-@command{guix environment}
-also supports all of the common build options that @command{guix
-build} supports (@pxref{Common Build Options}) as well as package
-transformation options (@pxref{Package Transformation Options}).
-
@node Invoking guix publish
@section Invoking @command{guix publish}
@@ -9882,7 +9943,7 @@ instance to support new system services.
* Initial RAM Disk:: Linux-Libre bootstrapping.
* Bootloader Configuration:: Configuring the boot loader.
* Invoking guix system:: Instantiating a system configuration.
-* Running Guix in a VM:: How to run Guix System in a virtual machine.
+* Running Guix in a VM:: How to run Guix System in a virtual machine.
* Defining Services:: Adding new service definitions.
@end menu
@@ -13079,6 +13140,7 @@ type @code{<sddm-configuration>}.
[#:fonts %default-xorg-fonts] @
[#:configuration-file (xorg-configuration-file @dots{})] @
[#:xorg-server @var{xorg-server}]
+ [#:xserver-arguments '("-nolisten" "tcp")]
Return a @code{startx} script in which @var{modules}, a list of X module
packages, and @var{fonts}, a list of X font directories, are available. See
@code{xorg-wrapper} for more details on the arguments. The result should be
@@ -13087,6 +13149,22 @@ used in place of @code{startx}.
Usually the X server is started by a login manager.
@end deffn
+@cindex @code{-listen tcp}, for X11.
+This procedure is useful to override command line options for the X server,
+such as having it listen to over TCP:
+
+@example
+(operating-system
+ ...
+ (services
+ (modify-services %desktop-services
+ (slim-service-type config =>
+ (slim-configuration
+ (inherit config)
+ (startx (xorg-start-command
+ #:xserver-arguments '("-listen" "tcp"))))))))
+@end example
+
@deffn {Scheme Procedure} xorg-configuration-file @
[#:modules %default-xorg-modules] @
[#:fonts %default-xorg-fonts] @
@@ -14232,24 +14310,79 @@ capabilities to ordinary users. For example, an ordinary user can be granted
the capability to suspend the system if the user is logged in locally.
@end deffn
-@deffn {Scheme Procedure} upower-service [#:upower @var{upower}] @
- [#:watts-up-pro? #f] @
- [#:poll-batteries? #t] @
- [#:ignore-lid? #f] @
- [#:use-percentage-for-policy? #f] @
- [#:percentage-low 10] @
- [#:percentage-critical 3] @
- [#:percentage-action 2] @
- [#:time-low 1200] @
- [#:time-critical 300] @
- [#:time-action 120] @
- [#:critical-power-action 'hybrid-sleep]
-Return a service that runs @uref{http://upower.freedesktop.org/,
-@command{upowerd}}, a system-wide monitor for power consumption and battery
-levels, with the given configuration settings. It implements the
-@code{org.freedesktop.UPower} D-Bus interface, and is notably used by
-GNOME.
-@end deffn
+@defvr {Scheme Variable} upower-service-type
+Service that runs @uref{http://upower.freedesktop.org/, @command{upowerd}}, a
+system-wide monitor for power consumption and battery levels, with the given
+configuration settings.
+
+It implements the @code{org.freedesktop.UPower} D-Bus interface, and is
+notably used by GNOME.
+@end defvr
+
+@deftp {Data Type} upower-configuration
+Data type representation the configuration for UPower.
+
+@table @asis
+
+@item @code{upower} (default: @var{upower})
+Package to use for @code{upower}.
+
+@item @code{watts-up-pro?} (default: @code{#f})
+Enable the Watts Up Pro device.
+
+@item @code{poll-batteries?} (default: @code{#t})
+Enable polling the kernel for battery level changes.
+
+@item @code{ignore-lid?} (default: @code{#f})
+Ignore the lid state, this can be useful if it's incorrect on a device.
+
+@item @code{use-percentage-for-policy?} (default: @code{#f})
+Whether battery percentage based policy should be used. The default is to use
+the time left, change to @code{#t} to use the percentage.
+
+@item @code{percentage-low} (default: @code{10})
+When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage
+at which the battery is considered low.
+
+@item @code{percentage-critical} (default: @code{3})
+When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage
+at which the battery is considered critical.
+
+@item @code{percentage-action} (default: @code{2})
+When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage
+at which action will be taken.
+
+@item @code{time-low} (default: @code{1200})
+When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in
+seconds at which the battery is considered low.
+
+@item @code{time-critical} (default: @code{300})
+When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in
+seconds at which the battery is considered critical.
+
+@item @code{time-action} (default: @code{120})
+When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in
+seconds at which action will be taken.
+
+@item @code{critical-power-action} (default: @code{'hybrid-sleep})
+The action taken when @code{percentage-action} or @code{time-action} is
+reached (depending on the configuration of @code{use-percentage-for-policy?}).
+
+Possible values are:
+
+@itemize @bullet
+@item
+@code{'power-off}
+
+@item
+@code{'hibernate}
+
+@item
+@code{'hybrid-sleep}.
+@end itemize
+
+@end table
+@end deftp
@deffn {Scheme Procedure} udisks-service [#:udisks @var{udisks}]
Return a service for @uref{http://udisks.freedesktop.org/docs/latest/,
@@ -23028,6 +23161,32 @@ Currently, as with @command{switch-generation}, you must reboot after
running this action to actually start using the preceding system
generation.
+@item delete-generations
+@cindex deleting system generations
+@cindex saving space
+Delete system generations, making them candidates for garbage collection
+(@pxref{Invoking guix gc}, for information on how to run the ``garbage
+collector'').
+
+This works in the same way as @command{guix package --delete-generations}
+(@pxref{Invoking guix package, @code{--delete-generations}}). With no
+arguments, all system generations but the current one are deleted:
+
+@example
+guix system delete-generations
+@end example
+
+You can also select the generations you want to delete. The example below
+deletes all the system generations that are more than two month old:
+
+@example
+guix system delete-generations 2m
+@end example
+
+Running this command automatically reinstalls the bootloader with an updated
+list of menu entries---e.g., the ``old generations'' sub-menu in GRUB no
+longer lists the generations that have been deleted.
+
@item build
Build the derivation of the operating system, which includes all the
configuration files and programs needed to boot and run the system.
diff --git a/gnu/installer/connman.scm b/gnu/installer/connman.scm
index 740df7424a..ef8cca3952 100644
--- a/gnu/installer/connman.scm
+++ b/gnu/installer/connman.scm
@@ -299,7 +299,7 @@ to merge stdout and stderr using bash redirection. Then error messages are
extracted from connmanctl output using a regexp. This makes the whole
procedure even more unreliable.
-Raise &connman-connection-error if an error occured during connection. Raise
+Raise &connman-connection-error if an error occurred during connection. Raise
&connman-password-error if the given password is incorrect."
(define connman-error-regexp (make-regexp "Error[ ]*([^\n]+)\n"))
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 6211af2bc5..3e765bfdd4 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -71,7 +71,7 @@
(cut append <> <>)))
(define (sort-variants variants)
- "Sort VARIANTS list by putting the internation variant ahead and return it."
+ "Sort VARIANTS list by putting the international variant ahead and return it."
(call-with-values
(lambda ()
(partition
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index edf0b8c999..23fbfcce76 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -188,7 +188,7 @@ If SORT-LISTBOX-ITEMS? is set to #t, the listbox items are sorted using
'string<=' procedure (after being converted to text).
If ALLOW-DELETE? is #t, the form will return if the <DELETE> key is pressed,
-otherwise nothing will happend.
+otherwise nothing will happen.
Each time the listbox current item changes, call SKIP-ITEM-PROCEDURE? with the
current listbox item as argument. If it returns #t, skip the element and jump
diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm
index 6c96ee55b1..63b44af729 100644
--- a/gnu/installer/newt/timezone.scm
+++ b/gnu/installer/newt/timezone.scm
@@ -30,9 +30,6 @@
#:use-module (newt)
#:export (run-timezone-page))
-;; Heigth of the listbox displaying timezones.
-(define timezone-listbox-heigth (make-parameter 20))
-
;; Information textbox width.
(define info-textbox-width (make-parameter 40))
@@ -53,7 +50,7 @@ returned."
(define (run-page timezone-tree)
(define (loop path)
- (let ((timezones (locate-childrens timezone-tree path)))
+ (let ((timezones (locate-children timezone-tree path)))
(run-listbox-selection-page
#:title (G_ "Timezone")
#:info-text (G_ "Please select a timezone.")
diff --git a/gnu/installer/newt/utils.scm b/gnu/installer/newt/utils.scm
index 1c2ce4e628..dfb113e0c6 100644
--- a/gnu/installer/newt/utils.scm
+++ b/gnu/installer/newt/utils.scm
@@ -30,7 +30,7 @@
(define screen-rows (make-parameter 0))
(define (destroy-form-and-pop form)
- "Destory the given FORM and pop the current window."
+ "Destroy the given FORM and pop the current window."
(destroy-form form)
(pop-window))
diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm
index 59e40e327e..4cf5c128e7 100644
--- a/gnu/installer/newt/wifi.scm
+++ b/gnu/installer/newt/wifi.scm
@@ -100,7 +100,7 @@ nmc_wifi_strength_bars."
"Run a page to inform user that a connection error happened."
(run-error-page
(format #f
- (G_ "An error occured while trying to connect to ~a, please retry.")
+ (G_ "An error occurred while trying to connect to ~a, please retry.")
service-name)
(G_ "Connection error")))
@@ -160,8 +160,8 @@ of <service-item> records present in LISTBOX."
;; Maximum length of a wifi service name.
(define service-name-max-length (make-parameter 20))
-;; Heigth of the listbox displaying wifi services.
-(define wifi-listbox-heigth (make-parameter 20))
+;; Height of the listbox displaying wifi services.
+(define wifi-listbox-height (make-parameter 20))
;; Information textbox width.
(define info-textbox-width (make-parameter 40))
@@ -188,7 +188,7 @@ network when the corresponding listbox entry is selected. A button allow to
force a wifi scan."
(let* ((listbox (make-listbox
-1 -1
- (wifi-listbox-heigth)
+ (wifi-listbox-height)
(logior FLAG-SCROLL FLAG-BORDER FLAG-RETURNEXIT)))
(form (make-form))
(buttons-grid (make-grid 1 1))
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 187311e633..642b8c6d8a 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -677,7 +677,7 @@ otherwise."
(define* (mkpart disk user-partition
#:key (previous-partition #f))
"Create the given USER-PARTITION on DISK. The PREVIOUS-PARTITION argument as
-to be set to the partition preceeding USER-PARTITION if any."
+to be set to the partition preceding USER-PARTITION if any."
(define (parse-start-end start end)
"Parse start and end strings as positions on DEVICE expressed with a unit,
@@ -734,8 +734,8 @@ cause them to cross."
(< start-distance 3))
(+ start-sector start-offset)
start-sector)))
- ;; This is a hackery but parted almost always fails to create optimally
- ;; aligned partitions (unless specifiying percentages) because, the
+ ;; This is a hack. Parted almost always fails to create optimally
+ ;; aligned partitions (unless specifying percentages) because the
;; default range of 1MB centered on the start sector is not enough when
;; the optimal alignment is 2048 sectors of 512KB.
(extend-ranges! start-range end-range #:offset start-offset)
diff --git a/gnu/installer/timezone.scm b/gnu/installer/timezone.scm
index 32bc2ed6bb..c336b5f3ba 100644
--- a/gnu/installer/timezone.scm
+++ b/gnu/installer/timezone.scm
@@ -25,7 +25,7 @@
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:use-module (ice-9 receive)
- #:export (locate-childrens
+ #:export (locate-children
timezone->posix-tz
timezone-has-child?
zonetab->timezone-tree
@@ -94,15 +94,15 @@ timezones."
(loop (remove-first same-region))
(loop other-region))))))))
-(define (locate-childrens tree path)
- "Return the childrens of the timezone indicated by PATH in the given
+(define (locate-children tree path)
+ "Return the children of the timezone indicated by PATH in the given
TREE. Raise a condition if the PATH could not be found."
(let ((extract-proc (cut map car <>)))
(match path
(() (sort (extract-proc tree) string<?))
((region . rest)
(or (and=> (assoc-ref tree region)
- (cut locate-childrens <> rest))
+ (cut locate-children <> rest))
(raise
(condition
(&message
@@ -111,7 +111,7 @@ TREE. Raise a condition if the PATH could not be found."
(define (timezone-has-child? tree timezone)
"Return #t if the given TIMEZONE any child in TREE and #f otherwise."
- (not (null? (locate-childrens tree timezone))))
+ (not (null? (locate-children tree timezone))))
(define* (zonetab->timezone-tree zonetab)
"Return the timezone tree corresponding to the given ZONETAB file."
diff --git a/gnu/local.mk b/gnu/local.mk
index 3f66beac14..e239c76c7c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -100,6 +100,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/check.scm \
%D%/packages/chemistry.scm \
%D%/packages/chez.scm \
+ %D%/packages/chromium.scm \
%D%/packages/ci.scm \
%D%/packages/cinnamon.scm \
%D%/packages/clojure.scm \
@@ -191,6 +192,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gcc.scm \
%D%/packages/gd.scm \
%D%/packages/gdb.scm \
+ %D%/packages/genimage.scm \
%D%/packages/geo.scm \
%D%/packages/gettext.scm \
%D%/packages/ghostscript.scm \
@@ -253,8 +255,9 @@ GNU_SYSTEM_MODULES = \
%D%/packages/jrnl.scm \
%D%/packages/jose.scm \
%D%/packages/julia.scm \
- %D%/packages/kde.scm \
+ %D%/packages/kde.scm \
%D%/packages/kde-frameworks.scm \
+ %D%/packages/kde-plasma.scm \
%D%/packages/kerberos.scm \
%D%/packages/key-mon.scm \
%D%/packages/kodi.scm \
@@ -294,6 +297,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/m4.scm \
%D%/packages/machine-learning.scm \
%D%/packages/man.scm \
+ %D%/packages/magic-wormhole.scm \
%D%/packages/mail.scm \
%D%/packages/make-bootstrap.scm \
%D%/packages/markup.scm \
@@ -635,7 +639,6 @@ dist_patch_DATA = \
%D%/packages/patches/aegisub-boost68.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
- %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch \
%D%/packages/patches/amule-crypto-6.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
@@ -685,6 +688,7 @@ dist_patch_DATA = \
%D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clang-6.0-libc-search-path.patch \
+ %D%/packages/patches/clang-7.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
%D%/packages/patches/classpath-aarch64-support.patch \
@@ -708,6 +712,7 @@ dist_patch_DATA = \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
+ %D%/packages/patches/dealii-mpi-deprecations.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
@@ -793,6 +798,8 @@ dist_patch_DATA = \
%D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \
%D%/packages/patches/gd-CVE-2018-5711.patch \
%D%/packages/patches/gd-CVE-2018-1000222.patch \
+ %D%/packages/patches/gd-CVE-2019-6977.patch \
+ %D%/packages/patches/gd-CVE-2019-6978.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-freetype-test-failure.patch \
%D%/packages/patches/gdm-CVE-2018-14424.patch \
@@ -814,6 +821,8 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \
+ %D%/packages/patches/glibc-CVE-2018-11236.patch \
+ %D%/packages/patches/glibc-CVE-2018-11237.patch \
%D%/packages/patches/glibc-allow-kernel-2.6.32.patch \
%D%/packages/patches/glibc-boot-2.16.0.patch \
%D%/packages/patches/glibc-boot-2.2.5.patch \
@@ -936,7 +945,6 @@ dist_patch_DATA = \
%D%/packages/patches/ldc-bootstrap-disable-tests.patch \
%D%/packages/patches/ldc-disable-phobos-tests.patch \
%D%/packages/patches/ledger-fix-uninitialized.patch \
- %D%/packages/patches/ledger-revert-boost-python-fix.patch \
%D%/packages/patches/liba52-enable-pic.patch \
%D%/packages/patches/liba52-link-with-libm.patch \
%D%/packages/patches/liba52-set-soname.patch \
@@ -1052,6 +1060,7 @@ dist_patch_DATA = \
%D%/packages/patches/mozjs38-tracelogger.patch \
%D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/mrrescue-support-love-11.patch \
+ %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
%D%/packages/patches/mumble-1.2.19-abs.patch \
%D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
@@ -1126,7 +1135,6 @@ dist_patch_DATA = \
%D%/packages/patches/pinentry-efl.patch \
%D%/packages/patches/pingus-boost-headers.patch \
%D%/packages/patches/pingus-sdl-libs-config.patch \
- %D%/packages/patches/pius.patch \
%D%/packages/patches/pixman-CVE-2016-5296.patch \
%D%/packages/patches/plink-1.07-unclobber-i.patch \
%D%/packages/patches/plink-endian-detection.patch \
@@ -1183,6 +1191,7 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-CVE-2018-16872.patch \
%D%/packages/patches/qemu-CVE-2019-6778.patch \
%D%/packages/patches/qt4-ldflags.patch \
+ %D%/packages/patches/qtbase-old-kernel.patch \
%D%/packages/patches/qtbase-use-TZDIR.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
@@ -1199,6 +1208,7 @@ dist_patch_DATA = \
%D%/packages/patches/rct-add-missing-headers.patch \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
+ %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/reptyr-fix-gcc-7.patch \
%D%/packages/patches/ripperx-missing-file.patch \
@@ -1209,13 +1219,16 @@ dist_patch_DATA = \
%D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \
%D%/packages/patches/ruby-concurrent-test-arm.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
+ %D%/packages/patches/ruby-safe-yaml-add-require-time.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
+ %D%/packages/patches/runc-CVE-2019-5736.patch \
%D%/packages/patches/rust-1.19-mrustc.patch \
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
+ %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-build-parallelism.patch \
%D%/packages/patches/scotch-integer-declarations.patch \
@@ -1273,7 +1286,6 @@ dist_patch_DATA = \
%D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
- %D%/packages/patches/tomsfastmath-constness.patch \
%D%/packages/patches/totem-meson-easy-codec.patch \
%D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/twinkle-include-qregexpvalidator.patch \
@@ -1332,7 +1344,6 @@ dist_patch_DATA = \
%D%/packages/patches/x265-arm-flags.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
- %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
@@ -1342,8 +1353,7 @@ dist_patch_DATA = \
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
%D%/packages/patches/xfce4-settings-defaults.patch \
%D%/packages/patches/xinetd-fix-fd-leak.patch \
- %D%/packages/patches/xinetd-CVE-2013-4342.patch \
- %D%/packages/patches/xmodmap-asprintf.patch
+ %D%/packages/patches/xinetd-CVE-2013-4342.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in
diff --git a/gnu/packages.scm b/gnu/packages.scm
index 9cd57fc704..e484d9754f 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -375,34 +375,41 @@ reducing the memory footprint."
(define cache-file
(string-append directory %package-cache-file))
- (define (expand-cache module symbol variable result)
+ (define (expand-cache module symbol variable result+seen)
(match (false-if-exception (variable-ref variable))
((? package? package)
- (if (hidden-package? package)
- result
- (cons `#(,(package-name package)
- ,(package-version package)
- ,(module-name module)
- ,symbol
- ,(package-outputs package)
- ,(->bool (member (%current-system)
- (package-supported-systems package)))
- ,(->bool (package-superseded package))
- ,@(let ((loc (package-location package)))
- (if loc
- `(,(location-file loc)
- ,(location-line loc)
- ,(location-column loc))
- '(#f #f #f))))
- result)))
+ (match result+seen
+ ((result . seen)
+ (if (or (vhash-assq package seen)
+ (hidden-package? package))
+ (cons result seen)
+ (cons (cons `#(,(package-name package)
+ ,(package-version package)
+ ,(module-name module)
+ ,symbol
+ ,(package-outputs package)
+ ,(->bool
+ (member (%current-system)
+ (package-supported-systems package)))
+ ,(->bool (package-superseded package))
+ ,@(let ((loc (package-location package)))
+ (if loc
+ `(,(location-file loc)
+ ,(location-line loc)
+ ,(location-column loc))
+ '(#f #f #f))))
+ result)
+ (vhash-consq package #t seen))))))
(_
- result)))
+ result+seen)))
(define exp
- (fold-module-public-variables* expand-cache '()
- (all-modules (%package-module-path)
- #:warn
- warn-about-load-error)))
+ (first
+ (fold-module-public-variables* expand-cache
+ (cons '() vlist-null)
+ (all-modules (%package-module-path)
+ #:warn
+ warn-about-load-error))))
(mkdir-p (dirname cache-file))
(call-with-output-file cache-file
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f4c34e10fe..24486cec18 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
@@ -285,26 +285,26 @@ graphs and can export its output to different formats.")
(define-public htop
(package
- (name "htop")
- (version "2.2.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://hisham.hm/htop/releases/"
- version "/htop-" version ".tar.gz"))
- (sha256
- (base32
- "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"))))
- (build-system gnu-build-system)
- (inputs
- `(("ncurses" ,ncurses)))
- (native-inputs
- `(("python" ,python-minimal-wrapper))) ; for scripts/MakeHeader.py
- (home-page "https://hisham.hm/htop/")
- (synopsis "Interactive process viewer")
- (description
- "This is htop, an interactive process viewer. It is a text-mode
+ (name "htop")
+ (version "2.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://hisham.hm/htop/releases/"
+ version "/htop-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("ncurses" ,ncurses)))
+ (native-inputs
+ `(("python" ,python-wrapper))) ;for scripts/MakeHeader.py
+ (home-page "https://hisham.hm/htop/")
+ (synopsis "Interactive process viewer")
+ (description
+ "This is htop, an interactive process viewer. It is a text-mode
application (for console or X terminals) and requires ncurses.")
- (license license:gpl2)))
+ (license license:gpl2)))
(define-public pies
(package
@@ -880,7 +880,7 @@ over ssh connections.")
(define-public rename
(package
(name "rename")
- (version "1.00")
+ (version "1.10")
(source (origin
(method url-fetch)
(uri (string-append
@@ -888,7 +888,7 @@ over ssh connections.")
version ".tar.gz"))
(sha256
(base32
- "03yhf8nmqsb0zyliv501fdvwlp589jqfn44yqkrflmpzrbik3zxl"))))
+ "137m8s06r4n038ivlr5r1d9a7q9l7shmwpvnyx053r9ndhvbnkh5"))))
(build-system perl-build-system)
(arguments
`(#:phases
@@ -1602,14 +1602,14 @@ of supported upstream metrics systems simultaneously.")
(define-public ansible
(package
(name "ansible")
- (version "2.7.6")
+ (version "2.7.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible" version))
(sha256
(base32
- "0f7b2ghm34ql8yv90wr0ngd6w7wyvnlcxpc3snkj86kcjsnmx1bd"))))
+ "0l4id24jqi578xmybvwrz10sm2jhs90gk9gs1y04gfarz4vcj304"))))
(build-system python-build-system)
(native-inputs
`(("python-bcrypt" ,python-bcrypt)
@@ -2715,8 +2715,9 @@ Python loading in HPC environments.")
"1k9148xnfznch1443niaa3w1kmsw4vp0xpwna6npgmi7zqg06ymy"))))
(build-system trivial-build-system)
(inputs
- `(("bash" ,bash)
- ("perl" ,perl)))
+ `(("bash" ,bash-minimal)
+ ("perl" ,perl)
+ ("procps" ,procps)))
(native-inputs
`(("gzip" ,gzip)))
(arguments
@@ -2789,7 +2790,6 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
("lm-sensors" ,lm-sensors)
("mesa-utils" ,mesa-utils)
("pciutils" ,pciutils)
- ("procps" ,procps)
("tar" ,tar)
("tree" ,tree)
("util-linux" ,util-linux) ; lsblk
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 64d26548c4..afcb33ad6d 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014 John Darringon <jmd@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +24,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages image)
#:use-module (guix build-system gnu))
@@ -75,21 +77,28 @@ characters, and is highly robust.")
(define-public libdmtx
(package
(name "libdmtx")
- (version "0.7.4")
+ (version "0.7.5")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "mirror://sourceforge/libdmtx/" name "/" version "/"
- name "-" version ".tar.bz2"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dmtx/libdmtx.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"))))
+ (base32 "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj"))))
(build-system gnu-build-system)
+ (arguments
+ ;; XXX Test suite is broken: https://github.com/dmtx/libdmtx/issues/22
+ `(#:tests? #f))
(native-inputs
- `(("pkg-config" ,pkg-config)))
- (home-page "http://libdmtx.sourceforge.net/")
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://github.com/dmtx")
(synopsis "Library for reading and writing Data Matrix 2D barcodes")
(description "libdmtx is software for reading and writing Data Matrix 2D
-barcodes on Linux and Unix. At its core libdmtx is a shared library, allowing
+barcodes of the modern ECC200 variety. libdmtx is a shared library, allowing
C/C++ programs to use its capabilities without restrictions or overhead.")
(license license:bsd-3)))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 52eb6ee366..f9ae22b3f3 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
@@ -856,3 +856,147 @@ xtensor provides:
@item tools to manipulate array expressions and build upon xtensor.
@end itemize")
(license license:bsd-3)))
+
+(define-public gap
+ (package
+ (name "gap")
+ (version "4.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.gap-system.org/pub/gap/gap-"
+ (version-major+minor version)
+ "/tar.bz2/gap-"
+ version
+ ".tar.bz2"))
+ (sha256
+ (base32
+ "1dmb8v4p7j1nnf7sx8sg54b49yln36bi9acwp7w1d3a1nxj17ird"))
+ (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))
+ (snippet
+ '(begin
+ ;; Delete the external gmp and zlib libraries
+ ;; and a subdirectory not needed for our build.
+ (for-each delete-file-recursively
+ '("extern" "hpcgap"))
+ ;; Delete a failing test.
+ ;; FIXME: This might be fixed in the next release, see
+ ;; https://github.com/gap-system/gap/issues/3292
+ (delete-file "tst/testinstall/dir.tst")
+ ;; Delete all packages except for a fixed list.
+ (with-directory-excursion "pkg"
+ (for-each delete-file-recursively
+ (lset-difference string=? (scandir ".")
+ '("." ".."
+ ;; Necessary packages.
+ "GAPDoc-1.6.2"
+ "primgrp-3.3.2"
+ "SmallGrp-1.3" ; artistic2.0
+ "transgrp" ; artistic2.0 for data,
+ ; gpl2 or gpl3 for code
+ ;; Recommanded package.
+ "io-4.5.4" ; gpl3+
+ ;; Optional packages, searched for at start,
+ ;; and their depedencies.
+ "alnuth-3.1.0"
+ "AutoDoc-2018.09.20"
+ "autpgrp-1.10"
+ "crisp-1.4.4" ; bsd-2
+ ; "ctbllib" ; no explicit license, drop
+ "FactInt-1.6.2"
+ "fga"
+ "irredsol-1.4" ; bsd-2
+ "laguna-3.9.0"
+ "polenta-1.3.8"
+ "polycyclic-2.14"
+ "radiroot-2.8"
+ "resclasses-4.7.1"
+ "sophus-1.24"
+ ; "tomlib-1.2.7" ; no explicit license, drop
+ "utils-0.59"))))
+ #t))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("gmp" ,gmp)
+ ("zlib" ,zlib)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'build-packages
+ ;; Compile all packages that have not been deleted by the
+ ;; code snippet above.
+ (lambda _
+ (setenv "CONFIG_SHELL" (which "bash"))
+ (with-directory-excursion "pkg"
+ (invoke "../bin/BuildPackages.sh")
+ #t)))
+ (add-after 'build-packages 'build-doc
+ ;; The documentation is bundled, but we create it from source.
+ (lambda _
+ (with-directory-excursion "doc"
+ (invoke "./make_doc"))
+ #t))
+ (replace 'check
+ (lambda _
+ ;; "make check" is expected to appear in gap-4.10.1
+ (invoke "./gap" "tst/testinstall.g")
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (prog (string-append bin "/gap"))
+ (prog-real (string-append bin "/.gap-real"))
+ (share (string-append out "/share/gap"))
+ (include (string-append out "/include/gap")))
+ ;; Install only the gap binary; the gac compiler is left
+ ;; for maybe later. "Wrap" it in a shell script that calls
+ ;; the binary with the correct parameter.
+ (mkdir-p bin)
+ (copy-file "gap" prog-real)
+ (call-with-output-file prog
+ (lambda (port)
+ (format port
+ "#!~a~%exec ~a -l ~a \"$@\"~%"
+ (which "bash")
+ prog-real
+ share)))
+ (chmod prog #o755)
+ ;; Install the headers and the library, which are needed by
+ ;; Sage. The Makefile targets are available in gap-4.10.0,
+ ;; but planned to be removed in gap-4.10.1.
+ (invoke "make" "install-headers")
+ (invoke "make" "install-libgap")
+ (install-file "gen/config.h" include)
+ ;; Install a certain number of files and directories to
+ ;; SHARE, where the wrapped shell script expects them.
+ ;; Remove information on the build directory from sysinfo.gap.
+ (substitute* "sysinfo.gap"
+ (("GAP_BIN_DIR=\".*\"") "GAP_BIN_DIR=\"\"")
+ (("GAP_LIB_DIR=\".*\"") "GAP_LIB_DIR=\"\"")
+ (("GAP_CPPFLAGS=\".*\"") "GAP_CPPFLAGS=\"\""))
+ (install-file "sysinfo.gap" share)
+ (copy-recursively "grp" (string-append share "/grp"))
+ (copy-recursively "pkg" (string-append share "/pkg"))
+ ;; The following is not the C library libgap.so, but a
+ ;; library of GAP code.
+ (copy-recursively "lib" (string-append share "/lib"))
+ ;; The gap binary looks for documentation inside SHARE.
+ (copy-recursively "doc" (string-append share "/doc")))
+ #t)))))
+ (home-page "https://www.gap-system.org/")
+ (synopsis
+ "System for computational group theory")
+ (description
+ "GAP is a system for computational discrete algebra, with particular
+emphasis on computational group theory. It provides a programming language,
+a library of thousands of functions implementing algebraic algorithms
+written in the GAP language as well as large data libraries of algebraic
+objects.")
+ ;; Some packages have different licenses (effectively forcing the
+ ;; combined work to be licensed as gpl3+); if this is the case, this
+ ;; is mentioned above next to their name.
+ ;; Some packages have no license mentioned explicitly; supposedly this
+ ;; means that the gpl2+ licence of GAP itself applies, but to be on the
+ ;; safe side, we drop them for now.
+ (license license:gpl2+)))
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 9b8ef562d3..0de2183b88 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -129,7 +129,7 @@ to the clients.")
(define-public fasm
(package
(name "fasm")
- (version "1.73.06")
+ (version "1.73.08")
(source
(origin
(method url-fetch)
@@ -137,14 +137,14 @@ to the clients.")
version ".tgz"))
(sha256
(base32
- "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6"))))
+ "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests exist
- #:strip-binaries? #f ; fasm has no sections
+ `(#:tests? #f ; no tests exist
+ #:strip-binaries? #f ; fasm has no sections
#:phases
(modify-phases %standard-phases
- (delete 'configure) ; no "configure" script exists
+ (delete 'configure) ; no "configure" script
(replace 'build
(lambda _
(chdir "source/Linux/")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 12755dd7a7..ae0dddeb66 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1374,7 +1375,20 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
(list
;; Add the output lib directory to the RUNPATH.
(string-append "--ldflags=-Wl,-rpath=" %output "/lib")
- "--cxxflags=-std=c++11")))
+ "--cxxflags=-std=c++11")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-boost-includes
+ (lambda _
+ (substitute* "src/headers/gx_internal_plugins.h"
+ (("namespace gx_jack" m)
+ (string-append "#include <boost/noncopyable.hpp>\n" m)))
+ (substitute* '("src/headers/gx_system.h"
+ "src/headers/gx_parameter.h"
+ "src/headers/gx_json.h")
+ (("namespace gx_system" m)
+ (string-append "#include <boost/noncopyable.hpp>\n" m)))
+ #t)))))
(inputs
`(("libsndfile" ,libsndfile)
("boost" ,boost)
@@ -2446,18 +2460,17 @@ the Turtle syntax.")
(define-public suil
(package
(name "suil")
- (version "0.10.0")
+ (version "0.10.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/suil-"
version ".tar.bz2"))
(sha256
(base32
- "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"))))
+ "00d43m0nai63ajb7rkm9v084jcih206y17ib3160zcvzc885ji4z"))))
(build-system waf-build-system)
(arguments
- `(#:tests? #f ; no check target
- #:python ,python-2 ;XXX: The bundled waf does not work with Python 3.7.0.
+ `(#:tests? #f ; no check target
#:configure-flags
'("CXXFLAGS=-std=gnu++11")))
(inputs
@@ -3207,7 +3220,7 @@ with support for HD extensions.")
(define-public bs1770gain
(package
(name "bs1770gain")
- (version "0.5.1")
+ (version "0.5.2")
(source
(origin
(method url-fetch)
@@ -3215,11 +3228,20 @@ with support for HD extensions.")
version "/bs1770gain-" version ".tar.gz"))
(sha256
(base32
- "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06"))))
+ "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; XXX
+ (substitute* "bs1770gain/bs1770gain.c"
+ (("\"N.*\"") "\"\""))
+ (substitute* "configure"
+ (("URL=.*$")
+ "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html\n"))))))
(build-system gnu-build-system)
(inputs `(("ffmpeg" ,ffmpeg)
("sox" ,sox)))
- (home-page "http://bs1770gain.sourceforge.net/")
+ (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html")
(synopsis "Tool to adjust loudness of media files")
(description
"BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its
diff --git a/gnu/packages/aux-files/chromium/master-preferences.json b/gnu/packages/aux-files/chromium/master-preferences.json
new file mode 100644
index 0000000000..5a2049fa72
--- /dev/null
+++ b/gnu/packages/aux-files/chromium/master-preferences.json
@@ -0,0 +1,26 @@
+{
+ "distribution": {
+ "import_bookmarks": false,
+ "make_chrome_default": false,
+ "make_chrome_default_for_user": false,
+ "verbose_logging": true,
+ "skip_first_run_ui": true,
+ "suppress_first_run_default_browser_prompt": true
+ },
+ "browser": {
+ "has_seen_welcome_page" : true,
+ "check_default_browser" : false
+ },
+ "dns_prefetching": {
+ "enabled": false
+ },
+ "alternate_error_pages": {
+ "enabled": false
+ },
+ "hardware": {
+ "audio_capture_enabled": false
+ },
+ "default_apps": "noinstall",
+ "hide_web_store_icon": true,
+ "homepage": "https://www.gnu.org/software/guix/"
+}
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 45b1be2413..5da7475150 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -46,6 +46,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages datastructures)
#:use-module (gnu packages dbm)
#:use-module (gnu packages dejagnu)
#:use-module (gnu packages ftp)
@@ -495,14 +496,14 @@ detection, and lossless compression.")
(define-public borg
(package
(name "borg")
- (version "1.1.8")
+ (version "1.1.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
(base32
- "0qqvcscn1l4y83x4sh3izdpmr8zq38j8chjkpfq4q4d01i470hqb"))
+ "0x95nhv4h34m8cxycbwc4xdz350saaxlgh727b23bgn4ci7gh3vx"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -548,11 +549,6 @@ detection, and lossless compression.")
;; HOME=/homeless-shelter.
(setenv "HOME" "/tmp")
#t)))
- (add-after 'unpack 'remove-documentation-timestamps ; reproducibility
- (lambda _
- (substitute* "setup.py"
- (("write\\(':Date:'.*") "\n"))
- #t))
;; The tests need to be run after Borg is installed.
(delete 'check)
(add-after 'install 'check
@@ -589,17 +585,12 @@ detection, and lossless compression.")
'("docs/misc/create_chunker-params.txt"
"docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt"))
- (add-installed-pythonpath inputs outputs)
- (invoke "python3" "setup.py" "build_man")
(copy-recursively "docs/man" man)
#t))))))
(native-inputs
`(("python-cython" ,python-cython)
("python-setuptools-scm" ,python-setuptools-scm)
- ("python-pytest" ,python-pytest)
- ;; For generating the documentation.
- ("python-sphinx" ,python-sphinx)
- ("python-guzzle-sphinx-theme" ,python-guzzle-sphinx-theme)))
+ ("python-pytest" ,python-pytest)))
(inputs
`(("acl" ,acl)
("libb2" ,libb2)
@@ -985,3 +976,30 @@ de-duplicated before it is actually written to the storage back end to save
precious backup space.
@end itemize")
(license license:bsd-2)))
+
+(define-public burp
+ (package
+ (name "burp")
+ (version "2.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/burp/burp-" version
+ "/burp-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0in49c0ir7lb7jli0fcphdq1nh5rclhans4ngm7z7hzyxa4jrgri"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("librsync" ,librsync)
+ ("openssl" ,openssl)
+ ("uthash" ,uthash)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("check" ,check)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://burp.grke.org")
+ (synopsis "Differential backup and restore")
+ (description "Burp is a network backup and restore program. It attempts
+to reduce network traffic and the amount of space that is used by each
+backup.")
+ (license license:agpl3)))
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c3db665e98..289631acee 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -860,7 +860,10 @@ with the Linux kernel.")
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
- "glibc-supported-locales.patch"))))))
+ "glibc-supported-locales.patch"
+ "glibc-CVE-2018-11236.patch"
+ "glibc-CVE-2018-11237.patch"))))
+ (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes
(define-public glibc-2.26
(package
diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 20aabb0be4..9057158cde 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -27,6 +27,7 @@
#:use-module (gnu packages bioinformatics)
#:use-module (gnu packages cran)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages graph)
#:use-module (gnu packages maths)
#:use-module (gnu packages statistics)
@@ -1176,3 +1177,25 @@ Viewer (SAV) files, access data, and generate QC plots.")
"This package provides a quality control pipeline for ChIP-exo/nexus
sequencing data.")
(license license:gpl2+)))
+
+(define-public r-dnacopy
+ (package
+ (name "r-dnacopy")
+ (version "1.56.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (bioconductor-uri "DNAcopy" version))
+ (sha256
+ (base32
+ "04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82"))))
+ (properties `((upstream-name . "DNAcopy")))
+ (build-system r-build-system)
+ (native-inputs `(("gfortran" ,gfortran)))
+ (home-page "https://bioconductor.org/packages/DNAcopy")
+ (synopsis "DNA copy number data analysis")
+ (description
+ "This package implements the @dfn{circular binary segmentation} (CBS)
+algorithm to segment DNA copy number data and identify genomic regions with
+abnormal copy number.")
+ (license license:gpl2+)))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 02cafb2358..5dc3945035 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
+;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -612,16 +613,22 @@ intended to behave exactly the same as the original BWK awk.")
(define-public python-pybedtools
(package
(name "python-pybedtools")
- (version "0.7.10")
+ (version "0.8.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pybedtools" version))
(sha256
(base32
- "0l2b2wrnj85azfqgr0zwr60f7j58vlla1hcgxvr9rwikpl8j72ji"))))
+ "1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf"))))
(build-system python-build-system)
(arguments
- `(#:phases
+ `(#:modules ((ice-9 ftw)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build utils)
+ (guix build python-build-system))
+ ;; See https://github.com/daler/pybedtools/issues/192
+ #:phases
(modify-phases %standard-phases
;; See https://github.com/daler/pybedtools/issues/261
(add-after 'unpack 'disable-broken-tests
@@ -631,21 +638,59 @@ intended to behave exactly the same as the original BWK awk.")
(substitute* "pybedtools/test/test_scripts.py"
(("def test_venn_mpl")
"def _do_not_test_venn_mpl"))
- ;; Requires internet access.
(substitute* "pybedtools/test/test_helpers.py"
+ ;; Requires internet access.
(("def test_chromsizes")
- "def _do_not_test_chromsizes"))
- ;; FIXME: these two fail for no good reason.
- (substitute* "pybedtools/test/test1.py"
- (("def test_issue_157")
- "def _do_not_test_issue_157")
- (("def test_to_dataframe")
- "def _do_not_test_to_dataframe"))
- #t)))))
- (propagated-inputs
- ;; Tests don't pass with Bedtools 2.27.1.
- ;; See https://github.com/daler/pybedtools/issues/260
- `(("bedtools" ,bedtools-2.26)
+ "def _do_not_test_chromsizes")
+ ;; Broken as a result of the workaround used in the check phase
+ ;; (see: https://github.com/daler/pybedtools/issues/192).
+ (("def test_getting_example_beds")
+ "def _do_not_test_getting_example_beds"))
+ #t))
+ ;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM.
+ ;; build system.
+ ;; Force the Cythonization of C++ files to guard against compilation
+ ;; problems.
+ (add-after 'unpack 'remove-cython-generated-files
+ (lambda _
+ (let ((cython-sources (map (cut string-drop-right <> 4)
+ (find-files "." "\\.pyx$")))
+ (c/c++-files (find-files "." "\\.(c|cpp|cxx)$")))
+ (define (strip-extension filename)
+ (string-take filename (string-index-right filename #\.)))
+ (define (cythonized? c/c++-file)
+ (member (strip-extension c/c++-file) cython-sources))
+ (for-each delete-file (filter cythonized? c/c++-files))
+ #t)))
+ (add-after 'remove-cython-generated-files 'generate-cython-extensions
+ (lambda _
+ (invoke "python" "setup.py" "cythonize")))
+ (replace 'check
+ (lambda _
+ (let* ((cwd (getcwd))
+ (build-root-directory (string-append cwd "/build/"))
+ (build (string-append
+ build-root-directory
+ (find (cut string-prefix? "lib" <>)
+ (scandir (string-append
+ build-root-directory)))))
+ (scripts (string-append
+ build-root-directory
+ (find (cut string-prefix? "scripts" <>)
+ (scandir build-root-directory)))))
+ (setenv "PYTHONPATH"
+ (string-append build ":" (getenv "PYTHONPATH")))
+ ;; Executable scripts such as 'intron_exon_reads.py' must be
+ ;; available in the PATH.
+ (setenv "PATH"
+ (string-append scripts ":" (getenv "PATH"))))
+ ;; The tests need to be run from elsewhere...
+ (mkdir-p "/tmp/test")
+ (copy-recursively "pybedtools/test" "/tmp/test")
+ (with-directory-excursion "/tmp/test"
+ (invoke "pytest")))))))
+ (propagated-inputs
+ `(("bedtools" ,bedtools)
("samtools" ,samtools)
("python-matplotlib" ,python-matplotlib)
("python-pysam" ,python-pysam)
@@ -654,9 +699,11 @@ intended to behave exactly the same as the original BWK awk.")
`(("python-numpy" ,python-numpy)
("python-pandas" ,python-pandas)
("python-cython" ,python-cython)
- ("python-nose" ,python-nose)
- ("kentutils" ,kentutils) ; for bedGraphToBigWig
- ("python-six" ,python-six)))
+ ("kentutils" ,kentutils) ; for bedGraphToBigWig
+ ("python-six" ,python-six)
+ ;; For the test suite.
+ ("python-pytest" ,python-pytest)
+ ("python-psutil" ,python-psutil)))
(home-page "https://pythonhosted.org/pybedtools/")
(synopsis "Python wrapper for BEDtools programs")
(description
@@ -667,34 +714,7 @@ Python.")
(license license:gpl2+)))
(define-public python2-pybedtools
- (let ((pkg (package-with-python2 python-pybedtools)))
- (package (inherit pkg)
- (arguments
- `(#:modules ((ice-9 ftw)
- (srfi srfi-1)
- (srfi srfi-26)
- (guix build utils)
- (guix build python-build-system))
- ;; See https://github.com/daler/pybedtools/issues/192
- ,@(substitute-keyword-arguments (package-arguments pkg)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'check
- (lambda _
- (let ((cwd (getcwd)))
- (setenv "PYTHONPATH"
- (string-append cwd "/build/"
- (find (cut string-prefix? "lib" <>)
- (scandir (string-append cwd "/build")))
- ":" (getenv "PYTHONPATH"))))
- ;; The tests need to be run from elsewhere...
- (mkdir-p "/tmp/test")
- (copy-recursively "pybedtools/test" "/tmp/test")
- (with-directory-excursion "/tmp/test"
- (invoke "nosetests"
- ;; This test fails for unknown reasons
- "--exclude=.*test_getting_example_beds"))
- #t))))))))))
+ (package-with-python2 python-pybedtools))
(define-public python-biom-format
(package
@@ -4345,130 +4365,6 @@ interrupted by stop codons. OrfM finds and prints these ORFs.")
(home-page "https://github.com/wwood/OrfM")
(license license:lgpl3+)))
-(define-public pplacer
- (let ((commit "807f6f3"))
- (package
- (name "pplacer")
- ;; The commit should be updated with each version change.
- (version "1.1.alpha19")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/matsen/pplacer.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "11ppbbbx20p2g9wj3ff64dhnarb12q79v7qh4rk0gj6lkbz4n7cn"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:ocaml ,ocaml-4.01
- #:findlib ,ocaml4.01-findlib
- #:modules ((guix build ocaml-build-system)
- (guix build utils)
- (ice-9 ftw))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'replace-bundled-cddlib
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((cddlib-src (assoc-ref inputs "cddlib-src"))
- (local-dir "cddlib_guix"))
- (mkdir local-dir)
- (with-directory-excursion local-dir
- (invoke "tar" "xvf" cddlib-src))
- (let ((cddlib-src-folder
- (string-append local-dir "/"
- (list-ref (scandir local-dir) 2)
- "/lib-src")))
- (for-each make-file-writable (find-files "cdd_src" ".*"))
- (for-each
- (lambda (file)
- (copy-file file
- (string-append "cdd_src/" (basename file))))
- (find-files cddlib-src-folder ".*[ch]$")))
- #t)))
- (add-after 'unpack 'fix-makefile
- (lambda _
- ;; Remove system calls to 'git'.
- (substitute* "Makefile"
- (("^DESCRIPT:=pplacer-.*")
- (string-append
- "DESCRIPT:=pplacer-$(shell uname)-v" ,version "\n")))
- (substitute* "myocamlbuild.ml"
- (("git describe --tags --long .*\\\" with")
- (string-append
- "echo -n v" ,version "-" ,commit "\" with")))
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (copy-recursively "bin" bin))
- #t)))))
- (native-inputs
- `(("zlib" ,zlib)
- ("gsl" ,gsl)
- ("ocaml-ounit" ,ocaml4.01-ounit)
- ("ocaml-batteries" ,ocaml4.01-batteries)
- ("ocaml-camlzip" ,ocaml4.01-camlzip)
- ("ocaml-csv" ,ocaml4.01-csv)
- ("ocaml-sqlite3" ,ocaml4.01-sqlite3)
- ("ocaml-xmlm" ,ocaml4.01-xmlm)
- ("ocaml-mcl" ,ocaml4.01-mcl)
- ("ocaml-gsl" ,ocaml4.01-gsl)
- ("cddlib-src" ,(package-source cddlib))))
- (propagated-inputs
- `(("pplacer-scripts" ,pplacer-scripts)))
- (synopsis "Phylogenetic placement of biological sequences")
- (description
- "Pplacer places query sequences on a fixed reference phylogenetic tree
-to maximize phylogenetic likelihood or posterior probability according to a
-reference alignment. Pplacer is designed to be fast, to give useful
-information about uncertainty, and to offer advanced visualization and
-downstream analysis.")
- (home-page "http://matsen.fhcrc.org/pplacer")
- (license license:gpl3))))
-
-;; This package is installed alongside 'pplacer'. It is a separate package so
-;; that it can use the python-build-system for the scripts that are
-;; distributed alongside the main OCaml binaries.
-(define pplacer-scripts
- (package
- (inherit pplacer)
- (name "pplacer-scripts")
- (build-system python-build-system)
- (arguments
- `(#:python ,python-2
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'enter-scripts-dir
- (lambda _ (chdir "scripts") #t))
- (replace 'check
- (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t))
- (add-after 'install 'wrap-executables
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (let ((path (string-append
- (assoc-ref inputs "hmmer") "/bin:"
- (assoc-ref inputs "infernal") "/bin")))
- (display path)
- (wrap-program (string-append bin "/refpkg_align.py")
- `("PATH" ":" prefix (,path))))
- (let ((path (string-append
- (assoc-ref inputs "hmmer") "/bin")))
- (wrap-program (string-append bin "/hrefpkg_query.py")
- `("PATH" ":" prefix (,path)))))
- #t)))))
- (inputs
- `(("infernal" ,infernal)
- ("hmmer" ,hmmer)))
- (propagated-inputs
- `(("python-biopython" ,python2-biopython)
- ("taxtastic" ,taxtastic)))
- (synopsis "Pplacer Python scripts")))
-
(define-public python2-pbcore
(package
(name "python2-pbcore")
@@ -11172,7 +11068,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(native-inputs
`(("ldc" ,ldc)
("rdmd" ,rdmd)
- ("python" ,python-minimal)
+ ("python" ,python)
("biod"
,(let ((commit "4f1a7d2fb7ef3dfe962aa357d672f354ebfbe42e"))
(origin
@@ -14441,3 +14337,69 @@ Nanopolish can calculate an improved consensus sequence for a draft genome
assembly, detect base modifications, call SNPs (Single nucleotide
polymorphisms) and indels with respect to a reference genome and more.")
(license license:expat))))
+
+(define-public cnvkit
+ (package
+ (name "cnvkit")
+ (version "0.9.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/etal/cnvkit.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0g2f78k68yglmj4fsfmgs8idqv3di9aj53fg0ld0hqljg8chhh82"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-biopython" ,python-biopython)
+ ("python-future" ,python-future)
+ ("python-matplotlib" ,python-matplotlib)
+ ("python-numpy" ,python-numpy)
+ ("python-reportlab" ,python-reportlab)
+ ("python-pandas" ,python-pandas)
+ ("python-pysam" ,python-pysam)
+ ("python-pyfaidx" ,python-pyfaidx)
+ ("python-scipy" ,python-scipy)
+ ;; R packages
+ ("r-dnacopy" ,r-dnacopy)))
+ (home-page "https://cnvkit.readthedocs.org/")
+ (synopsis "Copy number variant detection from targeted DNA sequencing")
+ (description
+ "CNVkit is a Python library and command-line software toolkit to infer
+and visualize copy number from high-throughput DNA sequencing data. It is
+designed for use with hybrid capture, including both whole-exome and custom
+target panels, and short-read sequencing platforms such as Illumina and Ion
+Torrent.")
+ (license license:asl2.0)))
+
+(define-public python-pyfit-sne
+ (package
+ (name "python-pyfit-sne")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/KlugerLab/pyFIt-SNE.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13wh3qkzs56azmmgnxib6xfr29g7xh09sxylzjpni5j0pp0rc5qw"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-numpy" ,python-numpy)))
+ (inputs
+ `(("fftw" ,fftw)))
+ (native-inputs
+ `(("python-cython" ,python-cython)))
+ (home-page "https://github.com/KlugerLab/pyFIt-SNE")
+ (synopsis "FFT-accelerated Interpolation-based t-SNE")
+ (description
+ "t-Stochastic Neighborhood Embedding (t-SNE) is a highly successful
+method for dimensionality reduction and visualization of high dimensional
+datasets. A popular implementation of t-SNE uses the Barnes-Hut algorithm to
+approximate the gradient at each iteration of gradient descent. This package
+is a Cython wrapper for FIt-SNE.")
+ (license license:bsd-4)))
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 00b115cb9c..d96610a791 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu>
@@ -426,16 +426,16 @@ desktops.")
(define-public qbittorrent
(package
(name "qbittorrent")
- (version "4.1.3")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/qbittorrent/qBittorrent/archive/release-"
- version ".tar.gz"))
- (file-name (string-append name "-release-" version ".tar.gz"))
- (sha256
- (base32
- "00zrpnwanq9f7maky2z4wnzw08xy902s77scm2gcvxxxankr4j92"))))
+ (version "4.1.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/qbittorrent/qBittorrent.git")
+ (commit (string-append "release-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index a566001b07..b0617f452a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li>
;;;
;;; This file is part of GNU Guix.
@@ -773,7 +773,7 @@ tools, and more.")
(define-public os-prober
(package
(name "os-prober")
- (version "1.76")
+ (version "1.77")
(source
(origin
(method url-fetch)
@@ -781,15 +781,15 @@ tools, and more.")
version ".tar.xz"))
(sha256
(base32
- "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"))))
+ "0pvhrw4h05n21zw7ig3a3bi8aqdh6zxs0x1znz4g7vhspsps93ld"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
- (ice-9 regex) ; for string-match
- (srfi srfi-26)) ; for cut
+ (ice-9 regex) ; for string-match
+ (srfi srfi-26)) ; for cut
#:make-flags (list "CC=gcc")
- #:tests? #f ; no tests
+ #:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index 09812d4a49..20a2e5aabf 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
@@ -108,7 +108,7 @@ any small or embedded system.")
(define-public toybox
(package
(name "toybox")
- (version "0.7.8")
+ (version "0.8.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -116,7 +116,7 @@ any small or embedded system.")
version ".tar.gz"))
(sha256
(base32
- "1mlqv5hsvy8ii6m698hq6rc316klwv44jlr034knwg6bk1lf2qj9"))))
+ "0mirj977zxsxnfaiqndwgsn9calgg312d817fi1hkfbd8kcyrk73"))))
(build-system gnu-build-system)
(arguments
'(#:phases
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 2e9103ab90..7ba0b9c208 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -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 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 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>
@@ -286,7 +286,7 @@ format.")
(define-public cppcheck
(package
(name "cppcheck")
- (version "1.86")
+ (version "1.87")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -294,7 +294,7 @@ format.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0jr4aah72c7wy94a8vlj3k050rx6pmc7m9nvmll1jwbscxj5f7ff"))))
+ (base32 "1xiy54rz99nzbpwj35jiyssd2nc6k5k0lw5ml6nh2qnmbfkl8swl"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DBUILD_TESTS=ON")))
@@ -694,23 +694,22 @@ and many external plugins.")
(define-public python-pytest-cov
(package
(name "python-pytest-cov")
- (version "2.6.0")
+ (version "2.6.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-cov" version))
(sha256
- (base32
- "0qnpp9y3ygx4jk4pf5ad71fh2skbvnr6gl54m7rg5qysnx4g0q73"))))
+ (base32 "0cyxbbghx2l4p60w10k00j1j74q1ngfiffr0pxn73ababjr69dha"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
- ;; options taken from tox.ini
+ ;; Options taken from tox.ini.
;; TODO: make "--restructuredtext" tests pass. They currently fail
- ;; with "Duplicate implicit target name"
+ ;; with "Duplicate implicit target name".
(invoke "python" "./setup.py" "check"
"--strict" "--metadata"))))))
(propagated-inputs
@@ -755,14 +754,14 @@ supports coverage of subprocesses.")
(define-public python-pytest-mock
(package
(name "python-pytest-mock")
- (version "1.10.0")
+ (version "1.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-mock" version))
(sha256
(base32
- "1h6lgpmsvs9s8j2s80v06f9f3iaw1n1rc51mbrxk1f12sw4q56nq"))))
+ "1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad"))))
(build-system python-build-system)
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
@@ -1905,14 +1904,13 @@ JSON APIs with Behave.")
(define-public python-nose-randomly
(package
(name "python-nose-randomly")
- (version "1.2.5")
+ (version "1.2.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nose-randomly" version))
(sha256
- (base32
- "1cw9dlr1zh3w4i438kin7z0rm8092ki52hayisyc43h9pcplq7rn"))))
+ (base32 "0z662rqhfk4bjmg806mn4frb8nz4gbh7mrddsrhfffp1g4yklj3y"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
@@ -2140,7 +2138,7 @@ provides a simple way to achieve this.")
(define-public umockdev
(package
(name "umockdev")
- (version "0.11.3")
+ (version "0.12.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/martinpitt/umockdev/"
@@ -2148,7 +2146,7 @@ provides a simple way to achieve this.")
"umockdev-" version ".tar.xz"))
(sha256
(base32
- "1in2hdan1g62wpvgjlj8mci85551ipr1964j2b9j06gm3blpihcx"))))
+ "1hx5jm9afng6hw9wyp524z8nwdp6w053pca0w2c0gqpgrmvjxvd2"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -2161,8 +2159,8 @@ provides a simple way to achieve this.")
#t)))))
(native-inputs
`(("vala" ,vala)
- ("python" ,python) ; for tests
- ("which" ,which) ; for tests
+ ("python" ,python) ; for tests
+ ("which" ,which) ; for tests
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(inputs
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 10601f0bfa..7d0042872e 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -42,22 +42,22 @@
(define nanopass
(let ((version "1.9"))
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/nanopass/nanopass-framework-scheme/archive"
- "/v" version ".tar.gz"))
- (sha256 (base32 "11pwyy4jiwhcl2am3a4ciczacjbjkyvdizqzdglb3l1hj2gj6nv2"))
- (file-name (string-append "nanopass-" version ".tar.gz")))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nanopass/nanopass-framework-scheme.git")
+ (commit (string-append "v" version))))
+ (sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri"))
+ (file-name (git-file-name "nanopass" version)))))
(define stex
(let ((version "1.2.1"))
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/dybvig/stex/archive"
- "/v" version ".tar.gz"))
- (sha256 (base32 "03pl3f668h24dn51vccr1sj5lsba9zq3j37bnxjvdadcdaj4qy5z"))
- (file-name (string-append "stex-" version ".tar.gz")))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dybvig/stex.git")
+ (commit (string-append "v" version))))
+ (sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n"))
+ (file-name (git-file-name "stex" version)))))
(define-public chez-scheme
(package
@@ -65,12 +65,13 @@
(version "9.5")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/cisco/ChezScheme/archive/"
- "v" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cisco/ChezScheme.git")
+ (commit (string-append "v" version))))
(sha256
- (base32 "135991hspq0grf26pvl2lkwhp92yz204h6rgiwyym0x6v0xzknd1"))
- (file-name (string-append "chez-scheme-" version ".tar.gz"))
+ (base32 "132fal5hwiq0bqzvfhjsqr4d11cfdh1670f6286ks29xxj1c04zq"))
+ (file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
;; Fix compilation with glibc >= 2.26, which removed xlocale.h.
@@ -122,7 +123,8 @@
;; next one; see <https://github.com/cisco/ChezScheme/issues/209>.
(substitute* "csug/copyright.stex"
(("\\\\INSERTREVISIONMONTHSPACEYEAR" )
- "October 2017")))) ; tarball release date
+ "October 2017")) ; tarball release date
+ #t))
;; Adapt the custom 'configure' script.
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -140,9 +142,9 @@
(apply unpack (list #:source src))
(apply patch-source-shebangs (list #:source src)))
(delete-file-recursively new-name)
- (system* "mv" orig-name new-name)))
- `((,nanopass "nanopass-framework-scheme-1.9" "nanopass")
- (,stex "stex-1.2.1" "stex")))
+ (invoke "mv" orig-name new-name)))
+ `((,nanopass "source" "nanopass")
+ (,stex "source" "stex")))
;; The Makefile wants to download and compile "zlib". We patch
;; it to use the one from our 'zlib' package.
(substitute* "configure"
@@ -174,23 +176,24 @@
(("/bin/true") (which "true")))
(substitute* "stex/Makefile"
(("PREFIX=/usr") (string-append "PREFIX=" out)))
- (zero? (system* "./configure" "--threads"
- (string-append "--installprefix=" out))))))
+ (invoke "./configure" "--threads"
+ (string-append "--installprefix=" out)))))
;; Installation of the documentation requires a running "chez".
(add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
- (doc (string-append (assoc-ref outputs "doc")
+ (let ((doc (string-append (assoc-ref outputs "doc")
"/share/doc/" ,name "-" ,version)))
- (setenv "HOME" (getcwd))
- (setenv "PATH" (string-append (getenv "PATH") ":" bin))
- (with-directory-excursion "stex"
- (system* "make" (string-append "BIN=" bin)))
- (system* "make" "docs")
+ (invoke "make" "docs")
(with-directory-excursion "csug"
(substitute* "Makefile"
- (("/tmp/csug9") doc))
- (system* "make" "install")
+ ;; The ‘installdir=’ can't be overruled on the command line.
+ (("/tmp/csug9") doc)
+ ;; $m is the ‘machine type’, e.g. ‘ta6le’ on x86_64, but is
+ ;; set incorrectly for some reason, e.g. to ‘a6le’ on x86_64.
+ ;; Avoid the whole mess by running the (machine-independent)
+ ;; ‘installsh’ script at its original location.
+ (("\\$m/installsh") "makefiles/installsh"))
+ (invoke "make" "install")
(install-file "csug.pdf" doc))
(with-directory-excursion "release_notes"
(install-file "release_notes.pdf" doc))
@@ -237,13 +240,13 @@ and 32-bit PowerPC architectures.")
(version "1.0")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/fedeinthemix/chez-srfi/archive"
- "/v" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fedeinthemix/chez-srfi.git")
+ (commit (string-append "v" version))))
(sha256
- (base32 "17i4wly7bcr5kb5hf04ljpbvv4r5hsr9xsmw650fj43z9jr303gs"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("chez-scheme" ,chez-scheme)))
@@ -264,16 +267,15 @@ and 32-bit PowerPC architectures.")
(revision "1"))
(package
(name "chez-web")
- ;; release 2.0 is different and doesn't work.
- (version (string-append "2.0-" revision "."
- (string-take commit 7)))
+ ;; Release 2.0 is different and doesn't work.
+ (version (git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arcfide/ChezWEB.git")
(commit commit)))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b"))))
(build-system gnu-build-system)
@@ -318,7 +320,8 @@ and 32-bit PowerPC architectures.")
(("\\./chezweave" all)
(string-append "chez-scheme --program " all)))
(substitute* "installit"
- (("-g \\$GROUP -o \\$OWNER") "")))))))
+ (("-g \\$GROUP -o \\$OWNER") ""))
+ #t)))))
(home-page "https://github.com/arcfide/ChezWEB")
(synopsis "Hygienic Literate Programming for Chez Scheme")
(description "ChezWEB is a system for doing Knuthian style WEB
@@ -330,15 +333,14 @@ programming in Scheme.")
(revision "1"))
(package
(name "chez-sockets")
- (version (string-append "0.0-" revision "."
- (string-take commit 7)))
+ (version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arcfide/chez-sockets.git")
(commit commit)))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32 "1n5fbwwz51fdzvjackgmnsgh363g9inyxv7kmzi0469cwavwcx5m"))))
(build-system gnu-build-system)
@@ -435,11 +437,13 @@ Chez Scheme.")
(home-page "https://github.com/fedeinthemix/chez-matchable")
(source
(origin
- (method url-fetch)
- (uri (string-append home-page "/archive" "/v" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
(sha256
- (base32 "0cl4vc6487pikjq159pj4n5ghyaax31nywb5n4yn1682h3ir1hs0"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (base32 "02qn7x348p23z1x5lwhkyj7i8z6mgwpzpnwr8dyina0yzsdkr71s"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("chez-srfi" ,chez-srfi))) ; for tests
@@ -462,13 +466,13 @@ Chez Scheme.")
(version "0.9.4")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/fedeinthemix/chez-irregex/archive"
- "/v" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fedeinthemix/chez-irregex.git")
+ (commit (string-append "v" version))))
(sha256
- (base32 "0ywy5syaw549a58viz68dmgnv756ic705rcnlqxgjq27lnaim53b"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("chez-matchable" ,chez-matchable))) ; for tests
@@ -514,10 +518,10 @@ syntax, with various aliases for commonly used patterns.")
(replace 'configure ,chez-configure)
(replace 'build
(lambda* (#:key (make-flags '()) #:allow-other-keys)
- (zero? (apply system* "make" "chez-build" make-flags))))
+ (apply invoke "make" "chez-build" make-flags)))
(replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys)
- (zero? (apply system* "make" "chez-install" make-flags)))))))
+ (apply invoke "make" "chez-install" make-flags))))))
(home-page "http://synthcode.com/scheme/fmt")
(synopsis "Combinator formatting library for Chez Scheme")
(description "This package provides a library of procedures for
@@ -534,14 +538,16 @@ strings.")
(home-page "https://github.com/fedeinthemix/chez-mit")
(source
(origin
- (method url-fetch)
- (uri (string-append home-page "/archive/v" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
(sha256
- (base32 "1p11q061znwxzxrxg3vw4dbsnpv1dav12hjhnkrjnzyyjvvdm2kn"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (base32 "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
- `(("chez-srfi" ,chez-srfi))) ; for tests
+ `(("chez-srfi" ,chez-srfi))) ; for tests
(native-inputs
`(("chez-scheme" ,chez-scheme)))
(arguments
@@ -562,14 +568,16 @@ required to port the program 'Scmutils' to Chez Scheme.")
(home-page "https://github.com/fedeinthemix/chez-scmutils")
(source
(origin
- (method url-fetch)
- (uri (string-append home-page "/archive/v" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
(sha256
- (base32 "1a5j61pggaiwl1gl6m038rcy5n8r2sj5nyjmz86jydx97mm5i8hj"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (base32 "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
- `(("chez-srfi" ,chez-srfi))) ; for tests
+ `(("chez-srfi" ,chez-srfi))) ; for tests
(native-inputs
`(("chez-scheme" ,chez-scheme)))
(propagated-inputs
@@ -577,7 +585,7 @@ required to port the program 'Scmutils' to Chez Scheme.")
("chez-srfi" ,chez-srfi)))
(arguments
`(#:make-flags ,(chez-make-flags name version)
- #:tests? #f ; no test suite
+ #:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(replace 'configure ,chez-configure)
@@ -589,7 +597,7 @@ required to port the program 'Scmutils' to Chez Scheme.")
(delete 'build)
(add-after 'install 'install-src
(lambda* (#:key (make-flags '()) #:allow-other-keys)
- (zero? (apply system* "make" "install-src" make-flags))))
+ (apply invoke "make" "install-src" make-flags)))
(add-after 'install-src 'absolute-path-in-scm-files
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -609,12 +617,13 @@ required to port the program 'Scmutils' to Chez Scheme.")
(let* ((out (assoc-ref outputs "out"))
(mk-file (car (find-files out "Makefile"))))
(with-directory-excursion (dirname mk-file)
- (zero? (apply system* "make" "build" make-flags))))))
+ (apply invoke "make" "build" make-flags)))))
(add-after 'build 'clean-up
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(for-each delete-file
- (find-files out "Makefile|compile-all\\.ss"))))))))
+ (find-files out "Makefile|compile-all\\.ss"))
+ #t))))))
(synopsis "Port of MIT/GNU Scheme Scmutils to Chez Scheme")
(description "This package provides a port of the MIT/GNU Scheme
Scmutils program to Chez Scheme. The port consists of a set of
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
new file mode 100644
index 0000000000..1594bfeb60
--- /dev/null
+++ b/gnu/packages/chromium.scm
@@ -0,0 +1,705 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages chromium)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix gexp)
+ #:use-module (guix store)
+ #:use-module (guix monads)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages assembly)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages build-tools)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages cups)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnuzilla)
+ #:use-module (gnu packages gperf)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages icu4c)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages libevent)
+ #:use-module (gnu packages libffi)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages kerberos)
+ #:use-module (gnu packages ninja)
+ #:use-module (gnu packages node)
+ #:use-module (gnu packages pciutils)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
+ #: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)
+ #:use-module (gnu packages xiph)
+ #:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
+ #:use-module (gnu packages xorg))
+
+(define %preserved-third-party-files
+ '("base/third_party/dmg_fp" ;X11-style
+ "base/third_party/dynamic_annotations" ;BSD-2
+ "base/third_party/icu" ;Unicode, X11-style
+ "base/third_party/superfasthash" ;BSD-3
+ "base/third_party/symbolize" ;BSD-3
+ "base/third_party/xdg_mime" ;LGPL2.0+ or Academic 2.0
+ "base/third_party/xdg_user_dirs" ;Expat
+ "chrome/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
+ "courgette/third_party/bsdiff" ;BSD-2, BSD protection license
+ "courgette/third_party/divsufsort" ;Expat
+ "net/third_party/http2" ;BSD-3
+ "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
+ "net/third_party/nss" ;MPL-2.0
+ "net/third_party/quic" ;BSD-3
+ "net/third_party/spdy" ;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
+ "third_party/angle/src/common/third_party/xxhash" ;BSD-2
+ "third_party/angle/src/third_party/compiler" ;BSD-2
+ "third_party/angle/src/third_party/libXNVCtrl" ;Expat
+ "third_party/angle/src/third_party/trace_event" ;BSD-3
+ "third_party/angle/third_party/glslang" ;BSD-3
+ "third_party/angle/third_party/spirv-headers" ;Expat
+ "third_party/angle/third_party/spirv-tools" ;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/blink" ;BSD-3, LGPL2+
+ "third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC)
+ "third_party/boringssl/src/third_party/fiat" ;Expat
+ "third_party/breakpad" ;BSD-3
+ "third_party/brotli" ;Expat
+ "third_party/cacheinvalidation" ;ASL2.0
+ "third_party/catapult" ;BSD-3
+ "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
+ "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
+ "third_party/catapult/third_party/polymer" ;BSD-3
+ "third_party/catapult/tracing/third_party/d3" ;BSD-3
+ "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
+ "third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3
+ "third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat
+ "third_party/catapult/tracing/third_party/oboe" ;BSD-2
+ "third_party/catapult/tracing/third_party/pako" ;Expat
+ "third_party/ced" ;BSD-3
+ "third_party/cld_3" ;ASL2.0
+ "third_party/crashpad" ;ASL2.0
+ "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
+ "third_party/crc32c" ;BSD-3
+ "third_party/cros_system_api" ;BSD-3
+ "third_party/dom_distiller_js" ;BSD-3
+ "third_party/fips181" ;BSD-3
+ "third_party/flatbuffers" ;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
+ "third_party/googletest" ;BSD-3
+ "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
+ "third_party/iccjpeg" ;IJG
+ "third_party/inspector_protocol" ;BSD-3
+ "third_party/jinja2" ;BSD-3
+ "third_party/jstemplate" ;ASL2.0
+ "third_party/khronos" ;Expat, SGI
+ "third_party/leveldatabase" ;BSD-3
+ "third_party/libXNVCtrl" ;Expat
+ "third_party/libaddressinput" ;ASL2.0
+ "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
+ "third_party/libaom/source/libaom/third_party/vector" ;Expat
+ "third_party/libaom/source/libaom/third_party/x86inc" ;ISC
+ "third_party/libjingle_xmpp" ;BSD-3
+ "third_party/libphonenumber" ;ASL2.0
+ "third_party/libsecret" ;LGPL2.1+
+ "third_party/libsrtp" ;BSD-3
+ "third_party/libsync" ;ASL2.0
+ "third_party/libudev" ;LGPL2.1+
+ "third_party/libwebm" ;BSD-3
+ "third_party/libxml/chromium" ;BSD-3
+ "third_party/libyuv" ;BSD-3
+ "third_party/lss" ;BSD-3
+ "third_party/markupsafe" ;BSD-3
+ "third_party/mesa_headers" ;Expat, SGI
+ "third_party/metrics_proto" ;BSD-3
+ "third_party/modp_b64" ;BSD-3
+ "third_party/nasm" ;BSD-2
+ "third_party/node" ;Expat
+ "third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2
+ "third_party/ots" ;BSD-3
+ "third_party/pdfium" ;BSD-3
+ "third_party/pdfium/third_party/agg23" ;Expat
+ "third_party/pdfium/third_party/base" ;BSD-3
+ "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
+ "third_party/pdfium/third_party/skia_shared" ;BSD-3
+ "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
+ "third_party/ply" ;BSD-3
+ "third_party/polymer" ;BSD-3
+ "third_party/protobuf" ;BSD-3
+ "third_party/protobuf/third_party/six" ;Expat
+ "third_party/pyjson5" ;ASL2.0
+ "third_party/qcms" ;Expat
+ "third_party/rnnoise" ;BSD-3
+ "third_party/s2cellid" ;ASL2.0
+ "third_party/sfntly" ;ASL2.0
+ "third_party/skia" ;BSD-3
+ "third_party/skia/third_party/gif" ;MPL1.1/GPL2+/LGPL2.1+
+ "third_party/skia/third_party/skcms" ;BSD-3
+ "third_party/skia/third_party/vulkan" ;BSD-3
+ "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/ungoogled" ;BSD-3
+ "third_party/usb_ids" ;BSD-3
+ "third_party/usrsctp" ;BSD-2
+ "third_party/web-animations-js" ;ASL2.0
+ "third_party/webdriver" ;ASL2.0
+ "third_party/webrtc" ;BSD-3
+ "third_party/webrtc/common_audio/third_party/fft4g" ;Non-copyleft
+ "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain
+ "third_party/webrtc/modules/third_party/fft" ;Non-copyleft
+ "third_party/webrtc/modules/third_party/g711" ;Public domain
+ "third_party/webrtc/modules/third_party/g722" ;Public domain
+ "third_party/webrtc/rtc_base/third_party/base64" ;Non-copyleft
+ "third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
+ "third_party/widevine/cdm/widevine_cdm_version.h" ;BSD-3
+ "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
+ "third_party/woff2" ;ASL2.0
+ "third_party/xdg-utils" ;Expat
+ "third_party/yasm/run_yasm.py" ;BSD-2 or BSD-3
+ "third_party/zlib/google" ;BSD-3
+ "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+
+ "v8/src/third_party/utf8-decoder" ;Expat
+ "v8/src/third_party/valgrind" ;BSD-4
+ "v8/third_party/inspector_protocol" ;BSD-3
+ "v8/third_party/v8/builtins")) ;PSFL
+
+(define* (computed-origin-method gexp-promise hash-algo hash
+ #:optional (name "source")
+ #:key (system (%current-system))
+ (guile (default-guile)))
+ "Return a derivation that executes the G-expression that results
+from forcing GEXP-PROMISE."
+ (mlet %store-monad ((guile (package->derivation guile system)))
+ (gexp->derivation (or name "computed-origin")
+ (force gexp-promise)
+ #:system system
+ #:guile-for-build guile)))
+
+(define %chromium-version "72.0.3626.109")
+(define %ungoogled-revision "a58db880c15e5077e881cad7b07d1a277ecd463a")
+
+;; This is a "computed" origin that does the following:
+;; 1) Runs the Ungoogled scripts on a pristine Chromium tarball.
+;; 2) Prunes all third_party folders that are not explicitly preserved.
+;; 3) Adjusts "GN" build files such that system libraries are preferred.
+(define ungoogled-chromium-source
+ (let* ((chromium-source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://commondatastorage.googleapis.com"
+ "/chromium-browser-official/chromium-"
+ %chromium-version ".tar.xz"))
+ (sha256
+ (base32
+ "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp"))))
+ (ungoogled-source
+ (origin
+ (method git-fetch)
+ (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)))
+ (sha256
+ (base32
+ "19w60b71rcccp32b7rcpw75kfg4sw2xfr32rfk0hcyaj5rq0mm69")))))
+
+ (origin
+ (method computed-origin-method)
+ (file-name (string-append "ungoogled-chromium-" %chromium-version ".tar.xz"))
+ (sha256 #f)
+ (uri
+ (delay
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (let ((chromium-dir (string-append "chromium-" #$%chromium-version))
+ (preserved-files (list #$@%preserved-third-party-files)))
+
+ (set-path-environment-variable
+ "PATH" '("bin")
+ (list #+(canonical-package patch)
+ #+(canonical-package xz)
+ #+(canonical-package tar)
+ #+python-2
+ #+python))
+
+ (copy-recursively #+ungoogled-source "/tmp/ungoogled")
+
+ (with-directory-excursion "/tmp/ungoogled"
+
+ ;; Create a custom "bundle" that inherits from linux_rooted
+ ;; and adds an additional patch.
+ (format #t "Creating Guix config bundle...~%")
+ (force-output)
+ (mkdir-p "config_bundles/guix")
+ (call-with-output-file "config_bundles/guix/bundlemeta.ini"
+ (lambda (port)
+ (format port
+ "[bundle]
+display_name = GNU Guix
+depends = linux_rooted\n")))
+ (call-with-output-file "config_bundles/guix/patch_order.list"
+ (lambda (port)
+ (format port "debian_buster/system/openjpeg.patch\n")))
+
+ (format #t "Unpacking chromium tarball...~%")
+ (force-output)
+ (invoke "tar" "xf" #+chromium-source)
+
+ (format #t "Ungooglifying...~%")
+ (force-output)
+ (invoke "python3" "run_buildkit_cli.py" "prune"
+ "-b" "config_bundles/guix" chromium-dir)
+ (invoke "python3" "run_buildkit_cli.py" "patches" "apply"
+ "-b" "config_bundles/guix" chromium-dir)
+ (invoke "python3" "run_buildkit_cli.py" "domains" "apply"
+ "-b" "config_bundles/linux_rooted"
+ "-c" "/tmp/domainscache.tar.gz" chromium-dir)
+
+ (with-directory-excursion chromium-dir
+ (format #t "Pruning third party files...~%")
+ (force-output)
+ (apply invoke "python"
+ "build/linux/unbundle/remove_bundled_libraries.py"
+ "--do-remove" preserved-files)
+
+ (format #t "Replacing GN files...~%")
+ (force-output)
+ (invoke "python3" "build/linux/unbundle/replace_gn_files.py"
+ "--system-libraries" "ffmpeg" "flac" "fontconfig"
+ "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
+ "libjpeg" "libpng" "libvpx" "libwebp" "libxml"
+ "libxslt" "openh264" "opus" "re2" "snappy" "yasm"
+ "zlib"))
+
+ (format #t (string-append "Packing new ungoogled tarball ...~%"))
+ (force-output)
+ (invoke "tar" "cvfa" #$output
+ ;; Avoid non-determinism in the archive.
+ "--mtime=@0"
+ "--owner=root:0"
+ "--group=root:0"
+ "--sort=name"
+ chromium-dir)
+
+ #t)))))))))
+
+(define opus+custom
+ (package/inherit opus
+ (name "opus+custom")
+ (arguments
+ (substitute-keyword-arguments (package-arguments opus)
+ ((#:configure-flags flags ''())
+ ;; Opus Custom is an optional extension of the Opus
+ ;; specification that allows for unsupported frame
+ ;; sizes. Chromium requires that this is enabled.
+ `(cons "--enable-custom-modes"
+ ,flags))))))
+
+(define-public ungoogled-chromium
+ (package
+ (name "ungoogled-chromium")
+ (version %chromium-version)
+ (synopsis "Graphical web browser")
+ (source ungoogled-chromium-source)
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f
+ ;; FIXME: Chromiums RUNPATH lacks entries for some libraries, so
+ ;; we have to disable validation and add a wrapper below.
+ #:validate-runpath? #f
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 ftw)
+ (ice-9 regex)
+ (srfi srfi-26))
+ #:configure-flags
+ ;; See tools/gn/docs/cookbook.md and
+ ;; https://www.chromium.org/developers/gn-build-configuration
+ ;; for usage. Run "./gn args . --list" in the Release
+ ;; directory for an exhaustive list of supported flags.
+ ;; (Note: The 'configure' phase will do that for you.)
+ (list "is_debug=false"
+ "use_gold=false"
+ "use_lld=false"
+ "linux_use_bundled_binutils=false"
+ "use_custom_libcxx=false"
+ "use_sysroot=false"
+ "enable_precompiled_headers=false"
+ "goma_dir=\"\""
+ "enable_nacl=false"
+ "enable_nacl_nonsfi=false"
+ "use_allocator=\"none\""
+ "use_unofficial_version_number=false"
+ "treat_warnings_as_errors=false"
+ "use_official_google_api_keys=false"
+ "fieldtrial_testing_like_official_build=true"
+ "safe_browsing_mode=0"
+ "enable_mdns=false"
+ "enable_one_click_signin=false"
+ "enable_reading_list=false"
+ "enable_remoting=false"
+ "enable_reporting=false"
+ "enable_service_discovery=false"
+ "enable_swiftshader=false"
+ ;; Disable type-checking for the Web UI to avoid a Java dependency.
+ "closure_compile=false"
+
+ ;; Define a custom toolchain that simply looks up CC, AR and
+ ;; friends from the environment.
+ "custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+ "host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+ ;; Don't assume it's clang.
+ "is_clang=false"
+ ;; Disable debugging features to save space. These are normally
+ ;; pulled in by "is_official_build", but that requires "is_clang".
+ "blink_symbol_level=0"
+ "enable_iterator_debugging=false"
+ "exclude_unwind_tables=true"
+ ;; Optimize for building everything at once, as opposed to
+ ;; incrementally for development. See "docs/jumbo.md".
+ "use_jumbo_build=true"
+
+ ;; Prefer system libraries.
+ "use_system_freetype=true"
+ "use_system_harfbuzz=true"
+ "use_system_lcms2=true"
+ "use_system_libdrm=true"
+ "use_system_libjpeg=true"
+ "use_system_libpng=true"
+ "use_system_zlib=true"
+ "use_gnome_keyring=false" ;deprecated by libsecret
+ "use_openh264=true"
+ "use_pulseaudio=true"
+ "link_pulseaudio=true"
+ "use_vaapi=true"
+
+ ;; Don't arbitrarily restrict formats supported by system ffmpeg.
+ "proprietary_codecs=true"
+ "ffmpeg_branding=\"Chrome\""
+
+ ;; WebRTC stuff.
+ "rtc_use_h264=true"
+ ;; Don't use bundled sources.
+ "rtc_build_json=false"
+ "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_jsoncpp_root=\""
+ (assoc-ref %build-inputs "jsoncpp")
+ "/include/jsoncpp/json\"")
+ (string-append "rtc_ssl_root=\""
+ (assoc-ref %build-inputs "openssl")
+ "/include/openssl\""))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-stuff
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "printing/cups_config_helper.py"
+ (("cups_config =.*")
+ (string-append "cups_config = '" (assoc-ref inputs "cups")
+ "/bin/cups-config'\n")))
+
+ (substitute*
+ '("base/process/launch_posix.cc"
+ "base/third_party/dynamic_annotations/dynamic_annotations.c"
+ "sandbox/linux/seccomp-bpf/sandbox_bpf.cc"
+ "sandbox/linux/services/credentials.cc"
+ "sandbox/linux/services/namespace_utils.cc"
+ "sandbox/linux/services/syscall_wrappers.cc"
+ "sandbox/linux/syscall_broker/broker_host.cc")
+ (("include \"base/third_party/valgrind/") "include \"valgrind/"))
+
+ (for-each (lambda (file)
+ (substitute* file
+ ;; Fix opus include path.
+ ;; Do not substitute opus_private.h.
+ (("#include \"opus\\.h\"")
+ "#include \"opus/opus.h\"")
+ (("#include \"opus_custom\\.h\"")
+ "#include \"opus/opus_custom.h\"")
+ (("#include \"opus_defines\\.h\"")
+ "#include \"opus/opus_defines.h\"")
+ (("#include \"opus_multistream\\.h\"")
+ "#include \"opus/opus_multistream.h\"")
+ (("#include \"opus_types\\.h\"")
+ "#include \"opus/opus_types.h\"")))
+ (find-files (string-append "third_party/webrtc/modules"
+ "/audio_coding/codecs/opus")))
+
+ (substitute* "chrome/common/chrome_paths.cc"
+ (("/usr/share/chromium/extensions")
+ ;; TODO: Add ~/.guix-profile.
+ "/run/current-system/profile/share/chromium/extensions"))
+
+ ;; XXX: Should be unnecessary when use_system_lcms2=true.
+ (substitute* "third_party/pdfium/core/fxcodec/codec/ccodec_iccmodule.h"
+ (("include \"third_party/lcms/include/lcms2\\.h\"")
+ "include \"lcms2.h\""))
+
+ (substitute*
+ "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
+ (("include \"third_party/curl") "include \"curl"))
+
+ (substitute* "third_party/webrtc/rtc_base/strings/json.h"
+ (("#include \"third_party/jsoncpp/") "#include \"json/"))
+
+ (substitute* "media/base/decode_capabilities.cc"
+ (("third_party/libvpx/source/libvpx/") ""))
+
+ (substitute* "ui/gfx/skia_util.h"
+ (("third_party/vulkan/include/") ""))
+
+ ;; Building chromedriver embeds some files using the ZIP
+ ;; format which doesn't support timestamps before
+ ;; 1980. Therefore, advance the timestamps of the files
+ ;; which are included so that building chromedriver
+ ;; works.
+ (let ((circa-1980 (* 10 366 24 60 60)))
+ (for-each (lambda (file)
+ (utime file circa-1980 circa-1980))
+ '("chrome/test/chromedriver/extension/background.js"
+ "chrome/test/chromedriver/extension/manifest.json")))
+
+ #t))
+ (add-before 'configure 'prepare-build-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+
+ ;; Make sure the right build tools are used.
+ (setenv "AR" "ar") (setenv "NM" "nm")
+ (setenv "CC" "gcc") (setenv "CXX" "g++")
+
+ ;; Work around <https://bugs.gnu.org/30756>.
+ (unsetenv "C_INCLUDE_PATH")
+ (unsetenv "CPLUS_INCLUDE_PATH")
+
+ ;; TODO: pre-compile instead. Avoids a race condition.
+ (setenv "PYTHONDONTWRITEBYTECODE" "1")
+
+ ;; XXX: How portable is this.
+ (mkdir-p "third_party/node/linux/node-linux-x64")
+ (symlink (string-append (assoc-ref inputs "node") "/bin")
+ "third_party/node/linux/node-linux-x64/bin")
+
+ #t))
+ (replace 'configure
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ (let ((args (string-join configure-flags " ")))
+ ;; Generate ninja build files.
+ (invoke "gn" "gen" "out/Release"
+ (string-append "--args=" args))
+
+ ;; Print the full list of supported arguments as well as
+ ;; their current status for convenience.
+ (format #t "Dumping configure flags...\n")
+ (invoke "gn" "args" "out/Release" "--list"))))
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "ninja" "-C" "out/Release"
+ "-j" (number->string (parallel-job-count))
+ "chrome"
+ "chromedriver")))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (exe (string-append bin "/chromium"))
+ (lib (string-append out "/lib"))
+ (man (string-append out "/share/man/man1"))
+ (applications (string-append out "/share/applications"))
+ (install-regexp (make-regexp "\\.(bin|pak)$"))
+ (locales (string-append lib "/locales"))
+ (resources (string-append lib "/resources"))
+ (preferences (assoc-ref inputs "master-preferences"))
+ (gtk+ (assoc-ref inputs "gtk+"))
+ (mesa (assoc-ref inputs "mesa"))
+ (nss (assoc-ref inputs "nss"))
+ (udev (assoc-ref inputs "udev"))
+ (sh (which "sh")))
+
+ (substitute* '("chrome/app/resources/manpage.1.in"
+ "chrome/installer/linux/common/desktop.template")
+ (("@@MENUNAME@@") "Chromium")
+ (("@@PACKAGE@@") "chromium")
+ (("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe))
+
+ (mkdir-p man)
+ (copy-file "chrome/app/resources/manpage.1.in"
+ (string-append man "/chromium.1"))
+
+ (mkdir-p applications)
+ (copy-file "chrome/installer/linux/common/desktop.template"
+ (string-append applications "/chromium.desktop"))
+
+ (mkdir-p lib)
+ (copy-file preferences (string-append lib "/master_preferences"))
+
+ (with-directory-excursion "out/Release"
+ (for-each (lambda (file)
+ (install-file file lib))
+ (scandir "." (cut regexp-exec install-regexp <>)))
+ (copy-file "chrome" (string-append lib "/chromium"))
+
+ ;; TODO: Install icons from "../../chrome/app/themes" into
+ ;; "out/share/icons/hicolor/$size".
+ (install-file
+ "product_logo_48.png"
+ (string-append out "/share/icons/48x48/chromium.png"))
+
+ (copy-recursively "locales" locales)
+ (copy-recursively "resources" resources)
+
+ (mkdir-p bin)
+ (symlink "../lib/chromium" exe)
+ (install-file "chromedriver" bin)
+
+ (wrap-program exe
+ ;; TODO: Get these in RUNPATH.
+ `("LD_LIBRARY_PATH" ":" prefix
+ (,(string-append lib ":" nss "/lib/nss:" mesa "/lib:"
+ udev "/lib")))
+ ;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
+ `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))
+ #t)))))))
+ (native-inputs
+ `(("bison" ,bison)
+ ("gcc" ,gcc-8)
+ ("gn" ,gn)
+ ("gperf" ,gperf)
+ ("ninja" ,ninja)
+ ("node" ,node)
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)
+ ("yasm" ,yasm)
+
+ ;; This file contains defaults for new user profiles.
+ ("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json"))
+
+ ("python-beautifulsoup4" ,python2-beautifulsoup4)
+ ("python-html5lib" ,python2-html5lib)
+ ("python" ,python-2)))
+ (inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("atk" ,atk)
+ ("cups" ,cups)
+ ("curl" ,curl)
+ ("dbus" ,dbus)
+ ("dbus-glib" ,dbus-glib)
+ ("expat" ,expat)
+ ("flac" ,flac)
+ ("ffmpeg" ,ffmpeg)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("gdk-pixbuf" ,gdk-pixbuf)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("harfbuzz" ,harfbuzz)
+ ("icu4c" ,icu4c)
+ ("jsoncpp" ,jsoncpp)
+ ("lcms" ,lcms)
+ ("libevent" ,libevent)
+ ("libffi" ,libffi)
+ ("libjpeg-turbo" ,libjpeg-turbo)
+ ("libpng" ,libpng)
+ ("libva" ,libva)
+ ("libvpx" ,libvpx)
+ ("libwebp" ,libwebp)
+ ("libx11" ,libx11)
+ ("libxcb" ,libxcb)
+ ("libxcomposite" ,libxcomposite)
+ ("libxcursor" ,libxcursor)
+ ("libxdamage" ,libxdamage)
+ ("libxext" ,libxext)
+ ("libxfixes" ,libxfixes)
+ ("libxi" ,libxi)
+ ("libxml2" ,libxml2)
+ ("libxrandr" ,libxrandr)
+ ("libxrender" ,libxrender)
+ ("libxscrnsaver" ,libxscrnsaver)
+ ("libxslt" ,libxslt)
+ ("libxtst" ,libxtst)
+ ("mesa" ,mesa)
+ ("minizip" ,minizip)
+ ("mit-krb5" ,mit-krb5)
+ ("nss" ,nss)
+ ("openh264" ,openh264)
+ ("openjpeg" ,openjpeg) ;PDFium only
+ ("openssl" ,openssl)
+ ("opus" ,opus+custom)
+ ("pango" ,pango)
+ ("pciutils" ,pciutils)
+ ("pulseaudio" ,pulseaudio)
+ ("re2" ,re2)
+ ("snappy" ,snappy)
+ ("speech-dispatcher" ,speech-dispatcher)
+ ("udev" ,eudev)
+ ("valgrind" ,valgrind)
+ ("vulkan-headers" ,vulkan-headers)))
+ (home-page "https://github.com/Eloston/ungoogled-chromium")
+ (description
+ "Ungoogled-Chromium is the Chromium web browser, with some functionality
+disabled in order to protect the users privacy.")
+ ;; Chromium is developed as BSD-3, but bundles a large number of third-party
+ ;; components with other licenses. For full information, see chrome://credits.
+ (license (list license:bsd-3
+ license:bsd-2
+ license:expat
+ license:asl2.0
+ license:mpl1.1
+ license:mpl2.0
+ license:public-domain
+ license:isc
+ (license:non-copyleft "chrome://credits"
+ "See chrome://credits for more information.")
+ license:lgpl2.1+))))
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6314546667..f619f62699 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com>
@@ -557,14 +557,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.")
(define-public lziprecover
(package
(name "lziprecover")
- (version "1.20")
+ (version "1.21")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://savannah/lzip/" name "/"
- name "-" version ".tar.gz"))
+ (uri (string-append "mirror://savannah/lzip/lziprecover/"
+ "lziprecover-" version ".tar.gz"))
(sha256
(base32
- "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz"))))
+ "094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2"))))
(build-system gnu-build-system)
(home-page "https://www.nongnu.org/lzip/lziprecover.html")
(synopsis "Recover and decompress data from damaged lzip files")
@@ -1278,7 +1278,7 @@ or junctions, and always follows hard links.")
(define-public unshield
(package
(name "unshield")
- (version "1.4.2")
+ (version "1.4.3")
(source
(origin (method url-fetch)
(uri (string-append "http://github.com/twogood/unshield/archive/"
@@ -1286,25 +1286,36 @@ or junctions, and always follows hard links.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x"))))
+ "1avv5c11jbmzwizq10pwvlh1dmyna8ccvpgacv95h4gbq26rg35a"))))
(build-system cmake-build-system)
(inputs
`(("zlib" ,zlib)
("openssl" ,openssl)
- ;; test data that is otherwise downloaded with curl
+ ;; Test data that is otherwise downloaded with curl.
("unshield-avigomanager11b22.zip"
,(origin
(method url-fetch)
- (uri (string-append "https://www.dropbox.com/s/8r4b6752swe3nhu/"
- "unshield-avigomanager11b22.zip?dl=1"))
+ (uri (string-append
+ "https://www.dropbox.com/s/8r4b6752swe3nhu/"
+ "unshield-avigomanager11b22.zip?dl=1"))
(sha256
(base32 "0fwq7lih04if68wpwpsk5wjqyvh32db76a41sq6gbx4dn1lc3ddn"))
(file-name "unshield-avigomanager11b22.zip")))
+ ("unshield-baldurs_gate_patch_v1_1_4315_international.zip"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "https://www.dropbox.com/s/9ruil8oi6amjbbk/"
+ "unshield-baldurs_gate_patch_v1_1_4315_international.zip?dl=1"))
+ (sha256
+ (base32 "0spaxf6dardlhqxz3ys09fzamj007q3nfyw4xng6gh3qp9780maj"))
+ (file-name "unshield-baldurs_gate_patch_v1_1_4315_international.zip")))
("unshield-the-feeble-files-spanish.zip"
,(origin
(method url-fetch)
- (uri (string-append "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/"
- "unshield-the-feeble-files-spanish.zip?dl=1"))
+ (uri (string-append
+ "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/"
+ "unshield-the-feeble-files-spanish.zip?dl=1"))
(sha256
(base32 "1k5cw6vnpja8yjlnhx5124xrw9i8s1l539hfdqqrqz3l5gn0bnyd"))
(file-name "unshield-the-feeble-files-spanish.zip")))))
@@ -1320,6 +1331,7 @@ or junctions, and always follows hard links.")
(copy-file (assoc-ref inputs i)
(string-append "test/v0/" i)))
'("unshield-avigomanager11b22.zip"
+ "unshield-baldurs_gate_patch_v1_1_4315_international.zip"
"unshield-the-feeble-files-spanish.zip"))
(substitute* (find-files "test/" "/*\\.sh")
;; Tests expect the unshield binary in a specific
@@ -1332,7 +1344,12 @@ or junctions, and always follows hard links.")
(substitute* "test/v0/avigomanager.sh"
(("test.zip")
(string-append (getcwd)
- "/test/v0/unshield-avigomanager11b22.zip")))
+ "/test/v0/unshield-avigomanager11b22.zip")))
+ (substitute* "test/v0/baldurs_gate_patch_v1_1_4315_international.sh"
+ (("test.zip")
+ (string-append
+ (getcwd)
+ "/test/v0/unshield-baldurs_gate_patch_v1_1_4315_international.zip")))
(substitute* "test/v0/the-feeble-files-spanish.sh"
(("test.zip")
(string-append (getcwd)
@@ -1623,14 +1640,14 @@ of archives.")
(define-public lunzip
(package
(name "lunzip")
- (version "1.10")
+ (version "1.11")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://savannah/lzip/"
- name "/" name "-" version ".tar.gz"))
+ (uri (string-append "mirror://savannah/lzip/lunzip/"
+ "lunzip-" version ".tar.gz"))
(sha256
- (base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl"))))
+ (base32 "19zq3gmlbia2krq4k4zs1j0xjdv7nsdzqvfb0pyca5n53h2mzb91"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -1650,14 +1667,14 @@ Lunzip is intended to be fully compatible with the regular lzip package.")
(define-public clzip
(package
(name "clzip")
- (version "1.10")
+ (version "1.11")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://savannah/lzip/"
- name "/" name "-" version ".tar.gz"))
+ (uri (string-append "mirror://savannah/lzip/clzip/"
+ "clzip-" version ".tar.gz"))
(sha256
- (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3"))))
+ (base32 "1h14dmc9fi10gcdpdpbgq1bwvcxvivppilj64pf720x8mw915mfr"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -1676,17 +1693,15 @@ Clzip is intended to be fully compatible with the regular lzip package.")
(define-public lzlib
(package
(name "lzlib")
- (version "1.10")
+ (version "1.11")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://savannah/lzip/"
- name "/" name "-" version ".tar.gz"))
+ (uri (string-append "mirror://savannah/lzip/lzlib/"
+ "lzlib-" version ".tar.gz"))
(sha256
- (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx"))))
+ (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c"))))
(build-system gnu-build-system)
- ;; The included minilzip binary is only ~16 smaller than the ‘real’ lzip.
- ;; It's used during the test suite, but don't be tempted to install it.
(arguments
`(#:configure-flags
(list "CC=gcc"
@@ -1704,14 +1719,14 @@ corrupted input.")
(define-public plzip
(package
(name "plzip")
- (version "1.7")
+ (version "1.8")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://savannah/lzip/"
- name "/" name "-" version ".tar.gz"))
+ (uri (string-append "mirror://savannah/lzip/plzip/"
+ "plzip-" version ".tar.gz"))
(sha256
- (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm"))))
+ (base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd"))))
(build-system gnu-build-system)
(inputs
`(("lzlib" ,lzlib)))
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm
index 0da9f8438b..c3b72ea063 100644
--- a/gnu/packages/conky.scm
+++ b/gnu/packages/conky.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages image)
#:use-module (gnu packages lua)
@@ -34,15 +36,17 @@
(define-public conky
(package
(name "conky")
- (version "1.10.8")
+ (home-page "https://github.com/brndnmtthws/conky")
+ (version "1.11.2")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/brndnmtthws/conky/archive/v"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0mw8xbnxr0a7yq2smzi2nln2b5n0q571vdrq6mhvs5n84xd6bg9f"))))
+ (base32 "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
@@ -73,10 +77,10 @@
("libxft" ,libxft)
("libxinerama" ,libxinerama)
("lua" ,lua)
- ("ncurses" ,ncurses)))
+ ("ncurses" ,ncurses)
+ ("curl" ,curl)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "https://github.com/brndnmtthws/conky")
(synopsis "Lightweight system monitor for X")
(description
"Conky is a lightweight system monitor for X that displays operating
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index e42f8af1ab..3cd8c4cb69 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl>
;;;
;;; This file is part of GNU Guix.
@@ -42,14 +43,15 @@
(package
(name "coq")
(version "8.8.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/coq/coq/archive/V"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "0i2hs0i6rp27cy8zd0mx7jscqw5cx2y0diw0pxgij66s3yr47y7r"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coq/coq.git")
+ (commit (string-append "V" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03v8b57mz3ivsijwxy51avzwiyhla5ijaf98a5a2q29yabdq8dkp"))))
(native-search-paths
(list (search-path-specification
(variable "COQPATH")
@@ -63,6 +65,10 @@
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -279,20 +285,22 @@ assistant.")
(package
(name "coq-mathcomp")
(version "1.7.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/math-comp/math-comp/archive/mathcomp-"
- version ".tar.gz"))
- (sha256
- (base32
- "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/math-comp/math-comp.git")
+ (commit (string-append "mathcomp-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1cdzi67jj440xkdpxm10aly80zpn56vjzj2ygb67iq3xpljlv95h"))))
(build-system gnu-build-system)
(native-inputs
`(("ocaml" ,ocaml)
("which" ,which)
("coq" ,coq)))
(arguments
- `(#:tests? #f; No need to test formally-verified programs :)
+ `(#:tests? #f ; no need to test formally-verified programs :)
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -492,3 +500,44 @@ work on a decision procedure for the equational theory of an extension of the
sigma-calculus by Abadi et al. The library is completely written in Coq and
uses Ltac to synthesize the substitution operation.")
(license license:bsd-3))))
+
+(define-public coq-equations
+ (package
+ (name "coq-equations")
+ (version "1.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mattam82/Coq-Equations.git")
+ (commit (string-append "v" version "-8.8"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "129rxsdsf88vjcw0xhm74yax1hmnk6f8n9ksg0hcyyjq1ijddiwa"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("ocaml" ,ocaml)
+ ("coq" ,coq)
+ ("camlp5" ,camlp5)))
+ (arguments
+ `(#:test-target "test-suite"
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "coq_makefile" "-f" "_CoqProject" "-o" "Makefile")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/"))
+ (invoke "make"
+ (string-append "COQLIB=" (assoc-ref outputs "out")
+ "/lib/coq/")
+ "install"))))))
+ (home-page "https://mattam82.github.io/Coq-Equations/")
+ (synopsis "Function definition plugin for Coq")
+ (description "Equations provides a notation for writing programs
+by dependent pattern-matching and (well-founded) recursion in Coq. It
+compiles everything down to eliminators for inductive types, equality
+and accessibility, providing a definitional extension to the Coq
+kernel.")
+ (license license:lgpl2.1)))
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 975884e881..b71906a8f5 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2018 Laura Lazzati <laura.lazzati.15@gmail.com>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018 Brett Gilio <brettg@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2251,14 +2252,14 @@ available in a vignette.")
(define-public r-lava
(package
(name "r-lava")
- (version "1.6.4")
+ (version "1.6.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "lava" version))
(sha256
(base32
- "0627cjlg55kzbzcy82w6wykmw2i57qhgfcabn2zy3ydfdswyxij1"))))
+ "13rlqdg42ylnz4hc932bl50xismrcr4d9ykcd9zs19cw5mckjx0f"))))
(build-system r-build-system)
(propagated-inputs
`(("r-numderiv" ,r-numderiv)
@@ -6589,19 +6590,19 @@ used to teach mathematics, statistics, computation and modeling.")
(define-public r-raster
(package
(name "r-raster")
- (version "2.8-4")
+ (version "2.8-19")
(source
(origin
(method url-fetch)
(uri (cran-uri "raster" version))
(sha256
(base32
- "14pcfznxm5kdwd908axkr9v1l0hzxlrwd8kwrz0liqnfh9cx5rsa"))))
+ "1lmhf7p7is8ai7lv7zsj2rdzf83j7ccl4x7a9vwxxa824zy4bkf4"))))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)
("r-sp" ,r-sp)))
- (home-page "http://www.rspatial.org/")
+ (home-page "https://www.rspatial.org/")
(synopsis "Geographic data analysis and modeling")
(description
"The package implements basic and high-level functions for reading,
@@ -10511,3 +10512,142 @@ tempering (function @code{temper}), and morphometric random walk
Metropolis (function @code{morph.metrop}), which achieves geometric ergodicity
by change of variable.")
(license license:expat)))
+
+(define-public r-listenv
+ (package
+ (name "r-listenv")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "listenv" version))
+ (sha256
+ (base32
+ "0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"))))
+ (build-system r-build-system)
+ (native-inputs
+ `(("r-r-rsp" ,r-r-rsp))) ; vignette builder
+ (home-page "https://github.com/HenrikBengtsson/listenv")
+ (synopsis "Environments behaving (almost) as lists")
+ (description
+ "This package implements list environments. List environments are
+environments that have list-like properties. For instance, the elements of a
+list environment are ordered and can be accessed and iterated over using index
+subsetting.")
+ (license license:lgpl2.1+)))
+
+(define-public r-globals
+ (package
+ (name "r-globals")
+ (version "0.12.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "globals" version))
+ (sha256
+ (base32
+ "0szyv1ayyk31bh3xqlkj43020w44xq6s4rw2bxwizyjssxm3b1br"))))
+ (build-system r-build-system)
+ (propagated-inputs
+ `(("r-codetools" ,r-codetools)))
+ (home-page "https://github.com/HenrikBengtsson/globals")
+ (synopsis "Identify global objects in R expressions")
+ (description
+ "This package provides tools to identify global (\"unknown\" or \"free\")
+objects in R expressions by code inspection using various strategies, e.g.
+conservative or liberal. The objective of this package is to make it as
+simple as possible to identify global objects for the purpose of exporting
+them in distributed compute environments.")
+ (license license:lgpl2.1+)))
+
+(define-public r-future
+ (package
+ (name "r-future")
+ (version "1.11.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "future" version))
+ (sha256
+ (base32
+ "1s4lyqg4mm1drzc6czaalmhmxfjgp4nznb14ql5xzny9rprgz43i"))))
+ (build-system r-build-system)
+ (propagated-inputs
+ `(("r-digest" ,r-digest)
+ ("r-globals" ,r-globals)
+ ("r-listenv" ,r-listenv)))
+ (native-inputs
+ `(("r-r-rsp" ,r-r-rsp))) ; vignette builder
+ (home-page "https://github.com/HenrikBengtsson/future")
+ (synopsis "Unified parallel and distributed processing in R")
+ (description
+ "The purpose of this package is to provide a lightweight and unified
+Future API for sequential and parallel processing of R expression via futures.
+This package implements sequential, multicore, multisession, and cluster
+futures. With these, R expressions can be evaluated on the local machine, in
+parallel a set of local machines, or distributed on a mix of local and remote
+machines. Extensions to this package implement additional backends for
+processing futures via compute cluster schedulers etc. Because of its unified
+API, there is no need to modify any code in order to switch from sequential on
+the local machine to, say, distributed processing on a remote compute cluster.")
+ (license license:lgpl2.1+)))
+
+(define-public r-future-apply
+ (package
+ (name "r-future-apply")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "future.apply" version))
+ (sha256
+ (base32
+ "0b6v9rxvnnz13sydbgkapw71hx98fwdczjchgqnspjmq2340kdc0"))))
+ (properties `((upstream-name . "future.apply")))
+ (build-system r-build-system)
+ (propagated-inputs
+ `(("r-future" ,r-future)
+ ("r-globals" ,r-globals)))
+ (native-inputs
+ `(("r-r-rsp" ,r-r-rsp))) ; vignette builder
+ (home-page "https://github.com/HenrikBengtsson/future.apply")
+ (synopsis "Apply function to elements in parallel using futures")
+ (description
+ "This package provides implementations of @code{apply()},
+@code{eapply()}, @code{lapply()}, @code{Map()}, @code{mapply()},
+@code{replicate()}, @code{sapply()}, @code{tapply()}, and @code{vapply()} that
+can be resolved using any future-supported backend, e.g. parallel on the local
+machine or distributed on a compute cluster.")
+ (license license:gpl2+)))
+
+(define-public r-rsvd
+ (package
+ (name "r-rsvd")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (cran-uri "rsvd" version))
+ (sha256
+ (base32
+ "0vjhrvnkl9rmvl8sv2kac5sd10z3fgxymb676ynxzc2pmhydy3an"))))
+ (build-system r-build-system)
+ (propagated-inputs
+ `(("r-matrix" ,r-matrix)))
+ (home-page "https://github.com/erichson/rSVD")
+ (synopsis "Randomized singular value decomposition")
+ (description
+ "Low-rank matrix decompositions are fundamental tools and widely used for
+data analysis, dimension reduction, and data compression. Classically, highly
+accurate deterministic matrix algorithms are used for this task. However, the
+emergence of large-scale data has severely challenged our computational
+ability to analyze big data. The concept of randomness has been demonstrated
+as an effective strategy to quickly produce approximate answers to familiar
+problems such as the @dfn{singular value decomposition} (SVD). This package
+provides several randomized matrix algorithms such as the randomized singular
+value decomposition (@code{rsvd}), randomized principal component
+analysis (@code{rpca}), randomized robust principal component
+analysis (@code{rrpca}), randomized interpolative decomposition (@code{rid}),
+and the randomized CUR decomposition (@code{rcur}). In addition several plot
+functions are provided.")
+ (license license:gpl3+)))
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 3cb80eb0f2..149ff64a2e 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -228,7 +228,7 @@ the wrong hands.")
(define-public keyutils
(package
(name "keyutils")
- (version "1.5.11")
+ (version "1.6")
(source
(origin
(method url-fetch)
@@ -237,7 +237,7 @@ the wrong hands.")
version ".tar.bz2"))
(sha256
(base32
- "1ddig6j5xjyk6g9l2wlqc7k1cgvryxdqbsv3c9rk1p3f42448n0i"))
+ "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"))
(modules '((guix build utils)))
;; Create relative symbolic links instead of absolute ones to /lib/*.
(snippet '(begin
@@ -751,7 +751,7 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
(replace 'check
(lambda _ (invoke "./botan-test"))))))
(native-inputs
- `(("python" ,python-minimal-wrapper)
+ `(("python" ,python-wrapper)
("python-docutils" ,python-docutils)))
(inputs
`(("sqlite" ,sqlite)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 6724f04ce5..c63b5ddf39 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages polkit)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
@@ -45,6 +46,7 @@
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@@ -380,6 +382,32 @@ device-specific programs to convert and print many types of files.")
("cups-filters" ,cups-filters)
("zlib" ,zlib)))))
+(define-public cups-pk-helper
+ (package
+ (name "cups-pk-helper")
+ (version "0.2.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://freedesktop.org/software/"
+ name "/releases/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)
+ ("glib" ,glib)
+ ("polkit" ,polkit)
+ ("cups" ,cups)))
+ (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/")
+ (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges")
+ (description
+ "This package provides the org.opensuse.CupsPkHelper.Mechanism DBus
+system service which uses @file{cups-pk-helper-mechanism}. This package
+should only be used as part of the Guix cups-pk-helper service.")
+ (license license:gpl2+)))
+
(define-public hplip
(package
(name "hplip")
@@ -681,3 +709,27 @@ printers. It can only be used with printers that support the Epson ESC/P-R
language.")
(home-page "http://download.ebz.epson.net/dsc/search/01/search")
(license license:gpl2+)))
+
+(define-public python-pycups
+ (package
+ (name "python-pycups")
+ (version "1.9.74")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pycups" version ".tar.bz2"))
+ (sha256
+ (base32
+ "1ffp7sswhdsfpy88zg0cc8kl04wygkjs01rlm9f0spbwk8jhy2c6"))))
+ (build-system python-build-system)
+ (arguments
+ '(;; Tests require CUPS to be running
+ #:tests? #f))
+ (inputs
+ `(("cups" ,cups)))
+ (home-page "https://github.com/zdohnal/pycups")
+ (synopsis "Python bindings for libcups")
+ (description
+ "This package provides Python bindings for libcups, wrapping the CUPS
+API.")
+ (license license:gpl2+)))
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 2e14e05c2c..b1b2b999a2 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -188,15 +189,14 @@ not offer a replacement for libcurl.")
(define-public guile-curl
(package
(name "guile-curl")
- (version "0.5")
+ (version "0.6")
(source (origin
(method url-fetch)
- (uri (string-append
- "http://www.lonelycactus.com/tarball/guile-curl-"
- version ".tar.gz"))
+ (uri (string-append "http://www.lonelycactus.com/tarball/"
+ "guile_curl-" version ".tar.gz"))
(sha256
(base32
- "1846rxgc0ylh8768lr79irc7nwjichzb7qb7lzs2k42m0i53sc46"))))
+ "1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cc4e6631f8..052ebb847f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -23,7 +23,7 @@
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
@@ -277,15 +277,14 @@ mapping from string keys to string values.")
(define-public memcached
(package
(name "memcached")
- (version "1.5.10")
+ (version "1.5.12")
(source
(origin
(method url-fetch)
(uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256
- (base32
- "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29"))))
+ (base32 "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0"))))
(build-system gnu-build-system)
(inputs
`(("libevent" ,libevent)
@@ -335,7 +334,7 @@ applications.")
(native-inputs
`(("valgrind" ,valgrind)
("perl" ,perl)
- ("python" ,python2-minimal)
+ ("python" ,python-2)
("python2-pymongo" ,python2-pymongo)
("python2-pyyaml" ,python2-pyyaml)
("tzdata" ,tzdata)))
@@ -687,18 +686,18 @@ as a drop-in replacement of MySQL.")
(define-public postgresql
(package
(name "postgresql")
- (version "10.6")
+ (version "10.7")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"))
+ "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--with-uuid=e2fs")
+ `(#:configure-flags '("--with-uuid=e2fs" "--with-openssl")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-/bin/sh
@@ -717,6 +716,7 @@ as a drop-in replacement of MySQL.")
(inputs
`(("readline" ,readline)
("libuuid" ,util-linux)
+ ("openssl" ,openssl)
("zlib" ,zlib)))
(home-page "https://www.postgresql.org/")
(synopsis "Powerful object-relational database system")
@@ -733,26 +733,25 @@ pictures, sounds, or video.")
(package
(inherit postgresql)
(name "postgresql")
- (version "9.6.11")
+ (version "9.6.12")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"))))))
+ "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f"))))))
(define-public python-pymysql
(package
(name "python-pymysql")
- (version "0.9.2")
+ (version "0.9.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyMySQL" version))
(sha256
- (base32
- "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy"))))
+ (base32 "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q"))))
(build-system python-build-system)
(native-inputs
`(("python-unittest2" ,python-unittest2)))
@@ -1069,7 +1068,7 @@ extremely small.")
(define-public perl-dbi
(package
(name "perl-dbi")
- (version "1.641")
+ (version "1.642")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1077,7 +1076,7 @@ extremely small.")
version ".tar.gz"))
(sha256
(base32
- "1hf2x29bnqf2x1v4bdhji802z7n2mbg7h1amv8gdkqyhrlrfa2am"))))
+ "0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z"))))
(build-system perl-build-system)
(synopsis "Database independent interface for Perl")
(description "This package provides an database interface for Perl.")
@@ -1490,14 +1489,14 @@ sets, bitmaps and hyperloglogs.")
(define-public kyotocabinet
(package
(name "kyotocabinet")
- (version "1.2.76")
+ (version "1.2.77")
(source (origin
(method url-fetch)
(uri (string-append "http://fallabs.com/kyotocabinet/pkg/"
name "-" version ".tar.gz"))
(sha256
(base32
- "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"))))
+ "1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -1637,7 +1636,7 @@ database.")
(define-public perl-db-file
(package
(name "perl-db-file")
- (version "1.842")
+ (version "1.843")
(source
(origin
(method url-fetch)
@@ -1647,7 +1646,7 @@ database.")
".tar.gz"))
(sha256
(base32
- "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg"))))
+ "0sildz1i3fmh949w1scpjsyjx0cbmfw0yna3y70mc6vbwp8y696y"))))
(build-system perl-build-system)
(inputs `(("bdb" ,bdb)))
(native-inputs `(("perl-test-pod" ,perl-test-pod)))
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 0f4a654e62..ef4ddc9cbb 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,11 +31,13 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages golang)
#:use-module (gnu packages code)
#:use-module (gnu packages llvm)
#:use-module (gnu packages perl)
#:use-module (gnu packages pretty-print)
+ #:use-module (gnu packages readline)
#:use-module (gnu packages virtualization)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
@@ -336,3 +339,36 @@ conditions.")
intercepting file operations and changing random bits in the program's
input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.")
(license (non-copyleft "http://www.wtfpl.net/txt/copying/"))))
+
+(define-public scanmem
+ (package
+ (name "scanmem")
+ (version "0.17")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/scanmem/scanmem")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("libtool" ,libtool)
+ ("intltool" ,intltool)
+ ("automake" ,automake)
+ ("autoconf" ,autoconf)))
+ (inputs
+ `(("readline" ,readline)))
+ (home-page "https://github.com/scanmem/scanmem")
+ (synopsis "Memory scanner")
+ (description "Scanmem is a debugging utility designed to isolate the
+address of an arbitrary variable in an executing process. Scanmem simply
+needs to be told the pid of the process and the value of the variable at
+several different times. After several scans of the process, scanmem isolates
+the position of the variable and allows you to modify its value.")
+ ;; The library is covered by LGPLv3 or later; the application is covered
+ ;; by GPLv3 or later.
+ (license (list lgpl3+ gpl3+))))
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 8c39453650..e0cd7604b6 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -372,7 +372,7 @@ word (e.g. cats) into its lemma \"cat\" and the grammatical information
("flex" ,flex)
("pkg-config" ,pkg-config)
;; python is only required for running the test suite
- ("python-minimal" ,python-minimal)))
+ ("python" ,python)))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index ceacd98a43..16fb2014b0 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@@ -37,6 +37,7 @@
#:use-module (gnu packages c)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
@@ -340,14 +341,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
(define-public gparted
(package
(name "gparted")
- (version "0.32.0")
+ (version "0.33.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
version "/gparted-" version ".tar.gz"))
(sha256
- (base32 "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df"))))
+ (base32 "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; tests require a network connection
@@ -478,16 +479,16 @@ a card with a smaller capacity than stated.")
(define-public duperemove
(package
(name "duperemove")
- (version "0.11")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/markfasheh/duperemove/archive/v"
- version ".tar.gz"))
- (sha256
- (base32
- "0rjmmh42yqw9a5j6sp31cqwxk3s97dsi4xz0wpxpllj7bsp3aiw5"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (version "0.11.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/markfasheh/duperemove.git")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -609,7 +610,7 @@ passphrases.")
(define-public ndctl
(package
(name "ndctl")
- (version "63")
+ (version "64.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -618,7 +619,7 @@ passphrases.")
(file-name (git-file-name name version))
(sha256
(base32
- "060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq"))))
+ "1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v"))))
(build-system gnu-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)
@@ -635,6 +636,7 @@ passphrases.")
(inputs
`(("eudev" ,eudev)
("json-c" ,json-c)
+ ("keyutils" ,keyutils)
("kmod" ,kmod)
("util-linux" ,util-linux)))
(arguments
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index c03c24d9e2..2530b8a3c7 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -249,8 +249,8 @@ bootstrapping more recent compilers written in D.")
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
(invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
(native-inputs
- `(("llvm" ,llvm)
- ("clang" ,clang)
+ `(("llvm" ,llvm-6)
+ ("clang" ,clang-6)
("ldc" ,ldc-bootstrap)
("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 09f0194bf7..1a6b29746a 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
@@ -294,15 +294,14 @@ asynchronous fashion.")
(define-public nsd
(package
(name "nsd")
- (version "4.1.25")
+ (version "4.1.26")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz"))
(sha256
- (base32
- "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg"))))
+ (base32 "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -365,15 +364,14 @@ to result in system-wide compromise.")
(define-public unbound
(package
(name "unbound")
- (version "1.8.1")
+ (version "1.9.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz"))
(sha256
- (base32
- "0p9w6spar5dfi7fplxjcq4394wldabaws0ns30cqq6sxqfwv6qn3"))))
+ (base32 "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(native-inputs
@@ -388,7 +386,7 @@ to result in system-wide compromise.")
("openssl" ,openssl)))
(arguments
`(#:configure-flags
- (list "--disable-static" ;save space and non-determinism in libunbound.a
+ (list "--disable-static" ; save space and non-determinism in libunbound.a
(string-append
"--with-ssl=" (assoc-ref %build-inputs "openssl"))
(string-append
@@ -524,16 +522,16 @@ served by AS112. Stub and forward zones are supported.")
(define-public yadifa
(package
(name "yadifa")
- (version "2.3.8")
+ (version "2.3.9")
(source
- (let ((build "7713"))
+ (let ((build "8497"))
(origin
(method url-fetch)
(uri
(string-append "http://cdn.yadifa.eu/sites/default/files/releases/"
- name "-" version "-" build ".tar.gz"))
+ "yadifa-" version "-" build ".tar.gz"))
(sha256
- (base32 "15xhzg4crjcxascwpz6y8qpqcgypzv2p9bspdskp4nx1x1y4316c")))))
+ (base32 "0xvyr91sfgzkpw6g3h893ldbwnki3w2472n56rr18w67qghs1sa5")))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)))
@@ -571,14 +569,14 @@ Extensions} (DNSSEC).")
(define-public knot
(package
(name "knot")
- (version "2.7.3")
+ (version "2.7.6")
(source (origin
(method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
- name "-" version ".tar.xz"))
+ "knot-" version ".tar.xz"))
(sha256
(base32
- "1pwjcv7hzhqawisibybma160k77a6f1v94xw6ay9c7j49vrw05w7"))
+ "18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1"))
(modules '((guix build utils)))
(snippet
'(begin
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 992eb0dcc1..7cb8f96258 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -43,7 +43,7 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
-(define %docker-version "18.09.0")
+(define %docker-version "18.09.2")
(define-public python-docker-py
(package
@@ -162,7 +162,7 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd
(package
(name "containerd")
- (version "1.2.2")
+ (version "1.2.4")
(source
(origin
(method git-fetch)
@@ -171,8 +171,7 @@ Python without keeping their credentials in a Docker configuration file.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"))))
+ (base32 "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/containerd/containerd"
@@ -241,7 +240,7 @@ network attachments.")
(file-name (git-file-name name version))
(sha256
(base32
- "1liqbx58grqih6m8hz9y20y5waflv19pv15l3wl64skap2bsn21c"))
+ "1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c"))
(patches
(search-patches "docker-engine-test-noinstall.patch"
"docker-fix-tests.patch"))))
@@ -337,6 +336,7 @@ network attachments.")
(substitute-LookPath "blkid" "util-linux" "/sbin/blkid")
(substitute-LookPath "unpigz" "pigz" "/bin/unpigz")
(substitute-LookPath "iptables" "iptables" "/sbin/iptables")
+ (substitute-LookPath "iptables-legacy" "iptables" "/sbin/iptables")
(substitute-LookPath "ip" "iproute2" "/sbin/ip")
(substitute-Command "modprobe" "kmod" "/bin/modprobe")
(substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate")
@@ -396,6 +396,7 @@ network attachments.")
;; Timeouts after 5 min.
(delete-file "plugin/manager_linux_test.go")
;; Operation not permitted.
+ (delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
#t))
@@ -483,7 +484,7 @@ provisioning etc.")
(file-name (git-file-name name version))
(sha256
(base32
- "1ivisys20kphvbqlazc3bsg7pk0ykj9gjx5d4yg439x4n13jxwvb"))))
+ "0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 9425df707c..6ce7827391 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -123,14 +123,18 @@ markup) can be customized and extended by the user.")
(define-public doxygen
(package
(name "doxygen")
- (version "1.8.14")
+ (version "1.8.15")
+ (home-page "http://www.doxygen.nl/")
(source (origin
(method url-fetch)
- (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/"
- name "-" version ".src.tar.gz"))
+ (uri (list (string-append home-page "files/doxygen-"
+ version ".src.tar.gz")
+ (string-append "mirror://sourceforge/doxygen/rel-"
+ version "/doxygen-" version
+ ".src.tar.gz")))
(sha256
(base32
- "0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi"))
+ "0p94b4yb6bk2dxzs5kyl82xxgq2qakgbx5yy3ssbbadncb20x75x"))
(patches (search-patches "doxygen-test.patch"))))
(build-system cmake-build-system)
(native-inputs
@@ -150,7 +154,6 @@ markup) can be customized and extended by the user.")
(string-append
(assoc-ref inputs "bash") "/bin/sh")))
#t)))))
- (home-page "http://www.stack.nl/~dimitri/doxygen/")
(synopsis "Generate documentation from annotated sources")
(description "Doxygen is the de facto standard tool for generating
documentation from annotated C++ sources, but it also supports other popular
diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index 43e660743a..49ca740088 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,7 +30,8 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
- #:use-module (guix utils))
+ #:use-module (guix utils)
+ #:use-module (ice-9 match))
(define-public gnu-efi
(package
@@ -195,6 +197,12 @@ and EFI variable management.")
(arguments
`(#:make-flags
(list "CC=gcc"
+ ,@(match (%current-system)
+ ("aarch64-linux"
+ '("ARCH=aarch64"))
+ ("armhf-linux"
+ '("ARCH=arm"))
+ (_ '()))
(string-append "INCDIR=" (assoc-ref %build-inputs "gnu-efi")
"/include")
(string-append "LIBDIR=" (assoc-ref %build-inputs "gnu-efi")
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 339927a4f0..cedc1efbc8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -41,6 +41,7 @@
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2018, 2019 Brett Gilio <brettg@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5052,7 +5053,7 @@ target will call @code{compile} on it.")
(define-public emacs-cider
(package
(name "emacs-cider")
- (version "0.18.0")
+ (version "0.20.0")
(source
(origin
(method git-fetch)
@@ -5062,7 +5063,7 @@ target will call @code{compile} on it.")
(file-name (git-file-name name version))
(sha256
(base32
- "1m9kc88vga3q5d731qnpngnsa0n57pf21k3hll20rw8rggrx4vdn"))))
+ "0lfhzg9c931jbx27hpshk3l76gwbp6ggf668sqa77xrvymwdlsnw"))))
(build-system emacs-build-system)
(arguments
'(#:exclude ; Don't exclude 'cider-test.el'.
@@ -5207,8 +5208,8 @@ extensions.")
(license license:gpl3+)))
(define-public emacs-evil-collection
- (let ((commit "0cfdf4ecf0420aac2a9dd29ff7b54067c3433d71")
- (revision "6"))
+ (let ((commit "e7b57aae0131634d0da5e599717a86c4b3ca6092")
+ (revision "7"))
(package
(name "emacs-evil-collection")
(version (git-version "0.0.1" revision commit))
@@ -5220,7 +5221,7 @@ extensions.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1igsvgxvij918myc397cjhfybmm11znc7961vnbcd5xlviq2p01y"))))
+ "1g7bxvgnsikpxxdimy0lymn3xz53fari048l827sjyw5kxi59d20"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-evil" ,emacs-evil)))
@@ -6547,14 +6548,14 @@ which code derived from Kelvin H's org-page.")
(define-public emacs-xelb
(package
(name "emacs-xelb")
- (version "0.16")
+ (version "0.17")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xelb-"
version ".tar"))
(sha256
(base32
- "03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8"))))
+ "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml"))))
(build-system emacs-build-system)
;; The following functions and variables needed by emacs-xelb are
;; not included in emacs-minimal:
@@ -6586,7 +6587,7 @@ It should enable you to implement low-level X11 applications.")
(define-public emacs-exwm
(package
(name "emacs-exwm")
- (version "0.21")
+ (version "0.22")
(synopsis "Emacs X window manager")
(source (origin
(method url-fetch)
@@ -6594,7 +6595,7 @@ It should enable you to implement low-level X11 applications.")
version ".tar"))
(sha256
(base32
- "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj"))))
+ "0lppm8ng37i5s4x7xdrxhjbdcnpl6pyvn4g7w52zbckjsn8qnqh0"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-xelb" ,emacs-xelb)))
@@ -8918,7 +8919,7 @@ outline-mode), so there is no such thing like an outshine mode, only
(define-public emacs-biblio
(package
(name "emacs-biblio")
- (version "0.1")
+ (version "0.2")
(source
(origin
(method url-fetch)
@@ -8927,7 +8928,7 @@ outline-mode), so there is no such thing like an outshine mode, only
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "109fvivsb4r0rbqljngqrmxqvbnbkqlivczx6brrvlr7ci625lhf"))))
+ "0vwrljmab8m1z83048gxx5mryml9f5pb3h0jpwkvqcl0ra152lzx"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-seq" ,emacs-seq)
@@ -9205,8 +9206,8 @@ navigate and display hierarchy structures.")
(license license:gpl3+))))
(define-public emacs-pulseaudio-control
- (let ((commit "1da372ec79f5d2fb901d1f9f0679fee8848fd011")
- (revision "2"))
+ (let ((commit "7e1a87068379075a5e9ce36c64c686c03d20d379")
+ (revision "3"))
(package
(name "emacs-pulseaudio-control")
(version (git-version "0.0.1" revision commit))
@@ -9219,7 +9220,7 @@ navigate and display hierarchy structures.")
(file-name (git-file-name name version))
(sha256
(base32
- "02xrsms2pjqdk6327midi61i5vg2h9cq5jwaxv43ldm68wl7hi6k"))))
+ "0wcaqyh15x56255rrj350089z15pnwixa2vf0ly6dv0hjmzmh3mr"))))
(build-system emacs-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@@ -9625,6 +9626,32 @@ until the top-level form is no longer a macro call.")
(description "Execute menu items as commands, with completion.")
(license license:gpl3)))
+(define-public emacs-isearch-prop
+ (let ((commit "5e9dc44cf582d998aaa73ccd4d07cbda01248156")
+ (revision "1"))
+ (package
+ (name "emacs-isearch-prop")
+ (version (git-version "0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacsmirror/isearch-prop.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xawppy705ybsgx566zvj8zk2aajq0sqvhvfs7nijqq32lx0a2zl"))))
+ (build-system emacs-build-system)
+ (home-page "https://www.emacswiki.org/emacs/isearch-prop.el")
+ (synopsis "Extensions to @code{isearch.el}")
+ (description "The Emacs library @code{isearch-prop.el} lets you search within
+ contexts. You can limit incremental search to a set of zones of
+ buffer text, search contexts that in effect constitute a multi-region.
+ These zones can be defined in various ways, including some ways
+ provided specially by this library.")
+ (license license:gpl3+))))
+
(define-public emacs-company-lua
(let ((commit "0be8122f3adf57ad27953bf4b03545d6298d3da4"))
(package
@@ -10645,27 +10672,26 @@ keep Parens and Indentation inline with one another.")
(license license:gpl3+)))
(define-public emacs-helm-eww
- (let ((commit "9d36acc433bcf689598b1b4d7d47c9aeb84d6b44"))
- (package
- (name "emacs-helm-eww")
- (version (git-version "0.1" "3" commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emacs-helm/helm-eww.git")
- (commit commit)))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "06gnf84gx6qbhcw1h5jhjnvcdxkdpv0npm53x3pgqybbll5rn5dy"))))
- (propagated-inputs
- `(("emacs-helm" ,emacs-helm)))
- (build-system emacs-build-system)
- (home-page "https://github.com/emacs-helm/helm-eww/")
- (synopsis "Helm interface to EWW")
- (description "This package provides a Helm interface for EWW buffers,
+ (package
+ (name "emacs-helm-eww")
+ (version "1.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-helm/helm-eww.git")
+ (commit version)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "0dvlp7y6kqc4azg5b7jx5lz2rwd0ia7y0y3hcj9y23zd88r73lg7"))))
+ (propagated-inputs
+ `(("emacs-helm" ,emacs-helm)))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/emacs-helm/helm-eww/")
+ (synopsis "Helm interface to EWW")
+ (description "This package provides a Helm interface for EWW buffers,
bookmarks and history.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-stumpwm-mode
(let ((commit "8fbe071d2c6c040794060a354eb377218dc10b35")
@@ -12457,26 +12483,25 @@ correctly.")
(license license:gpl2+))))
(define-public emacs-helm-slime
- (let ((commit "9980925f3e5f6ac5a30369d2a544e82006a79c76"))
- (package
- (name "emacs-helm-slime")
- (version (git-version "0.0.0" "1" commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emacs-helm/helm-slime")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xa07gpfkzwn522x9573mq5mfxvbawdgd0m93gqj6w5a14wk8zzh"))))
- (build-system emacs-build-system)
- (propagated-inputs
- `(("emacs-helm" ,emacs-helm)
- ("emacs-slime" ,emacs-slime)))
- (home-page "https://github.com/emacs-helm/helm-slime")
- (synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs")
- (description "Helm-SLIME defines a few new commands:
+ (package
+ (name "emacs-helm-slime")
+ (version "0.2.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emacs-helm/helm-slime")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0vn93vv2wclnwq6f480z14jn9wfp0ylhp5dd48ycc9jicfsnxqfj"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ `(("emacs-helm" ,emacs-helm)
+ ("emacs-slime" ,emacs-slime)))
+ (home-page "https://github.com/emacs-helm/helm-slime")
+ (synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs")
+ (description "Helm-SLIME defines a few new commands:
@itemize
@item helm-slime-complete: Select a symbol from the SLIME completion systems.
@@ -12484,7 +12509,7 @@ correctly.")
@item: helm-slime-apropos: Yet another slime-apropos with Helm.
@item helm-slime-repl-history: Select an input from the SLIME REPL history and insert it.
@end itemize\n")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-gtk-look
(package
@@ -13110,3 +13135,51 @@ mostly geared towards Common Lisp, but some are useful for other Lisp
dialects, too. Redshank's code transformations aim to be expression-based (as
opposed to character-based).")
(license license:gpl1+))))
+
+(define-public emacs-disk-usage
+ (package
+ (name "emacs-disk-usage")
+ (version "1.1.0")
+ (home-page "https://gitlab.com/ambrevar/emacs-disk-usage.git")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1c9jmjn8vf0v4776v79pc5w0labfs4v9aysbv2w9423rg4mangbg"))))
+ (build-system emacs-build-system)
+ (synopsis "Sort and browse disk usage listings with Emacs")
+ (description "Disk Usage is a file system analyzer: it offers a tabulated
+view of file listings sorted by size. Directory sizes are computed
+recursively. The results are cached for speed.")
+ (license license:gpl3+)))
+
+(define-public emacs-orgit
+ (let ((commit "ddb830c38cb71e5cf86db7fa62d6ee88ab3962d5"))
+ (package
+ (name "emacs-orgit")
+ (version (git-version "1.5.1" "1" commit))
+ (home-page "https://github.com/magit/orgit")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fy4n71yskfkjl6w9mzrw3pfd5lp8f48g2c9bxiwg7mwzsmsb9nb"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ `(("emacs-dash" ,emacs-dash)
+ ("emacs-magit" ,emacs-magit)))
+ (synopsis "Support for Org links to Magit buffers")
+ (description "This package defines several Org link types, which can be
+used to link to certain Magit buffers. Use the command
+@command{org-store-link} while such a buffer is current to store a link.
+Later you can insert it into an Org buffer using the command
+@code{org-insert-link}.")
+ (license license:gpl3+))))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index ad7ae18781..9dab778de2 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -606,17 +606,18 @@ ready for production.")
(define-public gerbv
(package
(name "gerbv")
- (version "2.6.2")
+ (version "2.7.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-"
version "/gerbv-" version ".tar.gz"))
(sha256
(base32
- "1cw8k6ni0q8kswad03kha86fk7n06vq8p0wzsfhcnalsdshrn17i"))))
+ "1d2k43k7i4yvbpi4sw1263a8d0q98z2n7aqhmpinpkih8a681vn5"))))
(build-system gnu-build-system)
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
+ ("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("gtk" ,gtk+-2)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 066d6d843b..c778ebd21e 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -109,7 +109,7 @@ single file can be mounted.")
(define-public disorderfs
(package
(name "disorderfs")
- (version "0.5.5")
+ (version "0.5.6")
(source
(origin
(method git-fetch)
@@ -119,7 +119,7 @@ single file can be mounted.")
(file-name (git-file-name name version))
(sha256
(base32
- "18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4"))))
+ "1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e44be713f2..112a6eba97 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -45,6 +45,7 @@
#:use-module (gnu packages dns)
#:use-module (gnu packages emacs)
#:use-module (gnu packages dbm)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages libedit)
@@ -138,7 +139,7 @@ line client and a client based on Qt.")
(define-public ledger
(package
(name "ledger")
- (version "3.1.1")
+ (version "3.1.2")
(source
(origin
(method git-fetch)
@@ -147,39 +148,17 @@ line client and a client based on Qt.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp"))
- (patches (search-patches "ledger-revert-boost-python-fix.patch"
- "ledger-fix-uninitialized.patch"))))
+ (base32 "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc"))
+ (patches (search-patches "ledger-fix-uninitialized.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:modules ((guix build cmake-build-system)
- ((guix build gnu-build-system) #:prefix gnu:)
- (guix build utils)
- (guix build emacs-utils))
- #:imported-modules (,@%cmake-build-system-modules
- (guix build emacs-utils))
- #:configure-flags
+ `(#:configure-flags
`("-DBUILD_DOCS:BOOL=ON"
"-DBUILD_WEB_DOCS:BOOL=ON"
- "-DBUILD_EMACSLISP:BOOL=ON"
"-DUSE_PYTHON:BOOL=ON"
- "-DCMAKE_INSTALL_LIBDIR:PATH=lib"
- ,(string-append "-DUTFCPP_INCLUDE_DIR:PATH="
- (assoc-ref %build-inputs "utfcpp")
- "/include"))
- ;; Skip failing test BaselineTest_cmd-org during the check phase.
- ;; This is a known upstream issue. See
- ;; https://github.com/ledger/ledger/issues/550
- #:make-flags (list "ARGS=-E BaselineTest_cmd-org")
+ "-DCMAKE_INSTALL_LIBDIR:PATH=lib")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'boost-compat
- (lambda _
- (substitute* "src/utils.h"
- ;; This library moved in Boost 1.66. Remove for Ledger
- ;; versions > 3.1.1.
- (("boost/uuid/sha1.hpp") "boost/uuid/detail/sha1.hpp"))
- #t))
(add-before 'configure 'install-examples
(lambda* (#:key outputs #:allow-other-keys)
(let ((examples (string-append (assoc-ref outputs "out")
@@ -195,18 +174,11 @@ line client and a client based on Qt.")
(setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo"))
- #t))
- (replace 'check (assoc-ref gnu:%standard-phases 'check))
- (add-after 'install 'relocate-elisp
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((site-dir (string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp"))
- (guix-dir (string-append site-dir "/guix.d"))
- (orig-dir (string-append site-dir "/ledger-mode"))
- (dest-dir (string-append guix-dir "/ledger-mode")))
- (mkdir-p guix-dir)
- (rename-file orig-dir dest-dir)
- (emacs-generate-autoloads ,name dest-dir)))))))
+ ;; Skip failing test BaselineTest_cmd-org.
+ ;; This is a known upstream issue. See
+ ;; https://github.com/ledger/ledger/issues/550
+ (setenv "ARGS" "-E BaselineTest_cmd-org")
+ #t)))))
(inputs
`(("boost" ,boost)
("gmp" ,gmp)
@@ -216,8 +188,7 @@ line client and a client based on Qt.")
("tzdata" ,tzdata)
("utfcpp" ,utfcpp)))
(native-inputs
- `(("emacs" ,emacs-minimal)
- ("groff" ,groff)
+ `(("groff" ,groff)
("texinfo" ,texinfo)))
(home-page "https://ledger-cli.org/")
(synopsis "Command-line double-entry accounting program")
@@ -243,8 +214,74 @@ in ability, and easy to use.")
license:asl2.0 ; src/strptime.cc
(license:non-copyleft
"file://src/wcwidth.cc"
- "See src/wcwidth.cc in the distribution.")
- license:gpl2+)))) ; lisp/*
+ "See src/wcwidth.cc in the distribution.")))))
+
+(define-public emacs-ledger-mode
+ ;; There have been no new releases since 2016.
+ (let ((commit "253a20dc62e137ed0ed8e1dd8614ecba116610ea")
+ (revision "1"))
+ (package
+ (name "emacs-ledger-mode")
+ (version (git-version "3.1.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ledger/ledger-mode.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "06wrgkqpgvk17vibrk2qikdlqn8y63jg86marp1wgmram92mb3jk"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:modules ((guix build cmake-build-system)
+ (guix build utils)
+ (guix build emacs-utils))
+ #:imported-modules (,@%cmake-build-system-modules
+ (guix build emacs-utils))
+ #:tests? #f ; there are none
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'build-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((target (string-append (assoc-ref outputs "out")
+ "/share/info")))
+ (mkdir-p target)
+ (invoke "makeinfo" "-o" target
+ "../source/doc/ledger-mode.texi"))
+ #t))
+ (add-after 'install 'relocate-elisp
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((site-dir (string-append (assoc-ref outputs "out")
+ "/share/emacs/site-lisp"))
+ (guix-dir (string-append site-dir "/guix.d"))
+ (orig-dir (string-append site-dir "/ledger-mode"))
+ (dest-dir (string-append guix-dir "/ledger-mode")))
+ (mkdir-p guix-dir)
+ (rename-file orig-dir dest-dir)
+ (emacs-generate-autoloads ,name dest-dir)
+ #t))))))
+ (native-inputs
+ `(("emacs-minimal" ,emacs-minimal)
+ ("texinfo" ,texinfo)))
+ (home-page "https://ledger-cli.org/")
+ (synopsis "Command-line double-entry accounting program")
+ (description
+ "Ledger is a powerful, double-entry accounting system that is
+accessed from the UNIX command-line. This may put off some users, since
+there is no flashy UI, but for those who want unparalleled reporting
+access to their data there are few alternatives.
+
+Ledger uses text files for input. It reads the files and generates
+reports; there is no other database or stored state. To use Ledger,
+you create a file of your account names and transactions, run from the
+command line with some options to specify input and requested reports, and
+get output. The output is generally plain text, though you could generate
+a graph or html instead. Ledger is simple in concept, surprisingly rich
+in ability, and easy to use.
+
+This package provides the Emacs mode.")
+ (license license:gpl2+))))
(define-public geierlein
(package
@@ -591,7 +628,7 @@ Monero GUI client.")
(define-public python-trezor-agent
(package
(name "python-trezor-agent")
- (version "0.9.4")
+ (version "0.13.0")
(source
(origin
(method git-fetch)
@@ -600,11 +637,18 @@ Monero GUI client.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "15aaqk79d9y9nbsfznf2iscz12z5ispcj8kr8v5bc0sqqj2brs12"))))
+ (base32 "0i4igkxi8fwdlbhg6nx27lhnc9v9nmrw4j5fvpnc202n6yjlc7x7"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-requires-backports-shutil-which
+ ;; Remove requires on backport of shutil_which, as python 3.4+ has
+ ;; a built-in implementation supported in python-trezor-agent.
+ (lambda _
+ (substitute* "setup.py"
+ (("'backports.shutil_which>=3.5.1',") ""))
+ #t))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key outputs inputs #:allow-other-keys)
@@ -612,15 +656,22 @@ Monero GUI client.")
(add-installed-pythonpath inputs outputs)
(invoke "py.test"))))))
(propagated-inputs
- `(("python-ecdsa" ,python-ecdsa)
+ `(("python-configargparse" ,python-configargparse)
+ ("python-daemon" ,python-daemon)
+ ("python-docutils" ,python-docutils)
+ ("python-ecdsa" ,python-ecdsa)
("python-ed25519" ,python-ed25519)
+ ("python-mnemonic" ,python-mnemonic)
+ ("python-pymsgbox" ,python-pymsgbox)
("python-semver" ,python-semver)
- ("python-unidecode" ,python-unidecode)))
+ ("python-unidecode" ,python-unidecode)
+ ("python-wheel" ,python-wheel)))
(native-inputs
- `(("python-mock" ,python-mock)
+ `(("gnupg" ,gnupg)
+ ("python-mock" ,python-mock)
("python-pytest" ,python-pytest)))
(home-page "https://github.com/romanz/trezor-agent")
- (synopsis "TREZOR SSH and GPG host support")
+ (synopsis "Use hardware wallets as SSH and GPG agent")
(description
"@code{libagent} is a library that allows using TREZOR, Keepkey and
Ledger Nano as a hardware SSH/GPG agent.")
@@ -789,19 +840,32 @@ Then set the environment variable GNUPGHOME to
(define-public trezor-agent
(package
(name "trezor-agent")
- (version "0.9.0")
+ (version "0.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "trezor_agent" version))
(sha256
(base32
- "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz"))))
+ "144657c7bn0a667dq5fv5r6j7iilxf3h9agj29v1m2qpq40g0az8"))))
+ (arguments
+ ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'".
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'wrap 'fixup-agent-py
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ ;; overwrite the wrapper with the real thing.
+ (install-file "./trezor_agent.py"
+ (string-append out "/bin"))
+ #t))))))
(build-system python-build-system)
(inputs
`(("python-trezor" ,python-trezor)
("python-trezor-agent" ,python-trezor-agent)))
- (home-page "http://github.com/romanz/trezor-agent")
+ (native-inputs
+ `(("python-hidapi" ,python-hidapi)))
+ (home-page "https://github.com/romanz/trezor-agent")
(synopsis "Using Trezor as hardware SSH/GPG agent")
(description "This package allows using Trezor as a hardware SSH/GPG
agent.")
diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index bc4bbd876a..aeef2f340c 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -341,16 +341,16 @@ referred to as the \"Odin 3 protocol\".")
(define-public ifdtool
(package
(name "ifdtool")
- (version "4.7")
+ (version "4.9")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://review.coreboot.org/p/coreboot")
+ (url "https://github.com/coreboot/coreboot.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "0nw555i0fm5kljha9h47bk70ykbwv8ddfk6qhz6kfqb79vzhy4h2"))))
+ "0jidj29jh6p65d17k304wlzhxvp4p3c2namgcdwg2sxq8jfr0zlm"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@@ -359,12 +359,12 @@ referred to as the \"Odin 3 protocol\".")
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "util/ifdtool")
- #t))
- (delete 'configure)
- (delete 'check))))
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "util/ifdtool")
+ #t))
+ (delete 'configure)) ; no configure script
+ #:tests? #f)) ; no test suite
(home-page "https://github.com/corna/me_cleaner/")
(synopsis "Intel Firmware Descriptor dumper")
(description "This package provides @command{ifdtool}, a program to
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f77f9da163..9d49c02cf6 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -23,6 +23,7 @@
;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
;;; Copyright © 2018 Charlie Ritter <chewzerita@posteo.net>
;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com>
+;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -857,6 +858,56 @@ Powerline support.")
designed to work well in user interface environments.")
(license license:silofl1.1)))
+(define-public font-adobe-source-sans-pro
+ (package
+ (name "font-adobe-source-sans-pro")
+ (version "2.040R-ro-1.090R-it")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/adobe-fonts/source-sans-pro/archive/"
+ (regexp-substitute/global
+ ;; The upstream tag uses "/" between the roman and italic
+ ;; versions, so substitute our "-" separator here.
+ #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1wpbhd2idps53ph8rg1mhr3vz4lsgbpjprcq10nliwcxdz9d8lv0"))))
+ (build-system font-build-system)
+ (home-page "https://github.com/adobe-fonts/source-sans-pro")
+ (synopsis
+ "Sans serif font family for user interface environments")
+ (description
+ "Source Sans Pro is a set of OpenType fonts that have been designed to
+work well in user interface (UI) environments.")
+ (license license:silofl1.1)))
+
+(define-public font-adobe-source-serif-pro
+ (package
+ (name "font-adobe-source-serif-pro")
+ (version "2.007R-ro-1.007R-it")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/adobe-fonts/source-serif-pro/archive/"
+ (regexp-substitute/global
+ ;; The upstream tag uses "/" between the roman and italic
+ ;; versions, so substitute our "-" separator here.
+ #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1sws9k26ldqk375qsigk1zv8cq1xlvadjwvv3dqrcc3qzm1c7hwc"))))
+ (build-system font-build-system)
+ (home-page "https://github.com/adobe-fonts/source-serif-pro")
+ (synopsis
+ "Serif typeface to complement Source Sans Pro for setting text")
+ (description
+ "Source Serif Pro is a set of OpenType fonts to complement the Source
+Sans Pro family.")
+ (license license:silofl1.1)))
+
(define-public font-fira-mono
(package
(name "font-fira-mono")
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index bc44d7537a..916f8f6b0e 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
@@ -175,7 +175,7 @@ as required.")
(origin
(method url-fetch)
(uri (string-append "https://download.filezilla-project.org/"
- name "/" name "-" version ".tar.bz2"))
+ "libfilezilla/libfilezilla-" version ".tar.bz2"))
(sha256
(base32
"17zlhw5b1a7jzh50cbpy2is3sps5lnzch5yf9qm7mwrviw9c8j10"))))
@@ -209,14 +209,14 @@ output.
(define-public filezilla
(package
(name "filezilla")
- (version "3.39.0")
+ (version "3.40.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.filezilla-project.org/client/"
"FileZilla_" version "_src.tar.bz2"))
(sha256
- (base32 "0ks42q6mi3qx85zpa98izkyficv2bdh3jnvmy97xjnjyfy9mwlgv"))))
+ (base32 "11b0410fcwrahq5dd7ph10bc09m62sxra4bjp0kj5gph822s0v63"))))
(build-system gnu-build-system)
(arguments
;; Don't let filezilla phone home to check for updates.
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 6b641be0ef..ac01cb3f2f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@@ -431,7 +431,7 @@ support.")
(define-public tiled
(package
(name "tiled")
- (version "1.2.1")
+ (version "1.2.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -440,7 +440,7 @@ support.")
(file-name (git-file-name name version))
(sha256
(base32
- "1dl06k2p0r7l20ghxcq5sn7j0jl2l8q4m27vmfs2qfgvldjll2h3"))))
+ "0ay4x1b6h5xfax1cqry2fklcmqi6a16klgmci4gkhga7as66lnnn"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)
@@ -641,17 +641,15 @@ programming language.")
(define-public allegro-4
(package
(name "allegro")
- (version "4.4.2")
+ (version "4.4.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/liballeg/allegro5/"
"releases/download/" version "/allegro-"
version ".tar.gz"))
- (patches (search-patches
- "allegro4-mesa-18.2.5-and-later.patch"))
(sha256
(base32
- "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"))))
+ "1d5ws3ihvpa6f4qc6a6drq31pajw6bblxifr4kcxzqj9br1nw28y"))))
(build-system cmake-build-system)
(arguments
'(#:phases
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8858de7713..fc23b709fb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@@ -656,7 +656,7 @@ destroying an ancient book using a special wand.")
(define-public gnubg
(package
(name "gnubg")
- (version "1.06.001")
+ (version "1.06.002")
(source
(origin
(method url-fetch)
@@ -664,7 +664,7 @@ destroying an ancient book using a special wand.")
version "-sources." "tar.gz"))
(sha256
(base32
- "0snz3j1bvr25ji7lg82bl2gm2s2x9lrpc7viw0hclgz0ql74cw7b"))))
+ "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"))))
(build-system gnu-build-system)
(inputs `(("glib" ,glib)
("readline" ,readline)
@@ -2143,22 +2143,22 @@ Battle for Wesnoth}.")))
(define-public gamine
(package
(name "gamine")
- (version "1.5")
+ (version "1.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gamine-game/"
"gamine-" version ".tar.gz"))
(sha256
(base32
- "08wnk7w84c2413hwny89j2cn89cvfdf67bfc6wl0bf475if0mf4h"))))
+ "1sc6f4445ciigd6yw0ri92746k4hk6ps0bvj9fm1gbp3c3fslk5n"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(inputs
`(("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base) ;playbin plugin
- ("gst-plugins-good" ,gst-plugins-good) ;for wav playback
+ ("gst-plugins-base" ,gst-plugins-base) ; playbin plugin
+ ("gst-plugins-good" ,gst-plugins-good) ; for wav playback
("gtk+" ,gtk+)))
(arguments
`(#:tests? #f
@@ -2413,7 +2413,7 @@ OpenGFX provides you with...
(build-system gnu-build-system)
(native-inputs
`(("catcodec" ,catcodec)
- ("python" ,python2-minimal)))
+ ("python" ,python-2)))
(arguments
`(#:make-flags
(list (string-append "INSTALL_DIR=" %output
@@ -2450,7 +2450,7 @@ the original Transport Tycoon Deluxe.")
"0nskq97a6fsv1v6d62zf3yb8whzhqnlh3lap3va3nzvj7csjgf7c"))))
(build-system gnu-build-system)
(native-inputs
- `(("python" ,python2-minimal)))
+ `(("python" ,python-2)))
(arguments
`(#:make-flags
(list (string-append "INSTALL_DIR=" %output
@@ -2838,7 +2838,9 @@ http://lavachat.symlynx.com/unix/")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))))
+ "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))
+ (patches
+ (search-patches "red-eclipse-remove-gamma-name-hack.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -3421,22 +3423,23 @@ the GNU GPL.")
(define-public tintin++
(package
(name "tintin++")
- (version "2.01.5")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/tintin"
- "/TinTin++ Source Code/" version
- "/tintin" "-" version ".tar.gz"))
- (sha256
- (base32
- "0pnnbcm96xbj69358568rpvp164rjmcvhnnzs7nvj062pi2hqcxx"))))
+ (version "2.01.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/tintin/TinTin++ Source Code/"
+ (version-major+minor version)
+ "/tintin-" version ".tar.gz"))
+ (sha256
+ (base32
+ "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v"))))
(inputs
`(("gnutls" ,gnutls)
("pcre" ,pcre)
("readline" ,readline)
("zlib" ,zlib)))
(arguments
- '(#:tests? #f ; no test suite
+ '(#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
;; The source is in tt/src.
@@ -4104,9 +4107,8 @@ small robot living in the nano world, repair its maker.")
(define-public teeworlds
(package
(name "teeworlds")
- (version "0.7.0")
+ (version "0.7.2")
(source (origin
- ;; do not use auto-generated tarballs
(method git-fetch)
(uri (git-reference
(url "https://github.com/teeworlds/teeworlds.git")
@@ -4114,7 +4116,7 @@ small robot living in the nano world, repair its maker.")
(file-name (git-file-name name version))
(sha256
(base32
- "0jigg2yikihbivzs7hpljr0mghx1l9v4f1cdr8fbmqv2wb51ah8q"))
+ "15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93"))
(modules '((guix build utils)
(ice-9 ftw)
(ice-9 regex)
@@ -4131,7 +4133,7 @@ small robot living in the nano world, repair its maker.")
(search-patches "teeworlds-use-latest-wavpack.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests included
+ `(#:tests? #f ; no tests included
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
@@ -4293,17 +4295,17 @@ with the mouse isn’t always trivial.")
(define-public chroma
(package
(name "chroma")
- (version "1.15")
+ (version "1.16")
(source (origin
(method url-fetch)
(uri (string-append "http://level7.org.uk/chroma/download/chroma-"
version ".tar.bz2"))
(sha256
(base32
- "0nzm3j5wjazr1d6pkydqlc48sjf72hggq0hmx8mhq03114mmiir5"))))
+ "1gfaw1kf7cxf5ibr61n6dxjihi49gmysn4cvawx1pqvy52ljpk0p"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f)) ; no tests included
+ `(#:tests? #f)) ; no tests included
(inputs
`(("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf)))
("freetype" ,freetype)
@@ -4948,16 +4950,16 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(package
(inherit quakespasm)
(name "vkquake")
- (version "1.00.0")
+ (version "1.01.0")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/Novum/vkQuake/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Novum/vkQuake.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "0bviv18jvp41jvrabgl7l5kq4n1p6p3rywij481yswawdw6l5idh"))))
+ (base32 "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39"))))
(arguments
`(#:make-flags
(let ((vulkanlib (string-append (assoc-ref %build-inputs
@@ -5376,7 +5378,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
(define-public fortune-mod
(package
(name "fortune-mod")
- (version "2.6.1")
+ (version "2.6.2")
(source
(origin
(method git-fetch)
@@ -5386,7 +5388,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
(file-name (git-file-name name version))
(sha256
(base32
- "17183z8ls6hrngh8a3374csagqa2acs8jl21dqm7gwj4lk0ghkba"))))
+ "11xff87s8ifw2dqs90n0rjq0psv4i7ykybygmibsqjj7id3xxw4c"))))
(build-system cmake-build-system)
(arguments
`(#:test-target "check"
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index a53a4f2c2f..c08c1f6758 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -39,6 +39,7 @@
(define-public gd
(package
(name "gd")
+ (replacement gd/fixed)
;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing.
@@ -94,6 +95,16 @@ most common applications of GD involve website development.")
"See COPYING file in the distribution."))
(properties '((cpe-name . "libgd")))))
+(define-public gd/fixed
+ (hidden-package
+ (package
+ (inherit gd)
+ (source (origin
+ (inherit (package-source gd))
+ (patches (append (origin-patches (package-source gd))
+ (search-patches "gd-CVE-2019-6977.patch"
+ "gd-CVE-2019-6978.patch"))))))))
+
(define-public perl-gd
(package
(name "perl-gd")
diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
new file mode 100644
index 0000000000..792bddf5a5
--- /dev/null
+++ b/gnu/packages/genimage.scm
@@ -0,0 +1,194 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages genimage)
+ #:use-module (guix utils)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build utils)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages bootloaders)
+ #:use-module (gnu packages cdrom)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages cpio)
+ #:use-module (gnu packages disk)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages mtools)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages virtualization)
+ #:use-module (gnu packages wm))
+
+(define-public genimage
+ (package
+ (name "genimage")
+ (version "10")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pengutronix/genimage.git")
+ (commit (string-append "v" version))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "0had00p2why2l1fl14mq7nbhmmfbd3na4qnnpg36akdy05g67jbn"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'guixify
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Note to maintainers: Check ".def =" lines in source.
+ (substitute* "config.c"
+ (("\\.def = \"cpio\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "cpio")
+ "/bin/cpio\""))
+ (("\\.def = \"dd\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "coreutils")
+ "/bin/dd\""))
+ (("\\.def = \"debugfs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "e2fsprogs")
+ "/sbin/debugfs\""))
+ (("\\.def = \"e2fsck\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "e2fsprogs")
+ "/sbin/e2fsck\""))
+ (("\\.def = \"genext2fs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "genext2fs")
+ "/bin/genext2fs\""))
+ (("\\.def = \"genisoimage\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "cdrkit-libre")
+ "/bin/genisoimage\""))
+ (("\\.def = \"mcopy\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "mtools")
+ "/bin/mcopy\""))
+ (("\\.def = \"mmd\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "mtools")
+ "/bin/mmd\""))
+ ;;; Note: mkcramfs is obsolete.
+ (("\\.def = \"mkdosfs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "dosfstools")
+ "/sbin/mkfs.fat\""))
+ (("\\.def = \"mke2fs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "e2fsprogs")
+ "/sbin/mke2fs\""))
+ (("\\.def = \"mkfs\\.jffs2\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "mtd-utils")
+ "/sbin/mkfs.jffs2\""))
+ (("\\.def = \"mkfs\\.ubifs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "mtd-utils")
+ "/sbin/mkfs.ubifs\""))
+ (("\\.def = \"mksquashfs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "squashfs-tools")
+ "/bin/mksquashfs\""))
+ (("\\.def = \"qemu-img\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "qemu")
+ "/bin/qemu-img\""))
+ (("\\.def = \"tar\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "tar")
+ "/bin/tar\""))
+ (("\\.def = \"tune2fs\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "e2fsprogs")
+ "/sbin/tune2fs\""))
+ (("\\.def = \"ubinize\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "mtd-utils")
+ "/sbin/ubinize\""))
+ (("\\.def = \"mkimage\"")
+ (string-append ".def = \""
+ (assoc-ref inputs "u-boot-tools")
+ "/bin/mkimage\"")))
+ (substitute* "test/basic-images.test"
+ ;; Work around bug in sharness.sh.
+ (("mkdosfs")
+ "mkfs.fat")
+ ;; Work around bug in sharness.sh.
+ (("dd,mkfs\\.fat,mcopy")
+ "dd,mkfs_fat,mcopy")
+ ;; Should be in the next upstream release.
+ (("qemu_img") "qemu-img"))
+ (substitute* "util.c"
+ (("\"/bin/sh\"")
+ (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\"")))
+ ;; We don't have /etc/passwd so uid 0 is not known as "root".
+ ;; Thus patch it out.
+ (substitute* '("test/ext2test.dump"
+ "test/ext3test.dump"
+ "test/ext4test.dump"
+ "test/mke2fs.dump")
+ (("root") "unknown"))
+ #t))
+ (add-before 'check 'setenv-check
+ (lambda _
+ ;; Our container doesn't provide access to /etc/mtab
+ (setenv "EXT2FS_NO_MTAB_OK" "1")
+ ;; Make test reproducible
+ (setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U")
+ (setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs")
+ #t))
+ (replace 'check
+ (lambda _
+ (invoke "make" "TEST_LOG_COMPILER=" "check"))))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ;;; Note: cramfs is obsolete.
+ ("dtc" ,dtc) ; for the tests
+ ("fdisk" ,fdisk) ; for the tests
+ ("pkg-config" ,pkg-config)
+ ("util-linux" ,util-linux))) ; for the tests
+ (inputs
+ `(("bash" ,bash)
+ ("cdrkit-libre" ,cdrkit-libre)
+ ("cpio" ,cpio)
+ ;; Note: invoked by final executable.
+ ("coreutils" ,coreutils) ; chmod, dd
+ ("dosfstools" ,dosfstools)
+ ("e2fsprogs" ,e2fsprogs)
+ ("genext2fs" ,genext2fs)
+ ("libconfuse" ,libconfuse)
+ ("mtd-utils" ,mtd-utils)
+ ("mtools" ,mtools)
+ ("qemu" ,qemu-minimal)
+ ("squashfs-tools" ,squashfs-tools)
+ ("tar" ,tar)
+ ("u-boot-tools" ,u-boot-tools)))
+ (synopsis "Create Flash images according to specification")
+ (description "@command{genimage} creates Flash images according to a
+specification file.")
+ (home-page "https://github.com/pengutronix/genimage")
+ (license license:gpl2)))
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 6ea89dc92a..884f57eabd 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
@@ -32,6 +32,7 @@
#:use-module (guix build-system scons)
#:use-module (guix build-system r)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -743,25 +744,25 @@ to create databases that are optimized for rendering/tile/map-services.")
(define-public protozero
(package
(name "protozero")
- (version "1.6.3")
+ (version "1.6.5")
(source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/mapbox/protozero/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mapbox/protozero.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10ldzni46cplmkgx1f73yn95qcb71xh9nxpcfdmi107y3kvicv3c"))))
(build-system cmake-build-system)
(home-page "https://github.com/mapbox/protozero")
(synopsis "Minimalistic protocol buffer decoder and encoder in C++")
- (description "Protozero is a minimalistic protocol buffer decored and
+ (description "Protozero is a minimalistic protocol buffer decoder and
encoder in C++. The developer using protozero has to manually translate the
@file{.proto} description into code.")
(license (list
- license:asl2.0; for folly
- license:bsd-2))))
+ license:asl2.0 ; for folly
+ license:bsd-2))))
(define-public libosmium
(package
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index cd0deac158..9f0a87a40a 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;;
@@ -49,7 +49,7 @@
(define-public babl
(package
(name "babl")
- (version "0.1.56")
+ (version "0.1.62")
(source (origin
(method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/babl/"
@@ -63,7 +63,7 @@
"/babl-" version ".tar.bz2")))
(sha256
(base32
- "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla"))))
+ "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw"))))
(build-system gnu-build-system)
(home-page "http://gegl.org/babl/")
(synopsis "Image pixel format conversion library")
@@ -80,15 +80,15 @@ provided, as well as a framework to add new color models and data types.")
(define-public gegl
(package
(name "gegl")
- (version "0.4.8")
+ (version "0.4.12")
(source (origin
(method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/gegl/"
(string-take version 3)
- "/" name "-" version ".tar.bz2")))
+ "/gegl-" version ".tar.bz2")))
(sha256
(base32
- "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"))))
+ "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("LDFLAGS=-lm")))
@@ -118,7 +118,7 @@ buffers.")
(define-public gimp
(package
(name "gimp")
- (version "2.10.6")
+ (version "2.10.8")
(source (origin
(method url-fetch)
(uri (string-append "https://download.gimp.org/pub/gimp/v"
@@ -126,7 +126,7 @@ buffers.")
"/gimp-" version ".tar.bz2"))
(sha256
(base32
- "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"))))
+ "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b673cbffe6..8a336a50f4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
(package
(name "mesa")
- (version "18.3.1")
+ (version "18.3.4")
(source
(origin
(method url-fetch)
@@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.")
version "/mesa-" version ".tar.xz")))
(sha256
(base32
- "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"))
+ "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"))
(patches
(search-patches "mesa-skip-disk-cache-test.patch"))))
(build-system gnu-build-system)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3a34356beb..366051a3e0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -21,7 +21,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018 nee <nee-git@hidamari.blue>
@@ -32,7 +32,8 @@
;;; Copyright © 2018 Jovany Leandro G.C <bit4bit@riseup.net>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
-;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com>
+;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -127,6 +128,7 @@
#:use-module (gnu packages rdesktop)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages rust)
#:use-module (gnu packages samba)
#:use-module (gnu packages scanner)
#:use-module (gnu packages selinux)
@@ -277,7 +279,7 @@ features to enable users to create their discs easily and quickly.")
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gobject-introspection" ,gobject-introspection)
("duplicity" ,duplicity)
- ("python" ,python2-minimal)
+ ("python" ,python-2)
("python-pygobject" ,python2-pygobject)
("gtk+" ,gtk+)
("libnotify" ,libnotify)
@@ -975,6 +977,88 @@ for translations, though this is only a dependency for the maintainers. This
database is translated at Transifex.")
(license license:gpl2+)))
+(define-public system-config-printer
+ (package
+ (name "system-config-printer")
+ (version "1.5.11")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/zdohnal/system-config-printer/releases/"
+ "download/" version
+ "/system-config-printer-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"))))
+ (build-system glib-or-gtk-build-system)
+ (arguments
+ `(#:imported-modules ((guix build python-build-system)
+ ,@%glib-or-gtk-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-Makefile.am
+ (lambda _
+ ;; The Makefile generates some scripts, so set a valid shebang
+ (substitute* "Makefile.am"
+ (("/bin/bash") (which "bash")))
+ (delete-file "configure")
+ #t))
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Modify the man XML otherwise xmlto tries to access the network
+ (substitute* "man/system-config-printer.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/")))
+ #t))
+ (add-after 'install 'wrap-for-python
+ (@@ (guix build python-build-system) wrap))
+ (add-after 'install 'wrap
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (for-each
+ (lambda (program)
+ (wrap-program program
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+ (map (lambda (name)
+ (string-append out "/bin/" name))
+ '("system-config-printer"
+ "system-config-printer-applet"
+ "install-printerdriver"
+ "scp-dbus-service"))))
+ #t)))))
+ (inputs
+ `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+ ("gobject-introspection" ,gobject-introspection)
+ ("python" ,python)
+ ("cups" ,cups)
+ ("python-dbus" ,python-dbus)
+ ("python-pygobject" ,python-pygobject)
+ ("python-pycups" ,python-pycups)
+ ("python-requests" ,python-requests)
+ ("python-pycairo" ,python-pycairo)
+ ("libnotify" ,libnotify)
+ ("packagekit" ,packagekit)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("desktop-file-utils" ,desktop-file-utils)
+ ("glib" ,glib)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("intltool" ,intltool)
+ ("xmlto" ,xmlto)
+ ("docbook-xml" ,docbook-xml-4.1.2)
+ ("docbook-xsl" ,docbook-xsl)
+ ("libxml2" ,libxml2)))
+ (home-page "https://github.com/zdohnal/system-config-printer")
+ (synopsis "CUPS administration tool")
+ (description
+ "system-config-printer is a CUPS administration tool. It's written in
+Python using GTK+, and uses the @acronym{IPP, Internet Printing Protocol} when
+configuring CUPS.")
+ (license license:gpl2+)))
+
(define-public hicolor-icon-theme
(package
(name "hicolor-icon-theme")
@@ -1218,7 +1302,7 @@ dealing with different structured file formats.")
(define-public librsvg
(package
(name "librsvg")
- (version "2.40.20")
+ (version "2.44.12")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1226,11 +1310,22 @@ dealing with different structured file formats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g"))))
+ "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
+ `(#:make-flags '("CC=gcc")
+ #:phases
(modify-phases %standard-phases
+ ;; Don't patch anything in vendor/ to avoid having to recompute
+ ;; checksums for the bundled Cargo "crates". TODO: Unbundle those.
+ (delete 'patch-source-shebangs)
+ (delete 'patch-generated-file-shebangs)
+ (delete 'patch-usr-bin-file)
+ (add-before 'configure 'patch-all-the-things
+ (lambda _
+ (for-each patch-shebang '("tap-driver.sh" "tap-test"))
+ (patch-/usr/bin/file "configure")
+ #t))
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
@@ -1244,22 +1339,32 @@ dealing with different structured file formats.")
(("gdk_pixbuf_cache_file = .*$")
"gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
#t))
- (add-after 'unpack 'remove-failing-tests
+ (add-before 'check 'remove-failing-tests
(lambda _
(with-directory-excursion "tests/fixtures/reftests"
(for-each delete-file
- '(;; This test fails on i686:
+ '(;; The images produced by these tests differ slightly
+ ;; from their reference counterparts due to differences
+ ;; in the build environment (missing fonts, etc). See
+ ;; <tests/README.md> for details.
+ ;; These fail on x86_64.
+ "svg1.1/coords-viewattr-02-b.svg"
+ "svg1.1/filters-composite-04-f.svg"
+ "svg1.1/filters-image-01-b.svg"
+ "svg1.1/filters-conv-02-f.svg"
+ "svg1.1/filters-conv-04-f.svg"
+ ;; This test fails on i686:
"svg1.1/masking-path-04-b.svg"
- "svg1.1/masking-path-04-b-ref.png"
;; This test fails on armhf:
"svg1.1/masking-mask-01-b.svg"
- "svg1.1/masking-mask-01-b-ref.png"
;; This test fails on aarch64:
- "bugs/777834-empty-text-children.svg"
- "bugs/777834-empty-text-children-ref.png")))
+ "bugs/777834-empty-text-children.svg")))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ;; This is the minimum supported Rust version in Librsvg 2.44.
+ ("rust" ,rust-1.27)
+ ("cargo" ,rust-1.27 "cargo")
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(inputs
@@ -4572,6 +4677,14 @@ such as gzip tarballs.")
(out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/gnome-session")
`("PATH" ":" prefix (,(string-append glib "/bin"))))
+ #t)))
+ (add-after 'install 'add-absolute-paths-to-desktop-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (substitute* (map (lambda (x)
+ (string-append out "/share/xsessions/" x))
+ '("gnome.desktop" "gnome-xorg.desktop"))
+ (("gnome-session") (string-append out "/bin/gnome-session")))
#t))))
#:configure-flags
@@ -5317,10 +5430,6 @@ libxml2.")
;; service for TTY 1 before starting GDM).
"--with-initial-vt=7"
- ;; By default, GDM expects distributions to install a custom Xsession
- ;; script. It provides a generic one if --enable-gdm-xsession is set.
- "--enable-gdm-xsession"
-
;; Use '/etc/environment' for locale settings instead of the
;; systemd-specific '/etc/locale.conf'.
"--with-lang-file=/etc/environment"
@@ -5338,7 +5447,7 @@ libxml2.")
(modify-phases %standard-phases
(add-before
'configure 'pre-configure
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
;; We don't have <systemd/sd-daemon.h>.
(substitute* '("common/gdm-log.c"
"daemon/gdm-server.c"
@@ -5367,44 +5476,64 @@ libxml2.")
"\"/run/current-system/profile/share/wayland")
(("DATADIR \"/gnome")
"\"/run/current-system/profile/share/gnome"))
- (substitute* '("daemon/gdm-session.c")
- (("set_up_session_environment \\(self\\);")
- (string-append
- "set_up_session_environment (self);\n"
- ;; Propagate GDM_X_SERVER environment variable (which is set
- ;; by the GDM service, as it's a function of what X modules
- ;; the user decides to have available) down to worker
- ;; processes.
- "gdm_session_set_environment_variable (self, \"GDM_X_SERVER\",\n"
- " g_getenv (\"GDM_X_SERVER\"));\n"
- ;; FIXME: Really glib should be declaring XDG_CONFIG_DIRS as a
- ;; variable, but it doesn't do that right now. Anyway
- ;; /run/current-system/profile/share/gnome-session/sessions/gnome.desktop
- ;; requires that a number of .desktop files be present, and
- ;; these special .desktop files are in $XDG_CONFIG_DIRS (which
- ;; defaults to /etc/xdg if it's not set). Here we need to
- ;; provide a value such that the GNOME session's requirements
- ;; are met (provided GNOME is installed of course).
- "gdm_session_set_environment_variable (self, \"XDG_CONFIG_DIRS\",\n"
- " \"/run/current-system/profile/etc/xdg\");\n"
- ;; The session bus (which GDM will initialize from the this
- ;; session environment) needs to know where to find the system
- ;; service files.
- "gdm_session_set_environment_variable (self, \"XDG_DATA_DIRS\",\n"
- " \"/run/current-system/profile/share\");\n"
- )))
+ (let ((propagate '("GDM_CUSTOM_CONF"
+ "GDM_DBUS_DAEMON"
+ "GDM_X_SERVER"
+ "GDM_X_SESSION"
+ ;; XXX: Remove this once GNOME Shell is
+ ;; a dependency of GDM.
+ "XDG_DATA_DIRS")))
+ (substitute* "daemon/gdm-session.c"
+ (("set_up_session_environment \\(self\\);")
+ (apply string-append
+ "set_up_session_environment (self);\n"
+ (map (lambda (name)
+ (string-append
+ "gdm_session_set_environment_variable "
+ "(self, \"" name "\","
+ "g_getenv (\"" name "\"));\n"))
+ propagate)))))
;; Look for custom GDM conf in /run/current-system.
(substitute* '("common/gdm-settings-desktop-backend.c")
(("GDM_CUSTOM_CONF")
- "\"/run/current-system/etc/gdm/custom.conf\""))
+ (string-append "(g_getenv(\"GDM_CUSTOM_CONF\") != NULL"
+ " ? g_getenv(\"GDM_CUSTOM_CONF\")"
+ " : GDM_CUSTOM_CONF)")))
;; Use service-supplied path to X.
(substitute* '("daemon/gdm-server.c")
(("\\(X_SERVER X_SERVER_ARG_FORMAT")
"(\"%s\" X_SERVER_ARG_FORMAT, g_getenv (\"GDM_X_SERVER\")"))
(substitute* '("daemon/gdm-x-session.c")
+ (("\"dbus-daemon\"")
+ "g_getenv (\"GDM_DBUS_DAEMON\")")
(("X_SERVER")
- "g_getenv (\"GDM_X_SERVER\")"))
- #t)))))
+ "g_getenv (\"GDM_X_SERVER\")")
+ (("GDMCONFDIR \"/Xsession\"")
+ "g_getenv (\"GDM_X_SESSION\")"))
+ ;; Use an absolute path for GNOME Session.
+ (substitute* "daemon/gdm-launch-environment.c"
+ (("\"gnome-session\"")
+ (string-append "\"" (assoc-ref inputs "gnome-session")
+ "/bin/gnome-session\"")))
+ #t))
+ ;; GDM needs GNOME Session to run these applications. We link
+ ;; their autostart files in `share/gdm/greeter/autostart'
+ ;; because GDM explicitly tells GNOME Session to look there.
+ ;;
+ ;; XXX: GNOME Shell should be linked here too, but currently
+ ;; GNOME Shell depends on GDM.
+ (add-after 'install 'link-autostart-files
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (autostart (string-append out "/share/gdm/"
+ "greeter/autostart"))
+ (settings (assoc-ref inputs "gnome-settings-daemon")))
+ (mkdir-p autostart)
+ (with-directory-excursion autostart
+ (for-each (lambda (desktop)
+ (symlink desktop (basename desktop)))
+ (find-files (string-append settings "/etc/xdg"))))
+ #t))))))
(native-inputs
`(("dconf" ,dconf)
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@@ -5417,6 +5546,8 @@ libxml2.")
`(("accountsservice" ,accountsservice)
("check" ,check) ; for testing
("elogind" ,elogind)
+ ("gnome-session" ,gnome-session)
+ ("gnome-settings-daemon" ,gnome-settings-daemon)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("libcanberra" ,libcanberra)
@@ -6065,6 +6196,7 @@ associations for GNOME.")
("pinentry-gnome3" ,pinentry-gnome3)
("pulseaudio" ,pulseaudio)
("shared-mime-info" ,shared-mime-info)
+ ("system-config-printer" ,system-config-printer)
("totem" ,totem)
("xdg-user-dirs" ,xdg-user-dirs)
("yelp" ,yelp)
@@ -7259,7 +7391,7 @@ mp3, Ogg Vorbis and FLAC")
(define-public soundconverter
(package
(name "soundconverter")
- (version "3.0.0")
+ (version "3.0.1")
(source
(origin
(method url-fetch)
@@ -7268,8 +7400,7 @@ mp3, Ogg Vorbis and FLAC")
"soundconverter-" version ".tar.xz"))
(sha256
- (base32
- "1wrxf5py54xplrf97qp24pzbis0cvax5c6k0c7vr3z3ry8r7gd7c"))
+ (base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5"))
(patches
(search-patches
"soundconverter-remove-gconf-dependency.patch"))))
@@ -7286,12 +7417,6 @@ mp3, Ogg Vorbis and FLAC")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-POTFILES.in
- (lambda _
- (substitute* "po/POTFILES.in"
- ;; This file doesn't exist, so without removing it, the 'check
- ;; phase fails for the po directory
- (("soundconverter/gconfstore\\.py") ""))))
(add-after 'install 'wrap-soundconverter-for-python
(assoc-ref python:%standard-phases 'wrap))
(add-after 'install 'wrap-soundconverter
@@ -7322,52 +7447,49 @@ configurable file renaming. ")
(license license:gpl3)))
(define-public workrave
- (let ((commit "v1_10_21"))
- (package
- (name "workrave")
- (version (string-map (match-lambda
- (#\_ #\.)
- (chr chr))
- (string-drop commit 1)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rcaelers/workrave.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"))))
- (build-system glib-or-gtk-build-system)
- (propagated-inputs `(("glib" ,glib)
- ("gtk+" ,gtk+)
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("gtkmm" ,gtkmm)
- ("glibmm" ,glibmm)
- ("libx11" ,libx11)
- ("libxtst" ,libxtst)
- ("dconf" ,dconf)
- ("libice" ,libice)))
- (inputs `(("libsm" ,libsm)
- ("python-cheetah" ,python2-cheetah)))
- (native-inputs `(("glib" ,glib "bin")
- ("pkg-config" ,pkg-config)
- ("gettext" ,gnu-gettext)
- ("autoconf" ,autoconf)
- ("autoconf-archive" , autoconf-archive)
- ("automake" ,automake)
- ("libtool" ,libtool)
- ("intltool" ,intltool)
- ("libxscrnsaver" ,libxscrnsaver)
- ("gobject-introspection" ,gobject-introspection)
- ("python2" ,python-2)))
- (synopsis "Tool to help prevent repetitive strain injury (RSI)")
- (description
- "Workrave is a program that assists in the recovery and prevention of
+ (package
+ (name "workrave")
+ (version "1.10.21")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rcaelers/workrave.git")
+ (commit (string-map (match-lambda (#\_ #\.) (chr chr)) version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"))))
+ (build-system glib-or-gtk-build-system)
+ (propagated-inputs `(("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("gdk-pixbuf" ,gdk-pixbuf)
+ ("gtkmm" ,gtkmm)
+ ("glibmm" ,glibmm)
+ ("libx11" ,libx11)
+ ("libxtst" ,libxtst)
+ ("dconf" ,dconf)
+ ("libice" ,libice)))
+ (inputs `(("libsm" ,libsm)
+ ("python-cheetah" ,python2-cheetah)))
+ (native-inputs `(("glib" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("gettext" ,gnu-gettext)
+ ("autoconf" ,autoconf)
+ ("autoconf-archive" , autoconf-archive)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("intltool" ,intltool)
+ ("libxscrnsaver" ,libxscrnsaver)
+ ("gobject-introspection" ,gobject-introspection)
+ ("python2" ,python-2)))
+ (synopsis "Tool to help prevent repetitive strain injury (RSI)")
+ (description
+ "Workrave is a program that assists in the recovery and prevention of
repetitive strain injury (@dfn{RSI}). The program frequently alerts you to take
micro-pauses and rest breaks, and restricts you to your daily limit.")
- (home-page "http://www.workrave.org")
- (license license:gpl3+))))
+ (home-page "http://www.workrave.org")
+ (license license:gpl3+)))
(define-public ghex
(package
@@ -7375,9 +7497,9 @@ micro-pauses and rest breaks, and restricts you to your daily limit.")
(version "3.18.3")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
+ (uri (string-append "mirror://gnome/sources/ghex/"
(version-major+minor version) "/"
- name "-" version ".tar.xz"))
+ "ghex-" version ".tar.xz"))
(sha256
(base32
"1lq8920ad2chi9ibmyq0x9hg9yk63b0kdbzid03w42cwdzw50x66"))))
@@ -7388,7 +7510,7 @@ micro-pauses and rest breaks, and restricts you to your daily limit.")
("which" ,which)
("intltool" ,intltool)
("yelp-tools" ,yelp-tools)
- ("desktop-file-utils" ,desktop-file-utils))) ;for 'desktop-file-validate'
+ ("desktop-file-utils" ,desktop-file-utils))) ; for 'desktop-file-validate'
(inputs
`(("atk" ,atk)
("gtk" ,gtk+)))
@@ -7404,9 +7526,9 @@ hexadecimal or ASCII. It is useful for editing binary files in general.")
(version "3.28.5")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
+ (uri (string-append "mirror://gnome/sources/libdazzle/"
(version-major+minor version) "/"
- name "-" version ".tar.xz"))
+ "libdazzle-" version ".tar.xz"))
(sha256
(base32
"08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg"))))
@@ -7427,9 +7549,9 @@ hexadecimal or ASCII. It is useful for editing binary files in general.")
(setenv "DISPLAY" ":1")
#t)))))
(native-inputs
- `(("glib" ,glib "bin") ; glib-compile-resources
+ `(("glib" ,glib "bin") ; glib-compile-resources
("pkg-config" ,pkg-config)
- ;; For tests
+ ;; For tests.
("xorg-server" ,xorg-server)))
(inputs
`(("glib" ,glib)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 2ef165946e..e0a763dfaf 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
@@ -137,7 +137,7 @@ generation.")
(define-public libassuan
(package
(name "libassuan")
- (version "2.5.2")
+ (version "2.5.3")
(source
(origin
(method url-fetch)
@@ -145,7 +145,7 @@ generation.")
version ".tar.bz2"))
(sha256
(base32
- "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq"))))
+ "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)
@@ -223,14 +223,14 @@ compatible to GNU Pth.")
(define-public gnupg
(package
(name "gnupg")
- (version "2.2.12")
+ (version "2.2.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
- "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv"))))
+ "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -627,7 +627,7 @@ signing, decryption, verification, and key-listing parsing.")
(define-public pius
(package
(name "pius")
- (version "2.2.6")
+ (version "2.2.7")
(source (origin
(method url-fetch)
(uri (string-append
@@ -635,15 +635,14 @@ signing, decryption, verification, and key-listing parsing.")
version "/pius-" version ".tar.bz2"))
(sha256
(base32
- "1893hzpx3zv724drqv48csrn0cm98xw4ymb1zmhs2jvjj1778zfj"))
- (patches (search-patches "pius.patch"))))
+ "1nsl7czicv95j0gfz4s82ys3g3h2mwr6cq3ilid8bpz3iy7z4ipy"))))
(build-system python-build-system)
- (inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
+ (inputs `(("perl" ,perl) ; for 'pius-party-worksheet'
("gpg" ,gnupg)
("python-six" ,python2-six)))
(arguments
`(#:tests? #f
- #:python ,python-2 ;uses the Python 2 'print' syntax
+ #:python ,python-2 ; uses the Python 2 'print' syntax
#:phases
(modify-phases %standard-phases
(add-before
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 8d87b580fb..7c761ff3ae 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -576,7 +576,7 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
-(define %icecat-version "60.5.0-guix1")
+(define %icecat-version "60.5.1-guix1")
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -598,7 +598,7 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
- "09a0kk250r03984n1hdwr2rg1vmhi2jkyzzgbbvkf9h9hzp6j7qs"))))
+ "1xbi1gvrrvqby04vx6klxff7h5r87dqgi1fx6i4mbg3ll59gy09z"))))
(upstream-icecat-base-version "60.3.0") ; maybe older than base-version
(upstream-icecat-gnu-version "1")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4817fec8c1..70d48aaeea 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -1591,18 +1591,21 @@ misspelled words in a GtkTextView widget.")
(define-public clipit
(package
(name "clipit")
- (version "1.4.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/downloads/ClipIt/clipit-"
- version ".tar.gz"))
- (sha256
- (base32
- "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"))))
+ (version "1.4.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/CristianHenzel/ClipIt.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"))))
(build-system gnu-build-system)
(native-inputs
- `(("intltool" ,intltool)
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+-2)))
@@ -1677,7 +1680,7 @@ popular spread sheet programs.")
(define-public yad
(package
(name "yad")
- (version "0.40.3")
+ (version "0.41.0")
(source
(origin
(method git-fetch)
@@ -1686,7 +1689,7 @@ popular spread sheet programs.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1vpgbjbkkbk5plicyklzpf65j1vlig4n4bi3qpvrz5bb09ic5alw"))))
+ (base32 "1hkxiich898sbacpg3jflf6i8l4hkfnc0zh10rr376v0mnzbn6jn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index ae05197e16..8febe605a7 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1251,54 +1251,69 @@ above command-line parameters.")
(define-public guile-hall
(package
(name "guile-hall")
- (version "0.1.1")
+ (version "0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/a-sassmannshausen/guile-hall")
- (commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b")))
- (file-name "guile-hall-0.1.1-checkout")
- (sha256
- (base32
- "03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1"))))
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256 (base32
+ "1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz"))))
(build-system gnu-build-system)
(arguments
- `(#:modules
- ((ice-9 match)
- (ice-9 ftw)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'hall-wrap-binaries
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin/"))
- (site (string-append out "/share/guile/site"))
- (config (assoc-ref inputs "guile-config")))
- (match (scandir site)
- (("." ".." version)
- (let ((modules (string-append site "/" version))
- (compiled-modules (string-append
- out "/lib/guile/" version
- "/site-ccache")))
- (wrap-program (string-append bin "hall")
- `("GUILE_LOAD_PATH" ":" prefix
- (,modules
- ,(string-append config
- "/share/guile/site/"
- version)))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,compiled-modules
- ,(string-append config "/lib/guile/"
- version
- "/site-ccache"))))
- #t)))))))))
+ `(#:modules
+ ((ice-9 match)
+ (ice-9 ftw)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases
+ %standard-phases
+ (add-after 'install 'hall-wrap-binaries
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((compiled-dir
+ (lambda (out version)
+ (string-append
+ out "/lib/guile/" version "/site-ccache")))
+ (uncompiled-dir
+ (lambda (out version)
+ (string-append
+ out "/share/guile/site"
+ (if (string-null? version) "" "/") version)))
+ (dep-path
+ (lambda (env modules path)
+ (list env ":" 'prefix
+ (cons modules
+ (map (lambda (input)
+ (string-append
+ (assoc-ref inputs input)
+ path))
+ ,''("guile-config"))))))
+ (out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/"))
+ (site (uncompiled-dir out "")))
+ (match (scandir site)
+ (("." ".." version)
+ (for-each
+ (lambda (file)
+ (wrap-program
+ (string-append bin file)
+ (dep-path
+ "GUILE_LOAD_PATH"
+ (uncompiled-dir out version)
+ (uncompiled-dir "" version))
+ (dep-path
+ "GUILE_LOAD_COMPILED_PATH"
+ (compiled-dir out version)
+ (compiled-dir "" version))))
+ ,''("hall"))
+ #t))))))))
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)))
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-config" ,guile-config)))
@@ -1963,8 +1978,8 @@ format is also supported.")
(deprecated-package "mcron2" mcron))
(define-public guile-picture-language
- (let ((commit "1531116036d1b5e0d2482ff2c8d77ad21f1d2bef")
- (revision "1"))
+ (let ((commit "1ea8b78a8bceb4f7e5eaeb3e76987072267f99bb")
+ (revision "2"))
(package
(name "guile-picture-language")
(version (git-version "0" revision commit))
@@ -1975,7 +1990,7 @@ format is also supported.")
(commit commit)))
(sha256
(base32
- "04salmqf5x84vb3qkkxx47b64jyl290zsf3ik81l9hg6fwvvlmq3"))))
+ "1rvq6q2zq21x7dx0qq1hn568wglsl4bkd8gacbarcx1fs0rrxcqw"))))
(build-system guile-build-system)
(inputs
`(("guile" ,guile-2.2)))
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 0a2a7dbb7b..006a61c086 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -38,14 +38,14 @@
(define-public ddcutil
(package
(name "ddcutil")
- (version "0.9.2")
+ (version "0.9.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.ddcutil.com/tarballs/"
- name "-" version ".tar.gz"))
+ "ddcutil-" version ".tar.gz"))
(sha256
- (base32 "0nhi261vf2n3jpi0a0n6659911kxi3lj7a4h7cmv0ip6sbb8rk88"))))
+ (base32 "1jqfip43sx3dnx86znmpy8dj4ikkfpgf8npgq66s7hqwwa99i7zc"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -238,7 +238,7 @@ be dangerous and may void your CPU or system board's warranty.")
(define-public wavemon
(package
(name "wavemon")
- (version "0.8.2")
+ (version "0.9.0")
(source
(origin
(method git-fetch)
@@ -247,7 +247,7 @@ be dangerous and may void your CPU or system board's warranty.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs"))))
+ (base32 "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 60ba8a2721..7dc3bd89a1 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
+;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -298,7 +298,7 @@ Japanese language input in most graphical applications.")
(define-public librime
(package
(name "librime")
- (version "1.3.2")
+ (version "1.4.0")
(source
(origin
(method git-fetch)
@@ -308,7 +308,7 @@ Japanese language input in most graphical applications.")
(file-name (git-file-name name version))
(sha256
(base32
- "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r"))
+ "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -349,16 +349,16 @@ traditional Chinese output.")
(define-public rime-data
(package
(name "rime-data")
- (version "0.38.20181029")
+ (version "0.38.20190131")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/plum.git")
- (commit "fb4f829da2007f2dbb37d60a79bc67c25ea16568")))
+ (commit "8b48688cd4610d0c9223eb68831a31b6134e4cc8")))
(file-name "plum-checkout")
(sha256
- (base32 "1m1wiv9j5bay4saga58c7dj4h8gqivsbyp16y245ifvxvp9czj67"))))
+ (base32 "0fv3hv4av9y7afxijh1n8idnyf82v9rxxi2ypmxd7lkj4naa22qh"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@@ -380,7 +380,8 @@ traditional Chinese output.")
(let* ((dest-dir "package/rime"))
(mkdir-p dest-dir)
(for-each (lambda (pkg)
- (symlink (assoc-ref inputs pkg)
+ (symlink (assoc-ref inputs
+ (string-append "rime-" pkg))
(string-append dest-dir "/" pkg)))
'("array"
"bopomofo"
@@ -406,216 +407,216 @@ traditional Chinese output.")
#t))
(delete 'configure))))
(native-inputs
- `(("array"
+ `(("rime-array"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-array.git")
- (commit "906e923902147584b0b0247028a782abbfbfd8a0")))
+ (commit "93cc99238f120606a076220ec4ddcad164f6396a")))
(file-name "rime-array-checkout")
(sha256
(base32
- "1alk6ghn4ji4kvp7lfm57bwm2gjh99i79r0w9naz6wkdim8idvb1"))))
- ("bopomofo"
+ "06yxrv3x702751jvx46rfw3ix34jk7jh183rz6bllznzi7lxz7sz"))))
+ ("rime-bopomofo"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-bopomofo.git")
- (commit "8dc44ca1b6ef4e45b452e070b9da737f5da165e3")))
+ (commit "ed25098386f5efd3d70b08650f0d1b70c41c11a3")))
(file-name "rime-bopomofo-checkout")
(sha256
(base32
- "16k6wfhcrw3a77rmbrp21ca0gmsmb3f68s193c1cfwr8i68k46nf"))))
- ("cangjie"
+ "1ip1pbfb1hadf2mcymr5939iagf25ywfl67d9198jahzyr6rdyvc"))))
+ ("rime-cangjie"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-cangjie.git")
- (commit "ab085e90856b3399b374dc3c8b4cb40d11f307a8")))
+ (commit "5fd8ce6f64039e505ca02655a621f2e830b97c19")))
(file-name "rime-cangjie-checkout")
(sha256
(base32
- "11fgj0rbv9nyzfijwm2l8pm8fznhif4h27ndrrcaaylkp7p5zsx2"))))
- ("combo-pinyin"
+ "1gf6r0q593ixar6v0jyvs56cik2gjp7pf9v799rfd2yydyia3bfg"))))
+ ("rime-combo-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-combo-pinyin.git")
- (commit "f1bae63f20504f2b8113c5cbdf2700e858aa91eb")))
+ (commit "9bd952b964e9744e5d18e9e31625b50f3585a2cb")))
(file-name "rime-combo-pinyin-checkout")
(sha256
(base32
- "1l1079akwm1hw4kkn0q6x9fpylnl2ka6z2fn7lmdpfpsr0xgn0n7"))))
- ("double-pinyin"
+ "0crafjs39x4j221gb34mxxh3cdpxfhhx3nfw6b6bgkzlrp35a02b"))))
+ ("rime-double-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-double-pinyin.git")
- (commit "2101a5cd40e511ec38835769aa66d2dddf059c2e")))
+ (commit "69bf85d4dfe8bac139c36abbd68d530b8b6622ea")))
(file-name "rime-double-pinyin-checkout")
(sha256
(base32
- "19hh2qm0njbfk2js678hfm2hw9b796s43vs11yy3m1v9m0gk2vi7"))))
- ("emoji"
+ "093wif5avvvw45fqbwj5wkbxrychy4pagl4mwsmbrayc8jkp69ak"))))
+ ("rime-emoji"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-emoji.git")
- (commit "6e6611b315f03ee4c33f958f9dbe960b13a0ed19")))
+ (commit "c8d67f9b50bf89a10c57da646d2e6db8799aef38")))
(file-name "rime-emoji-checkout")
(sha256
(base32
- "1brfs3214w36j3345di9ygp468hbvbqdqpkjxxs1dbp437rayhyy"))))
- ("essay"
+ "0ngcm088iyyp3llxvv0m80i7n5928d6cgh256ikhn3ixallxxdxv"))))
+ ("rime-essay"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-essay.git")
- (commit "5e5c7a0ef41c9b030abdad81a9df07b56b1661e9")))
+ (commit "71d0b1f3d4f3bfe61ae07581edf07579740c4421")))
(file-name "rime-essay-checkout")
(sha256
(base32
- "0ana9is0zhh79m4gjshvmaxbrg3jiqysydx5bpm151i7i6vw5y1i"))))
- ("ipa"
+ "1iwz104k7zfk7lpa257kvpqdr6jhbg3p76n3644ywiz4l7kc678i"))))
+ ("rime-ipa"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-ipa.git")
- (commit "02a9e2c181921a2e95e1a81f88188c41132755c3")))
+ (commit "e420c7bfb07153a2d2484eb2bdccdd719811abbb")))
(file-name "rime-ipa-checkout")
(sha256
(base32
- "1szrxgvqlgmxapj2aflw2cvbv0p6pl0sw0gyxa13dvdhhf7s9rvr"))))
- ("jyutping"
+ "1wfv7lb4y61b3qic5mhw92rn46cckldd9wrkcq03mg5512mbw63z"))))
+ ("rime-jyutping"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-jyutping.git")
- (commit "1402ec3d6cc0973f952fe3f9ef531294e4ffe9e0")))
+ (commit "04891a298319888e8c6b1a20e0fa81cfaea01264")))
(file-name "rime-jyutping-checkout")
(sha256
(base32
- "17g03dy4gw6vyc9da1wjn3iy9hx64dfnwiwsfc7bkzan22x2m4dv"))))
- ("luna-pinyin"
+ "0wsj965khglz36cnvfm4fkv386xvxhmsxgcw88p5qi0b3wlbzzx6"))))
+ ("rime-luna-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-luna-pinyin.git")
- (commit "3b05132576f5c347ff8a70857d2dae080936ac3b")))
+ (commit "c9c405566177cb3898bdb82d7f4157587f2d9c01")))
(file-name "rime-luna-pinyin-checkout")
(sha256
(base32
- "0kgnpxjn10dm2d9718r12rdjlwqd2s2h84jvkhxhh5v0dkv1anl2"))))
- ("middle-chinese"
+ "0i7f2675lvj9pzwlm8550ifnr3xqi77xlyyvml1wpxpkfqhjr475"))))
+ ("rime-middle-chinese"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-middle-chinese.git")
- (commit "9ba8d70330654b9a730f882d35cfad7dbeddfd75")))
+ (commit "ed6d44f8d0bedf6e0c1c3183a270f8f01a211a40")))
(file-name "rime-middle-chinese-checkout")
(sha256
(base32
- "0hwg5zby5kphh0bcfay8mfxwr5bwqhamiw3cmmmf7kp9fbns5s23"))))
- ("pinyin-simp"
+ "09mql88lsrxa99pyllby5z22kaiwwa037ha8gwaxjnnlsjgvz7zx"))))
+ ("rime-pinyin-simp"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-pinyin-simp.git")
- (commit "74357ffd62c05fb60edf6eab5b86bc8c8c1907d0")))
+ (commit "bb5a6dfa871669d2f451b477bfff6d131df6f6c6")))
(file-name "rime-pinyin-simp-checkout")
(sha256
(base32
- "1paw3c7pv5bl54abnp9pidfxrkchdacyxy5m9zb311p5sgm7fhxh"))))
- ("prelude"
+ "0ss82042k833w5q72h72ghcfchkx00nx6l4z4fb861s2rxr0bkjd"))))
+ ("rime-prelude"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-prelude.git")
- (commit "33040568c3ddb2ee6340c9b669494317db21b77c")))
+ (commit "8a52b4f86a59f3eb602f9a4cf6a680a67c15df8c")))
(file-name "rime-prelude-checkout")
(sha256
(base32
- "1gwcasyyg6f0ib6s4qsrrjcqr1lcs7j3xqxl65rznsw44nhnbwwq"))))
- ("quick"
+ "039fr3996vfxzn2milaq1f5fw08f6zgjsxsql6cfhsc5b55fidm7"))))
+ ("rime-quick"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-quick.git")
- (commit "910a97d403ad8e72f322488da146da79c19d623f")))
+ (commit "3fe5911ba608cb2df1b6301b76ad1573bd482a76")))
(file-name "rime-quick-checkout")
(sha256
(base32
- "0yrq3gbfmm29xlr52rmxc41mqfrb0295q7sdhbc3ax71677mpr0y"))))
- ("scj"
+ "08bh87ym5qvw55lyw20l3m7jd4c2z5rvil8h5q8790r7z6j6ijy9"))))
+ ("rime-scj"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-scj.git")
- (commit "e0eae889f4376d2a434ac3b38523e0da7400db68")))
+ (commit "cab5a0858765eff0553dd685a2d61d5536e9149c")))
(file-name "rime-scj-checkout")
(sha256
(base32
- "1whnv9zs349kvy0zi7dnmpqwil8i6gqwrzvhy3qdrjzy58y6gwxn"))))
- ("soutzoe"
+ "0ard2bjp4896a8dimmcwyjwgmp9kl4rz92yc92jnd3y4rgwl6fvk"))))
+ ("rime-soutzoe"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-soutzoe.git")
- (commit "e47841a8ad6341731c41cdb814b7a25c837603c4")))
+ (commit "beeaeca72d8e17dfd1e9af58680439e9012987dc")))
(file-name "rime-soutzoe-checkout")
(sha256
(base32
- "1rgpmkxa72jy6gyy44fn8azpk3amk9s9lrdf7za03nv95d0fvm0p"))))
- ("stenotype"
+ "0jyqx0q9s0qxn168l5n8zav8jcl2g5ppr7pa8jm1vwrllf20slcc"))))
+ ("rime-stenotype"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-stenotype.git")
- (commit "d4ff379314fd95283853d1734854979cf3cbd287")))
+ (commit "1d472097c32d943d1096644f4c31f28799a17bd8")))
(file-name "rime-stenotype-checkout")
(sha256
(base32
- "1kckpi4l4884hvydr3d6vid3v7rsc1app29kmk7v8jf8vn16afhl"))))
- ("stroke"
+ "1dy9qlbyhnshq2k1vcvkqn2624r96iaixhyrx1z7v0vz84fjf6y4"))))
+ ("rime-stroke"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-stroke.git")
- (commit "cfd29c675c46cf70b7a7f0a3836a913059316a0a")))
+ (commit "f802735392b378fb2a56a9b7b53b8ec96a30ccaf")))
(file-name "rime-stroke-checkout")
(sha256
(base32
- "135is9c1p4lm98fd9l1gxyflkm69cv5an129ka7sk614bq84m08d"))))
- ("terra-pinyin"
+ "1wlrsskxhldh8369n771gk7sxflzdx0c9qhq1mqm5hhkwc5ig1j0"))))
+ ("rime-terra-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-terra-pinyin.git")
- (commit "15b5c73a796571cd6f9ef6c89f96656cb9df86f9")))
+ (commit "b9e0edd3182e74b26b03a278c038e669ca538a35")))
(file-name "rime-terra-pinyin-checkout")
(sha256
(base32
- "1xsd84h1zw417h5hr4dbgyk5009zi7q2p9774w3ccr5sxgc3i3cm"))))
- ("wubi"
+ "1vzrv2k178bii4ld9rvpdi8zmcwybd8bks0qzjx2v4kbjgwj28zk"))))
+ ("rime-wubi"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-wubi.git")
- (commit "d44403728a0b1cd8b47cb1f81b83f58e5f790b74")))
+ (commit "dd052ee158a38cb791755318b1aef9b4a3ed0316")))
(file-name "rime-wubi-checkout")
(sha256
(base32
- "0ld31bdn94lncxd1ka44w4sbl03skh08mc927dhdmwq5bpvrgn36"))))
- ("wugniu"
+ "00xzv3sbwqh2jz4i7s315h7rw17qa2dgj7kflyy3blxk0s2cqiqa"))))
+ ("rime-wugniu"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-wugniu.git")
- (commit "65bcc354ada3839591d7546a64c71dbdd0592b02")))
+ (commit "abd1ee98efbf170258fcf43875c21a4259e00b61")))
(file-name "rime-wugniu-checkout")
(sha256
(base32
- "0g31awp40s778sp5c290x40s8np86n8aw011s17sslxrqhhb0bkx"))))))
+ "0qn54d3cclny106ixdw08r5n6wn52ffs1hgrma3k0j4pv0kr9nlq"))))))
(home-page "https://rime.im/")
(synopsis "Schema data of Rime Input Method Engine")
(description "@dfn{rime-data} provides the schema data of Rime Input
@@ -625,7 +626,7 @@ Method Engine.")
(define-public ibus-rime
(package
(name "ibus-rime")
- (version "1.3.0")
+ (version "1.4.0")
(source
(origin
(method git-fetch)
@@ -634,7 +635,7 @@ Method Engine.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1nqi7ymv34a9kx24say3xj98lkrs9nkpv1n2ijb91wdz3cr012ly"))))
+ (base32 "12y6jdz1amhgrnqa7zjim63dfsz6zyxyahbirfan37wmcfp6gp1d"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 233fea85af..a8968acba2 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -457,19 +457,19 @@ vision algorithms. It can be used to do things like:
(define-public nip2
(package
(name "nip2")
- (version "8.7.0")
+ (version "8.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/libvips/nip2/releases/download/v"
version "/nip2-" version ".tar.gz" ))
(sha256
- (base32 "08dxfds4n1vxdilxcw01741a2r6fxyhawi656b7f0hy6znnkbsbc"))))
+ (base32 "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- ;; test_conv.ws keep failing so disabling for now
+ ;; test_conv.ws keep failing so disabling for now.
(add-after 'unpack 'disable-test-conv
(lambda _
(delete-file "test/workspaces/test_conv.ws")
@@ -484,7 +484,7 @@ vision algorithms. It can be used to do things like:
("gtk+-2" ,gtk+-2)
("libxml2" ,libxml2)
("libexif" ,libexif)
- ("libjpeg" ,libjpeg) ;required by vips.pc
+ ("libjpeg" ,libjpeg) ; required by vips.pc
("librsvg" ,librsvg)
("fftw" ,fftw)
("libgsf" ,libgsf)
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 895802cc94..7da0b0dab9 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@@ -62,7 +62,7 @@
(define-public feh
(package
(name "feh")
- (version "3.1.1")
+ (version "3.1.3")
(home-page "https://feh.finalrewind.org/")
(source (origin
(method url-fetch)
@@ -70,7 +70,7 @@
name "-" version ".tar.bz2"))
(sha256
(base32
- "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31"))))
+ "1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases (delete 'configure))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1f1c8433d1..f4bf1116e4 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -321,7 +321,7 @@ Currently all documentation resides in @file{pnglite.h}.")
(version "9c")
(source (origin
(method url-fetch)
- (uri (string-append "http://www.ijg.org/files/jpegsrc.v"
+ (uri (string-append "https://www.ijg.org/files/jpegsrc.v"
version ".tar.gz"))
(sha256 (base32
"08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"))))
@@ -342,14 +342,14 @@ lossless JPEG manipulations such as rotation, scaling or cropping:
@item wrjpgcom
@end enumerate")
(license license:ijg)
- (home-page "http://www.ijg.org/")))
+ (home-page "https://www.ijg.org/")))
(define-public libjpeg-8
(package (inherit libjpeg)
(version "8d")
(source (origin
(method url-fetch)
- (uri (string-append "http://www.ijg.org/files/jpegsrc.v"
+ (uri (string-append "https://www.ijg.org/files/jpegsrc.v"
version ".tar.gz"))
(sha256 (base32
"1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"))))))
@@ -1299,10 +1299,11 @@ PNG, and performs PNG integrity checks and corrections.")
(package
(name "libjpeg-turbo")
(version "2.0.1")
+ (replacement libjpeg-turbo-2.0.2)
(source (origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/" name "/" version "/"
- name "-" version ".tar.gz"))
+ (uri (string-append "mirror://sourceforge/libjpeg-turbo/"
+ version "/libjpeg-turbo-" version ".tar.gz"))
(sha256
(base32
"1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"))))
@@ -1328,6 +1329,18 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).")
license:ijg ;the libjpeg library and associated tools
license:zlib)))) ;the libjpeg-turbo SIMD extensions
+(define-public libjpeg-turbo-2.0.2
+ (package
+ (inherit libjpeg-turbo)
+ (version "2.0.2")
+ (source (origin
+ (inherit (package-source libjpeg-turbo))
+ (uri (string-append "mirror://sourceforge/libjpeg-turbo/"
+ version "/libjpeg-turbo-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"))))))
+
(define-public niftilib
(package
(name "niftilib")
@@ -1575,15 +1588,16 @@ identical visual appearance.")
(define-public grim
(package
(name "grim")
- (version "1.0")
+ (version "1.1")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/emersion/grim/archive/v" version
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/grim.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f"))))
+ (base32 "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz"))))
(build-system meson-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("cairo" ,cairo)
@@ -1600,7 +1614,7 @@ identical visual appearance.")
(define-public slurp
(package
(name "slurp")
- (version "1.0")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
@@ -1609,7 +1623,7 @@ identical visual appearance.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "03igv8r8n772xb0y7whhs1pa298l3d94jbnknaxpwp2n4fi04syb"))))
+ (base32 "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y"))))
(build-system meson-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("cairo" ,cairo)
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 98d0e8d5d8..e6f23d14d7 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -67,15 +67,15 @@
(define-public quassel
(package
(name "quassel")
- (version "0.13.0")
+ (version "0.13.1")
(source
(origin
(method url-fetch)
- (uri (string-append "http://quassel-irc.org/pub/quassel-"
+ (uri (string-append "https://quassel-irc.org/pub/quassel-"
version ".tar.bz2"))
(sha256
(base32
- "0xp9mppxl63qzgsdyprmblvfrj0bb9z57kfc088gvcavvq1210nr"))
+ "0mg8jydc70vlylppzich26q4s40kr78r3ysfyjwisfvlg2byxvs8"))
(modules '((guix build utils)))
;; We don't want to install the bundled scripts.
(snippet
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a314dc9953..9747569009 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
@@ -2267,22 +2267,23 @@ debugging, etc.")
(define-public javacc
(package
(inherit javacc-4)
- (version "7.0.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/javacc/javacc/"
- "archive/" version ".tar.gz"))
- (file-name (string-append "javacc-" version ".tar.gz"))
- (sha256
- (base32
- "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
- (modules '((guix build utils)))
- ;; delete bundled jars
- (snippet '(begin (for-each delete-file-recursively
- '("bootstrap" "lib"))
- #t))))
- (arguments
- `(#:make-flags ; bootstrap from javacc-4
+ (version "7.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/javacc/javacc.git")
+ (commit version)))
+ (file-name (git-file-name "javacc" version))
+ (sha256
+ (base32 "18kkak3gda93gr25jrgy6q00g0jr8i24ri2wk4kybz1v234fxx9i"))
+ (modules '((guix build utils)))
+ ;; Delete bundled jars.
+ (snippet '(begin (for-each delete-file-recursively
+ '("bootstrap" "lib"))
+ #t))))
+ (arguments
+ `(#:make-flags ; bootstrap from javacc-4
(list (string-append "-Dbootstrap-jar="
(assoc-ref %build-inputs "javacc")
"/share/java/javacc.jar"))
@@ -5236,18 +5237,18 @@ fundamental protocol access, not higher-level abstractions.")
(define-public java-jsch
(package
(name "java-jsch")
- (version "0.1.54")
+ (version "0.1.55")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/jsch/jsch/"
version "/jsch-" version ".zip"))
(sha256
(base32
- "029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb"))))
+ "1lxyjwvmwa723wcf3bqn816hkvc03vz4xhbsi7bvfhrz2rpgcfq6"))))
(build-system ant-build-system)
(arguments
`(#:build-target "dist"
- #:tests? #f ; no tests included
+ #:tests? #f ; no tests included
#:phases
(modify-phases %standard-phases
(replace 'install (install-jars "dist")))))
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 5068de22bb..6a8d27f34e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -78,7 +78,7 @@
(define-public extra-cmake-modules
(package
(name "extra-cmake-modules")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -87,7 +87,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
- "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0"))))
+ "1x868hs9jiqzkqx7gld4mdm5dzfxc5kann22y15a4f7g5a957534"))))
(build-system cmake-build-system)
(native-inputs
`(("qtbase" ,qtbase))) ; For tests (needs qmake)
@@ -253,7 +253,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
(define-public attica
(package
(name "attica")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn"))))
+ "0bsn9mi3nj23k2r3mfgjm9i1mp8qnwf08xn9x757wk3xas0cx98v"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -293,7 +293,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
(define-public bluez-qt
(package
(name "bluez-qt")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -302,7 +302,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
name "-" version ".tar.xz"))
(sha256
(base32
- "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard"))))
+ "1ixad1ya3c339c675w8nwmbga8ydq16db9fk2az3gjm68z3dch8a"))))
(build-system cmake-build-system)
(native-inputs
`(("dbus" ,dbus)
@@ -326,7 +326,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
(define-public breeze-icons
(package
(name "breeze-icons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -335,23 +335,8 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
name "-" version ".tar.xz"))
(sha256
(base32
- "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph"))))
+ "03mb7x8mc2h6cjb4mrifrbkbpj3lv9c0mg4m619rqiydg0p1yf49"))))
(build-system cmake-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'add-symlinks
- ;; Fix "ScalableTest" - FIXME: Remove for > 5.49.0
- (lambda _
- (symlink "../22/plasma-browser-integration.svg"
- "icons-dark/apps/48/plasma-browser-integration.svg")
- (symlink "../22/plasma-browser-integration.svg"
- "icons-dark/apps/64/plasma-browser-integration.svg")
- (symlink "../22/plasma-browser-integration.svg"
- "icons/apps/48/plasma-browser-integration.svg")
- (symlink "../22/plasma-browser-integration.svg"
- "icons/apps/64/plasma-browser-integration.svg")
- #t)))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("fdupes" ,fdupes)
@@ -370,7 +355,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
(define-public kapidox
(package
(name "kapidox")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -379,7 +364,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
name "-" version ".tar.xz"))
(sha256
(base32
- "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559"))))
+ "0x41adp3rnvr6njc57ffdyh6d5i5aw13xcjdr4p6kacw9pk63ajf"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; has no test target
@@ -412,7 +397,7 @@ documentation.")
(define-public karchive
(package
(name "karchive")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -421,7 +406,7 @@ documentation.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0"))))
+ "1llznxc5wjjnmbjx8iwi3a93gc2z0z344viknsgls1fwdjjfyxc4"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -446,7 +431,7 @@ GZip format, via a subclass of QIODevice.")
(define-public kcodecs
(package
(name "kcodecs")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -455,7 +440,7 @@ GZip format, via a subclass of QIODevice.")
name "-" version ".tar.xz"))
(sha256
(base32
- "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz"))))
+ "0491j6l28jwfpgaqs2816qpyggnra2df33iw3fgvb0wd4r4gvmjb"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -482,7 +467,7 @@ Internet).")
(define-public kconfig
(package
(name "kconfig")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -491,10 +476,11 @@ Internet).")
name "-" version ".tar.xz"))
(sha256
(base32
- "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf"))))
+ "06gscipc3914gwiswhp1xx4sy74bpy645ykq2i6r1sb6sm16hmja"))))
(build-system cmake-build-system)
(native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
+ `(("dbus" ,dbus)
+ ("extra-cmake-modules" ,extra-cmake-modules)
("inetutils" ,inetutils)
("qttools" ,qttools)
("xorg-server" ,xorg-server)))
@@ -508,13 +494,10 @@ Internet).")
(setenv "HOME" (getcwd))
(setenv "TMPDIR" (getcwd))
#t))
- (add-before 'check 'start-xorg-server
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The test suite requires a running X server.
- (system (string-append (assoc-ref inputs "xorg-server")
- "/bin/Xvfb :1 &"))
- (setenv "DISPLAY" ":1")
- #t)))))
+ (replace 'check
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "dbus-launch" "ctest" "."))))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Kconfiguration settings framework for Qt")
(description "KConfig provides an advanced configuration system.
@@ -549,7 +532,7 @@ propagate their changes to their respective configuration files.")
(define-public kcoreaddons
(package
(name "kcoreaddons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -558,7 +541,7 @@ propagate their changes to their respective configuration files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj"))))
+ "1j7bc5fhak8db3vdfslbjdffbdclakhfwsni2a855d08yfrl1n1w"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -606,7 +589,7 @@ many more.")
(define-public kdbusaddons
(package
(name "kdbusaddons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -615,7 +598,7 @@ many more.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh"))
+ "1sj3cycgci3ih65bkh7bsvbzyp7r654ppcryj4azpcsxqhy5gc7l"))
(patches (search-patches "kdbusaddons-kinit-file-name.patch"))))
(build-system cmake-build-system)
(native-inputs
@@ -651,7 +634,7 @@ as well as an API to create KDED modules.")
(define-public kdnssd
(package
(name "kdnssd")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -660,7 +643,7 @@ as well as an API to create KDED modules.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr"))))
+ "0lljj7mxmqm60kfzr37zb7z58mfyfh7zgykf7a5is1k0lxpgk6zc"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -679,7 +662,7 @@ infrastructure.")
(define-public kguiaddons
(package
(name "kguiaddons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -688,7 +671,7 @@ infrastructure.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk"))))
+ "190jwhvq2fi8g03saszlaslzxmcbqrbwli9f9vm6h5j9nnc0z6h3"))))
(build-system cmake-build-system)
;; TODO: Build packages for the Python bindings. Ideally this will be
;; done for all versions of python guix supports. Requires python,
@@ -717,7 +700,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
(define-public ki18n
(package
(name "ki18n")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -726,7 +709,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz"))))
+ "0kvwjzqibby9fawyfb8bd81abjhsjlyi8xy9mcapnih5x2gx3z92"))))
(build-system cmake-build-system)
(propagated-inputs
`(("gettext" ,gettext-minimal)
@@ -760,7 +743,7 @@ translation scripting.")
(define-public kidletime
(package
(name "kidletime")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -769,7 +752,7 @@ translation scripting.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv"))))
+ "1kq6zh6cjhzffjhxnc7l1pw6g38swxyspp8xl8c860zdhc9xfd1g"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -791,7 +774,7 @@ or user activity.")
;; plasma-framework which is tier 3.
(package
(name "kirigami")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -800,7 +783,7 @@ or user activity.")
"kirigami2-" version ".tar.xz"))
(sha256
(base32
- "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz"))))
+ "11djxli5cq7pn19lmjz2y7z39mhlr98jskasfzyax546j47v973k"))))
(properties `((upstream-name . "kirigami2")))
(build-system cmake-build-system)
(native-inputs
@@ -827,7 +810,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
(define-public kitemmodels
(package
(name "kitemmodels")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -836,7 +819,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg"))))
+ "13609avkqrfi79zyr737662nr8bwcfdya9dxc6gzyqx5i0l2nbw6"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -886,7 +869,7 @@ model to observers
(define-public kitemviews
(package
(name "kitemviews")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -895,7 +878,7 @@ model to observers
name "-" version ".tar.xz"))
(sha256
(base32
- "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp"))))
+ "1mgh7z5xcbhc7a2qq8mqfp7j4amk93hypkpy2zc3rdhc60ps94ad"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -921,7 +904,7 @@ to flat and hierarchical lists.")
(define-public kplotting
(package
(name "kplotting")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -930,7 +913,7 @@ to flat and hierarchical lists.")
name "-" version ".tar.xz"))
(sha256
(base32
- "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0"))))
+ "0nn2v1yvvpzpi1y1pm47zvmwsa942c7d9n8iqymqihnp0fqjr8y7"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -956,7 +939,7 @@ pixel units.")
(define-public ksyntaxhighlighting
(package
(name "ksyntaxhighlighting")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -965,7 +948,7 @@ pixel units.")
"syntax-highlighting-" version ".tar.xz"))
(sha256
(base32
- "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v"))))
+ "00w5nmz9l70znv8q7q1zw3f7gngwfgf41iwbs53zqcv1z7wmrz6m"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1005,7 +988,7 @@ integration with a custom editor as well as a ready-to-use
(define-public kwayland
(package
(name "kwayland")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1014,7 +997,7 @@ integration with a custom editor as well as a ready-to-use
name "-" version ".tar.xz"))
(sha256
(base32
- "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6"))))
+ "0m9q13qzgvp03jrsyc59l6pp7jf0dvhx768p21drs46qxw6wla7l"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1044,7 +1027,7 @@ represented by a QPoint or a QSize.")
(define-public kwidgetsaddons
(package
(name "kwidgetsaddons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1053,7 +1036,7 @@ represented by a QPoint or a QSize.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92"))))
+ "0kpbvvmjrhxxjqc0cb63zlq06a3xspq43xv3wdingcn28zypynzc"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1091,7 +1074,7 @@ configuration pages, message boxes, and password requests.")
(define-public kwindowsystem
(package
(name "kwindowsystem")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1100,7 +1083,7 @@ configuration pages, message boxes, and password requests.")
name "-" version ".tar.xz"))
(sha256
(base32
- "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp"))))
+ "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1152,7 +1135,7 @@ lower level classes for interaction with the X Windowing System.")
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1161,7 +1144,7 @@ lower level classes for interaction with the X Windowing System.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2"))))
+ "10pkgm4dzsrfnjsf78pssd1wp0y27d1y834chd267hx9vgrv8axm"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1190,7 +1173,7 @@ messages.")
(define-public networkmanager-qt
(package
(name "networkmanager-qt")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1199,7 +1182,7 @@ messages.")
name "-" version ".tar.xz"))
(sha256
(base32
- "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z"))))
+ "0j8l4k13vsqh0a8mw8dw5bc78xvxhz2rh7bb870as04i32bvw772"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1229,7 +1212,7 @@ which are used in DBus communication.")
(define-public oxygen-icons
(package
(name "oxygen-icons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1238,7 +1221,7 @@ which are used in DBus communication.")
name "5" "-" version ".tar.xz"))
(sha256
(base32
- "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g"))))
+ "0fvm9bq1573xkha4a577s1iik8nwzks8xhrli5mm6rbh53s12wp4"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1254,7 +1237,7 @@ which are used in DBus communication.")
(define-public prison
(package
(name "prison")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -1262,7 +1245,7 @@ which are used in DBus communication.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d"))))
+ (base32 "1xadc2fq6csml78czg5p572cwvmqmn334a5dxjnd7k1pdx50gi07"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1279,7 +1262,7 @@ provides uniform access to generation of barcodes with data.")
(define-public qqc2-desktop-style
(package
(name "qqc2-desktop-style")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1288,7 +1271,7 @@ provides uniform access to generation of barcodes with data.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj"))))
+ "0aj37ldc3ywqap3sz73j54kbzycn529imr15jgl252k04rqpjya5"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1313,7 +1296,7 @@ feel.")
(define-public solid
(package
(name "solid")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1322,7 +1305,7 @@ feel.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp"))))
+ "18dw55g41q34m2qzvybvpsas1dnyryqxnlf2md0xc4r36ib9p2pn"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -1352,7 +1335,7 @@ system.")
(define-public sonnet
(package
(name "sonnet")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1361,7 +1344,7 @@ system.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3"))))
+ "13bb1s2f4kfaikcga297j2fqlyr4qxdcq4v1b3zs1gas4z1wpcg6"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -1389,7 +1372,7 @@ ASpell and HUNSPELL.")
(define-public threadweaver
(package
(name "threadweaver")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1398,7 +1381,7 @@ ASpell and HUNSPELL.")
name "-" version ".tar.xz"))
(sha256
(base32
- "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7"))))
+ "0r0ml5pz7h0vmydcg4gqqkl21lp6c5gqdwyfsnyad02dcjkh4hql"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1419,7 +1402,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
(define-public kactivities
(package
(name "kactivities")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1428,7 +1411,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
name "-" version ".tar.xz"))
(sha256
(base32
- "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim"))))
+ "0dp9vx2nl9fnawzcz04fqa731s3bk2izxrqbvn71aqyrs7fymabg"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1464,7 +1447,7 @@ with other frameworks.")
(define-public kauth
(package
(name "kauth")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1473,7 +1456,7 @@ with other frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8"))))
+ "1w6bp2kbp1sn4cl76fgl2pqrg660ix99qq4h65g090kc934np3zc"))))
(build-system cmake-build-system)
(native-inputs
`(("dbus" ,dbus)
@@ -1511,7 +1494,7 @@ utilities.")
(define-public kcompletion
(package
(name "kcompletion")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1520,7 +1503,7 @@ utilities.")
name "-" version ".tar.xz"))
(sha256
(base32
- "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi"))))
+ "08ym79fqk7vshsf3jk37d6jvg7ys63kwflcn5dff5ci18jan2ir2"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1547,7 +1530,7 @@ integrated it into your application's other widgets.")
(define-public kcrash
(package
(name "kcrash")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1556,7 +1539,7 @@ integrated it into your application's other widgets.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3"))))
+ "08a8c5mbj6ll0d1ivhcjx5ga1jfbnwxsk618wcfpwwi6mkxrc3f9"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1582,7 +1565,7 @@ application crashes.")
(define-public kdoctools
(package
(name "kdoctools")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1591,7 +1574,7 @@ application crashes.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl"))))
+ "0dlal0vkxf5yh1hbfhrcrxqqi1w43q7bvv8ws8pb18jjgimzr46l"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1639,7 +1622,7 @@ from DocBook files.")
(define-public kfilemetadata
(package
(name "kfilemetadata")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1648,7 +1631,7 @@ from DocBook files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80"))))
+ "0fqj266f9f66rfjzg0rl35fac5rn5n3npyfb4gsla3mdc8fjz9mi"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -1691,7 +1674,7 @@ by applications to write metadata.")
(define-public kimageformats
(package
(name "kimageformats")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1700,7 +1683,7 @@ by applications to write metadata.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4"))))
+ "0hhxv8m5993vlpi5yf7w3fadzckficn16flshdkby7bwq8agrbz1"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1745,7 +1728,7 @@ formats.")
(define-public kjobwidgets
(package
(name "kjobwidgets")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1754,7 +1737,7 @@ formats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g"))))
+ "1pbx974jpn8n2080gblmbh8q0yb5wxb9xblpm100rbhpg20sc2by"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1773,7 +1756,7 @@ asynchronous jobs.")
(define-public knotifications
(package
(name "knotifications")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1782,7 +1765,7 @@ asynchronous jobs.")
name "-" version ".tar.xz"))
(sha256
(base32
- "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9"))))
+ "1dbrk9r3w8pmg15bhrb8qdk4fiqvc9qggb67zvk1n7ddlfkyarz6"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1819,7 +1802,7 @@ covers feedback and persistent events.")
(define-public kpackage
(package
(name "kpackage")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1828,7 +1811,7 @@ covers feedback and persistent events.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd"))
+ "175b0lj4qybddjpc25b1p60lr8f9220i9ymk3wk3y3vf4893v833"))
;; Default to: external paths/symlinks can be followed by a
;; package
(patches (search-patches "kpackage-allow-external-paths.patch"))))
@@ -1880,7 +1863,7 @@ were traditional plugins.")
(define-public kpty
(package
(name "kpty")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1889,7 +1872,7 @@ were traditional plugins.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg"))))
+ "0r5080xl7x13qmjnjssb0d1pk626anaa4xahb7fi869fndr4xhzn"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1917,7 +1900,7 @@ and communicating with them using a pty.")
(define-public kunitconversion
(package
(name "kunitconversion")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1926,7 +1909,7 @@ and communicating with them using a pty.")
name "-" version ".tar.xz"))
(sha256
(base32
- "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79"))))
+ "1v5cfxk5v76w1f1qvrpilrs111wvp8bn2p3bswhqp4lg0qxync0q"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -1960,7 +1943,7 @@ gallons).")
(define-public baloo
(package
(name "baloo")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1969,7 +1952,7 @@ gallons).")
name "-" version ".tar.xz"))
(sha256
(base32
- "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph"))))
+ "068ms071639pskhjz37cszylvfzzqhp7x1rmwdfn5nlvzrv6lrxh"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kcoreaddons" ,kcoreaddons)
@@ -2025,7 +2008,7 @@ maintaining an index of the contents of your files.")
(define-public kactivities-stats
(package
(name "kactivities-stats")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2034,7 +2017,7 @@ maintaining an index of the contents of your files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f"))))
+ "12n178244ysfak0x9qm9a2k814qi56w8xpkg03na7hlsz2l4y9v6"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2055,7 +2038,7 @@ by which applications, and what documents have been linked to which activity.")
(define-public kbookmarks
(package
(name "kbookmarks")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2064,7 +2047,7 @@ by which applications, and what documents have been linked to which activity.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53"))))
+ "0vsn98znzdbiy8clbl9p3kiag3zvxgc9701gwg2ig8mpv3ci9lkg"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kwidgetsaddons" ,kwidgetsaddons)))
@@ -2098,7 +2081,7 @@ using the XBEL format.")
(define-public kcmutils
(package
(name "kcmutils")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2107,7 +2090,7 @@ using the XBEL format.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q"))))
+ "1f49864xpxrbj77n7l474wkn3rw4zy8vkl3psdya7ccdk7ac2s0k"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfigwidgets" ,kconfigwidgets)
@@ -2151,7 +2134,7 @@ KCModules can be created with the KConfigWidgets framework.")
(define-public kconfigwidgets
(package
(name "kconfigwidgets")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2160,7 +2143,7 @@ KCModules can be created with the KConfigWidgets framework.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz"))))
+ "0npfp6z5lc2h8y6slmz3sbymyyv9k2w73rpsjzl5zswqhzlvrb5k"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kauth" ,kauth)
@@ -2201,7 +2184,7 @@ their settings.")
(define-public kdeclarative
(package
(name "kdeclarative")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2210,7 +2193,7 @@ their settings.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9"))))
+ "043jl7rn9yawh04fwgaxb8iwksn3z8qb4yfc4s6v1znwcs7ajlda"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfig" ,kconfig)
@@ -2264,7 +2247,7 @@ that offer bindings to some of the Frameworks.")
(define-public kded
(package
(name "kded")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2273,7 +2256,7 @@ that offer bindings to some of the Frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc"))))
+ "0kn9kzzji257mppd12jzwiibha8127ajxvng2ls765lylv9nad7q"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2297,7 +2280,7 @@ started on demand.")
(define-public kdesignerplugin
(package
(name "kdesignerplugin")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2306,7 +2289,7 @@ started on demand.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd"))))
+ "114035wil0p5z6h0li8wjzivsdxhqbih54kn4nvhn43b71xnzs3y"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -2348,7 +2331,7 @@ ini-style description files.")
(define-public kdesu
(package
(name "kdesu")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2357,7 +2340,7 @@ ini-style description files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k"))))
+ "1x2gjnmgpcaxvfav2pm92zfgxbn60awpvmn9ycs68rq47p6h9x0f"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kpty" ,kpty)))
@@ -2379,7 +2362,7 @@ with su and ssh respectively.")
(define-public kdewebkit
(package
(name "kdewebkit")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2388,7 +2371,7 @@ with su and ssh respectively.")
name "-" version ".tar.xz"))
(sha256
(base32
- "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n"))))
+ "1mnbdsiih94hlwwff9fs9gnzl3y7ayf1pskmz1rajgjmqd6rm7mm"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2411,7 +2394,7 @@ engine WebKit via QtWebKit.")
(define-public kemoticons
(package
(name "kemoticons")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2420,7 +2403,7 @@ engine WebKit via QtWebKit.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn"))))
+ "03vx22f9mjd10qm61f6ihr283w2sarrhg0rssxp7g7wahvshcvmh"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kservice" ,kservice)))
@@ -2451,7 +2434,7 @@ emoticons coming from different providers.")
(define-public kglobalaccel
(package
(name "kglobalaccel")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2460,7 +2443,7 @@ emoticons coming from different providers.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl"))))
+ "1c6dxp6jvbw8l74n1mv0v62yr34b9447szhvd61y4sxmmfjimhz4"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -2495,7 +2478,7 @@ window does not need focus for them to be activated.")
(define-public kiconthemes
(package
(name "kiconthemes")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2504,7 +2487,7 @@ window does not need focus for them to be activated.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m"))))
+ "1rgbfklb7xxg7z2zyrsmaxf883ixgfbkqilps3npwk3xac2f66rw"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -2542,7 +2525,7 @@ in applications using the KDE Frameworks.")
(define-public kinit
(package
(name "kinit")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2551,7 +2534,7 @@ in applications using the KDE Frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95"))
+ "11xwiny5sfqbdls249vnq6ssp5pzw1w9wg4ql9nkwwygl4ml8b9y"))
;; Use the store paths for other packages and dynamically loaded
;; libs
(patches (search-patches "kinit-kdeinit-extra_libs.patch"
@@ -2610,7 +2593,7 @@ makes starting KDE applications faster and reduces memory consumption.")
(define-public kio
(package
(name "kio")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2619,7 +2602,7 @@ makes starting KDE applications faster and reduces memory consumption.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k"))
+ "1k3cn7hvp5z9nirss29v164hahrlvlqivxlk64c8w9ynjx699ira"))
(patches (search-patches "kio-search-smbd-on-PATH.patch"))))
(build-system cmake-build-system)
(propagated-inputs
@@ -2642,6 +2625,7 @@ makes starting KDE applications faster and reduces memory consumption.")
("kauth" ,kauth)
("kcodecs" ,kcodecs)
("kconfigwidgets" ,kconfigwidgets)
+ ("kcrash" ,kcrash)
("kdbusaddons" ,kdbusaddons)
("kdoctools" ,kdoctools)
("kiconthemes" ,kiconthemes)
@@ -2702,7 +2686,7 @@ KIO enabled infrastructure.")
(define-public knewstuff
(package
(name "knewstuff")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2711,7 +2695,7 @@ KIO enabled infrastructure.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk"))))
+ "0a2d9wrhjsjl0klsrn501sp9681v7qmq6hmalw061arjv165dzw2"))))
(build-system cmake-build-system)
(propagated-inputs
`(("attica" ,attica)
@@ -2758,7 +2742,7 @@ specification.")
(define-public knotifyconfig
(package
(name "knotifyconfig")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2767,7 +2751,7 @@ specification.")
name "-" version ".tar.xz"))
(sha256
(base32
- "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa"))))
+ "01hxj6s2sq5k5j6j1y4c5gxyl1886j7ghh0hdc95b7n4gdjwwbci"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2800,7 +2784,7 @@ notifications which can be embedded in your application.")
(define-public kparts
(package
(name "kparts")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2809,7 +2793,7 @@ notifications which can be embedded in your application.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k"))))
+ "0gqkgnvkdai8hbg1n32jq4a3yzlkarmw8a7hxlfr0ykgysanjh65"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kio" ,kio)
@@ -2817,8 +2801,7 @@ notifications which can be embedded in your application.")
("kxmlgui" ,kxmlgui)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
- ("shared-mime-info" ,shared-mime-info)
- ))
+ ("shared-mime-info" ,shared-mime-info)))
(inputs
`(("kauth" ,kauth)
("kbookmarks" ,kbookmarks)
@@ -2853,7 +2836,7 @@ widgets with a user-interface defined in terms of actions.")
(define-public kpeople
(package
(name "kpeople")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2862,7 +2845,7 @@ widgets with a user-interface defined in terms of actions.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv"))))
+ "0vbgi4l14g4f0klbxqbkjcag6yi0ghhpxn5nik5sssmcx8qyk885"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2896,7 +2879,7 @@ to easily extend the contacts collection.")
(define-public krunner
(package
(name "krunner")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2905,7 +2888,7 @@ to easily extend the contacts collection.")
name "-" version ".tar.xz"))
(sha256
(base32
- "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19"))))
+ "0yw2jh9dailhcwkkjl2qggg5k90bwbfsn88a3hzwyj2ng2haypis"))))
(build-system cmake-build-system)
(propagated-inputs
`(("plasma-framework" ,plasma-framework)))
@@ -2966,7 +2949,7 @@ typed.")
(define-public kservice
(package
(name "kservice")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2975,7 +2958,7 @@ typed.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z"))))
+ "0k8xksmw2ai7m0js7l98rv5v6ykifmnqiyy2yc1xhgn40lf1r89j"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfig" ,kconfig)
@@ -3025,7 +3008,7 @@ types or handled by application specific code.")
(define-public ktexteditor
(package
(name "ktexteditor")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3034,7 +3017,7 @@ types or handled by application specific code.")
name "-" version ".tar.xz"))
(sha256
(base32
- "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj"))))
+ "0b5zqhm5aw7jj7dj600xa674ik11gwyzamhyz5962xhvsg5pyjwx"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kparts" ,kparts)))
@@ -3105,7 +3088,7 @@ library.")
(define-public ktextwidgets
(package
(name "ktextwidgets")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3114,7 +3097,7 @@ library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1"))))
+ "1ymqmb5z4flzrns3wdjagxbzbpighbincwbhy29a0mqg4zcm82xk"))))
(build-system cmake-build-system)
(propagated-inputs
`(("ki18n" ,ki18n)
@@ -3152,7 +3135,7 @@ It supports rich text as well as plain text.")
(define-public kwallet
(package
(name "kwallet")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3161,7 +3144,7 @@ It supports rich text as well as plain text.")
name "-" version ".tar.xz"))
(sha256
(base32
- "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z"))))
+ "1dp072h5r6yd81i69759pj8klfsikrg25za44sry2kh6fxvwmngm"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -3194,7 +3177,7 @@ the passwords on KDE work spaces.")
(define-public kxmlgui
(package
(name "kxmlgui")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3203,7 +3186,7 @@ the passwords on KDE work spaces.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa"))))
+ "0ph67zarf1sccvp7882brrihv4dsmxq0nggan0rnk54qg0zdhgcn"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfig" ,kconfig)
@@ -3246,7 +3229,7 @@ descriptions for integrating actions from plugins.")
(define-public kxmlrpcclient
(package
(name "kxmlrpcclient")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3255,7 +3238,7 @@ descriptions for integrating actions from plugins.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06"))))
+ "1573wnv2fbjjzgx3f1qm7y8wlj22bz45mny0rxci90i76nnh4538"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kio" ,kio)))
@@ -3289,7 +3272,7 @@ setUrl, setUserAgent and call.")
(define-public plasma-framework
(package
(name "plasma-framework")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3298,7 +3281,7 @@ setUrl, setUserAgent and call.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv"))))
+ "1pvxxw52s03i11p5byd2sh8sbvlk6h8q6briq9d4qvjy6c0pmbq4"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kpackage" ,kpackage)
@@ -3386,7 +3369,7 @@ script engines.")
(define-public kde-frameworkintegration
(package
(name "kde-frameworkintegration")
- (version "5.49.0")
+ (version "5.55.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3395,7 +3378,7 @@ script engines.")
"frameworkintegration-" version ".tar.xz"))
(sha256
(base32
- "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx"))))
+ "0pfpk268x06pjwciv4jr5v259kjck0sf4xzsgn29ifkmsk74wwmi"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -3443,7 +3426,7 @@ workspace.")
(define-public kdelibs4support
(package
(name "kdelibs4support")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -3452,7 +3435,7 @@ workspace.")
(version-major+minor version) "/portingAids/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi"))))
+ (base32 "1l1gjv06yp9jdiapiypwscbb6y0rfgrnw9rdsl7kkxh9ps8b8j39"))))
(build-system cmake-build-system)
(native-inputs
`(("dbus" ,dbus)
@@ -3559,7 +3542,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
(define-public khtml
(package
(name "khtml")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -3568,7 +3551,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
(version-major+minor version) "/portingAids/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64"))))
+ (base32 "0wh9z5xm0gaf1c2s7cq7763jfyv83d58x80nwsvb0ayd6y8id1bq"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -3618,7 +3601,7 @@ technology and using KJS for JavaScript support.")
(define-public kjs
(package
(name "kjs")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -3627,7 +3610,7 @@ technology and using KJS for JavaScript support.")
(version-major+minor version) "/portingAids/"
name "-" version ".tar.xz"))
(sha256
- (base32 "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0"))))
+ (base32 "0c1wyxsgn70jvw7zcjjpw12w9sg9xxvyslgnqlnnyh8sx7rrp70c"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -3651,7 +3634,7 @@ support.")
(define-public kjsembed
(package
(name "kjsembed")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -3660,7 +3643,7 @@ support.")
(version-major+minor version) "/portingAids/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m"))))
+ (base32 "0dh9012y9bqj48jp50lrsmd28bbvf4jd93l34vfzmza252yvyw3l"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -3680,7 +3663,7 @@ QObjects, so you can script your applications.")
(define-public kmediaplayer
(package
(name "kmediaplayer")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -3689,7 +3672,7 @@ QObjects, so you can script your applications.")
(version-major+minor version) "/portingAids/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx"))))
+ (base32 "0gpfrhgk2l63lyz0bz93cg7mc5g7mjvrkfvpyndmi1v7vhndp5zq"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -3726,7 +3709,7 @@ KParts instead.")
(define-public kross
(package
(name "kross")
- (version "5.49.0")
+ (version "5.55.0")
(source
(origin
(method url-fetch)
@@ -3735,7 +3718,7 @@ KParts instead.")
(version-major+minor version) "/portingAids/"
name "-" version ".tar.xz"))
(sha256
- (base32 "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz"))))
+ (base32 "0p3q36gka6m62nryc3l11d30mlhiqjpghvfcyq6wikiqlv2kqvjs"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
new file mode 100644
index 0000000000..d2aa90b26d
--- /dev/null
+++ b/gnu/packages/kde-plasma.scm
@@ -0,0 +1,228 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages kde-plasma)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build-system cmake)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages kde-frameworks)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages xorg))
+
+(define-public kdecoration
+ (package
+ (name "kdecoration")
+ (version "5.15.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/kdecoration-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1pcyw6rrz0q7i2jnfvmjz2pixiw2aay19q3pxa1g3qvqydh3id5q"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (inputs
+ `(("ki18n" ,ki18n)
+ ("qtbase" ,qtbase)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'check-setup
+ (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t)))))
+ (home-page "https://cgit.kde.org/kdecoration.git")
+ (synopsis "Plugin based library to create window decorations")
+ (description "KDecoration is a library to create window decorations.
+These window decorations can be used by for example an X11 based window
+manager which re-parents a Client window to a window decoration frame.")
+ (license license:lgpl3+)))
+
+(define-public kscreenlocker
+ (package
+ (name "kscreenlocker")
+ (version "5.15.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/kscreenlocker-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1hgj2mzbbiqn52j3px2mzz6xzzpzr78q3bcai8ddc4gcl1xgs6yi"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'check-setup
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (system (string-append (assoc-ref inputs "xorg-server")
+ "/bin/Xvfb :1 -screen 0 640x480x24 &"))
+ (setenv "DISPLAY" ":1")
+ #t))
+ (delete 'check)
+ ;; Tests use the installed library and require a DBus session.
+ (add-after 'install 'check
+ (lambda _
+ (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
+ (invoke "dbus-launch" "ctest" "."))))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)
+
+ ;; For tests.
+ ("dbus" ,dbus)
+ ("xorg-server" ,xorg-server)))
+ (inputs
+ `(("kcmutils" ,kcmutils)
+ ("kcrash" ,kcrash)
+ ("kdeclarative" ,kdeclarative)
+ ("kglobalaccel" ,kglobalaccel)
+ ("ki18n" ,ki18n)
+ ("kidletime" ,kidletime)
+ ("knotifications" ,knotifications)
+ ("ktextwidgets" ,ktextwidgets)
+ ("kwayland" ,kwayland)
+ ("kwindowsystem" ,kwindowsystem)
+ ("kxmlgui" ,kxmlgui)
+ ("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package
+ ("libxcursor" ,libxcursor) ;missing in CMakeList.txt
+ ("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices
+ ("linux-pam" ,linux-pam)
+ ("logind" ,elogind) ;optional loginctl support
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtx11extras" ,qtx11extras)
+ ("solid" ,solid)
+ ("wayland" ,wayland)
+ ("xcb-util-keysyms" ,xcb-util-keysyms)))
+ (home-page "https://cgit.kde.org/kscreenlocker.git")
+ (synopsis "Screen locking library")
+ (description
+ "@code{kscreenlocker} is a library for creating secure lock screens.")
+ (license license:gpl2+)))
+
+(define-public libkscreen
+ (package
+ (name "libkscreen")
+ (version "5.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1clw8966fmwih1fsjasvpgvfq7w728hlabl3i0zjz53r87hdw3mb"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ;; For testing.
+ ("dbus" ,dbus)))
+ (inputs
+ `(("kwayland" ,kwayland)
+ ("libxrandr" ,libxrandr)
+ ("qtbase" ,qtbase)
+ ("qtx11extras" ,qtx11extras)))
+ (arguments
+ '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; For the missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ ;; Run the tests offscreen.
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ #t)))))
+ (home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
+ (synopsis "KDE's screen management software")
+ (description "KScreen is the new screen management software for KDE Plasma
+Workspaces which tries to be as magic and automatic as possible for users with
+basic needs and easy to configure for those who want special setups.")
+ (license license:gpl2+)))
+
+(define-public libksysguard
+ (package
+ (name "libksysguard")
+ (version "5.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde//stable/plasma/" version
+ "/libksysguard-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1aqkzbng2qq09rpb21r6drnn866b9y8yba3klhvhi0q5vg3p605d"))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("kconfigwidgets" ,kconfigwidgets)
+ ("kiconthemes" ,kiconthemes)
+ ("kwindowsystem" ,kwindowsystem)
+ ("ki18n" ,ki18n)
+ ("kauth" ,kauth)
+ ("kcompletion" ,kcompletion)
+ ("kconfig" ,kconfig)
+ ("kcoreaddons" ,kcoreaddons)
+ ("kglobalaccel" ,kglobalaccel)
+ ("kio" ,kio)
+ ("kwidgetsaddons" ,kwidgetsaddons)
+ ("kservice" ,kservice)
+ ("qtbase" ,qtbase)
+ ("qtscript" ,qtscript)
+ ("qtwebkit" ,qtwebkit)
+ ("qtx11extras" ,qtx11extras)
+ ("plasma" ,plasma-framework)
+ ("zlib" ,zlib)))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ `(,(string-append "-DKDE_INSTALL_DATADIR="
+ (assoc-ref %outputs "out") "/share"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'patch-cmakelists
+ (lambda _
+ ;; TODO: Verify: This should no longer be necessary, since
+ ;; KF5AuthConfig.cmake.in contains this already.
+ (substitute* "processcore/CMakeLists.txt"
+ (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR"))))
+ (add-before 'check 'check-setup
+ (lambda _
+ ;; make Qt render "offscreen", required for tests
+ (setenv "QT_QPA_PLATFORM" "offscreen")))
+ (replace 'check
+ (lambda _
+ ;; TODO: Fix this failing test-case
+ (invoke "ctest" "-E" "processtest"))))))
+ (home-page "https://userbase.kde.org/KSysGuard")
+ (synopsis "Network enabled task and system monitoring")
+ (description "KSysGuard can obtain information on system load and
+manage running processes. It obtains this information by interacting
+with a ksysguardd daemon, which may also run on a remote system.")
+ (license license:gpl3+)))
+
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 5946ba0b52..23078d00a0 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -36,11 +36,11 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
- #:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages graphics)
#:use-module (gnu packages image)
#:use-module (gnu packages kde-frameworks)
+ #:use-module (gnu packages kde-plasma)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths)
#:use-module (gnu packages pdf)
@@ -480,105 +480,6 @@ used in KDE development tools Kompare and KDevelop.")
;; source archive
(license (list license:gpl2+ license:lgpl2.0+ license:bsd-3))))
-(define-public libkscreen
- (package
- (name "libkscreen")
- (version "5.13.5")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/plasma/" version "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"))))
- (build-system cmake-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ;; For testing.
- ("dbus" ,dbus)))
- (inputs
- `(("kwayland" ,kwayland)
- ("libxrandr" ,libxrandr)
- ("qtbase" ,qtbase)
- ("qtx11extras" ,qtx11extras)))
- (arguments
- '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11
- #:phases
- (modify-phases %standard-phases
- (add-before 'check 'pre-check
- (lambda _
- ;; For the missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- ;; Run the tests offscreen.
- (setenv "QT_QPA_PLATFORM" "offscreen")
- #t)))))
- (home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
- (synopsis "KDE's screen management software")
- (description "KScreen is the new screen management software for KDE Plasma
-Workspaces which tries to be as magic and automatic as possible for users with
-basic needs and easy to configure for those who want special setups.")
- (license license:gpl2+)))
-
-(define-public libksysguard
- (package
- (name "libksysguard")
- (version "5.13.4")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde//stable/plasma/" version
- "/libksysguard-" version ".tar.xz"))
- (sha256
- (base32
- "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh"))))
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("kconfigwidgets" ,kconfigwidgets)
- ("kiconthemes" ,kiconthemes)
- ("kwindowsystem" ,kwindowsystem)
- ("ki18n" ,ki18n)
- ("kauth" ,kauth)
- ("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kcoreaddons" ,kcoreaddons)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kservice" ,kservice)
- ("qtbase" ,qtbase)
- ("qtscript" ,qtscript)
- ("qtwebkit" ,qtwebkit)
- ("qtx11extras" ,qtx11extras)
- ("plasma" ,plasma-framework)
- ("zlib" ,zlib)))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- `(,(string-append "-DKDE_INSTALL_DATADIR="
- (assoc-ref %outputs "out") "/share"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'patch-cmakelists
- (lambda _
- ;; TODO: Verify: This should no longer be necessary, since
- ;; KF5AuthConfig.cmake.in contains this already.
- (substitute* "processcore/CMakeLists.txt"
- (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR"))))
- (add-before 'check 'check-setup
- (lambda _
- ;; make Qt render "offscreen", required for tests
- (setenv "QT_QPA_PLATFORM" "offscreen")))
- (replace 'check
- (lambda _
- ;; TODO: Fix this failing test-case
- (invoke "ctest" "-E" "processtest"))))))
- (home-page "https://www.kde.org/info/plasma-5.13.4.php")
- (synopsis "Network enabled task and system monitoring")
- (description "KSysGuard can obtain information on system load and
-manage running processes. It obtains this information by interacting
-with a ksysguardd daemon, which may also run on a remote system.")
- (license license:gpl3+)))
-
(define-public qca
(package
(name "qca")
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 508ffaabca..776f9c970e 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
@@ -270,7 +270,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
(define-public kodi
(package
(name "kodi")
- (version "18.0rc3")
+ (version "18.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -279,7 +279,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
(file-name (git-file-name name version))
(sha256
(base32
- "0bwi4gwmwppjw6bf0zihyg42zwnd0imq0aw4xxsgnacqakhxzii0"))
+ "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"))
(patches (search-patches "kodi-skip-test-449.patch"))
(snippet
'(begin
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 3f7bb4f289..1df6b7b6df 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
-;;; Copyright © 2015 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
+;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@@ -157,13 +157,13 @@ conversions for values passed between the two languages.")
(define-public ruby-ffi
(package
(name "ruby-ffi")
- (version "1.9.23")
+ (version "1.10.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "ffi" version))
(sha256
(base32
- "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"))))
+ "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"))))
(build-system ruby-build-system)
;; FIXME: Before running tests the build system attempts to build libffi
;; from sources.
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 4e90d436ac..02ad11c6fb 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -936,7 +936,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice
(package
(name "libreoffice")
- (version "6.1.3.2")
+ (version "6.1.5.2")
(source
(origin
(method url-fetch)
@@ -946,7 +946,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32
- "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
+ "1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb"))
(patches
(append (list (origin
;; Support newer versions of Orcus and MDDS. These patches
@@ -972,37 +972,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(file-name "libreoffice-mdds.patch")
(sha256
(base32
- "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))
- ;; The Poppler API changed rapidly in the versions leading 0.72.
- ;; Thus, we need several patches from upstream, each adapting to
- ;; different Poppler changes since version 0.68.
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/LibreOffice/core/commit/"
- "1688a395d05125b83eac6cd5c43f0e3f2f66c491"
- ".patch"))
- (file-name "libreoffice-poppler-compat.patch")
- (sha256
- (base32
- "0ia5avmj772mrgs6m4qqf01hs8hzpy3nafidj7w7gqx2zz2s5ih9")))
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/LibreOffice/core/commit/"
- "5e8bdd9203dd642111c62a6668ee665a20d4ba19"
- ".patch"))
- (file-name "libreoffice-poppler-gbool.patch")
- (sha256
- (base32
- "19kc74h5vnk48l2vny8zmm2lkxpwc7g8n9d3wwpg99748dvbmikd")))
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/LibreOffice/core/commit/"
- "8ff41a26caf51544699863c89598d37d93dc1b21"
- ".patch"))
- (file-name "libreoffice-poppler-0.71.patch")
- (sha256
- (base32
- "1dsd0gynjf7d6412dd2sx70xa2s8kld7ibyjdkwg5w9hhi2zxw2f"))))
+ "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f"))))
(search-patches "libreoffice-boost.patch"
"libreoffice-icu.patch"
"libreoffice-glm.patch")))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e71c62900f..82fd0a326f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
@@ -404,8 +404,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
It has been modified to remove all non-free binary blobs.")
(license license:gpl2)))
-(define %linux-libre-version "4.20.7")
-(define %linux-libre-hash "05jbpg4ivcbr8xi5ki03f4n57hnhc52nfjk1ik8czag7f4ph9v0b")
+(define %linux-libre-version "4.20.10")
+(define %linux-libre-hash "0d386gb1s9ag80iqzms9gdsfzirq7nlkpkkx2d6ky01rv0g4vgqn")
(define %linux-libre-4.20-patches
(list %boot-logo-patch
@@ -418,8 +418,8 @@ It has been modified to remove all non-free binary blobs.")
#:patches %linux-libre-4.20-patches
#:configuration-file kernel-config))
-(define %linux-libre-4.19-version "4.19.20")
-(define %linux-libre-4.19-hash "1rs4jvp88n23n9a6f037sn498fzl1fn96zsjjmjngb8nmjr1y9vp")
+(define %linux-libre-4.19-version "4.19.23")
+(define %linux-libre-4.19-hash "0s207vqq2vcrgydjjwb5n2j7di0rjahnrbn3xv4xxlp5scjp59xq")
(define %linux-libre-4.19-patches
(list %boot-logo-patch
@@ -432,8 +432,8 @@ It has been modified to remove all non-free binary blobs.")
#:patches %linux-libre-4.19-patches
#:configuration-file kernel-config))
-(define %linux-libre-4.14-version "4.14.98")
-(define %linux-libre-4.14-hash "165wlqqpb16zhrwihsb75y153xyz8q5dbi14xim7jsnvwlbh5i79")
+(define %linux-libre-4.14-version "4.14.101")
+(define %linux-libre-4.14-hash "02j240x30zkhpazdimlfi0xq6zjdw6fidgdfrdnvfryvhf6j097j")
(define-public linux-libre-4.14
(make-linux-libre %linux-libre-4.14-version
@@ -442,8 +442,8 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config))
(define-public linux-libre-4.9
- (make-linux-libre "4.9.155"
- "0fyj8dqhpqi3jh6i58avyvmg4mp9bplnpiffpp3fdka4v85lx152"
+ (make-linux-libre "4.9.158"
+ "11v56dzp87wyxrymf2s1cmk7jr440z11m3yan73rnnnqlfq460ig"
'("x86_64-linux" "i686-linux")
#:configuration-file kernel-config))
@@ -1830,20 +1830,19 @@ file system is as easy as logging into the server with an SSH client.")
(define-public archivemount
(package
(name "archivemount")
- (version "0.8.9")
+ (version "0.8.12")
(source
(origin
(method url-fetch)
- (uri (string-append "http://www.cybernoia.de/software/archivemount/"
+ (uri (string-append "https://www.cybernoia.de/software/archivemount/"
"archivemount-" version ".tar.gz"))
(sha256
- (base32
- "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg"))))
+ (base32 "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"))))
(build-system gnu-build-system)
(inputs `(("fuse" ,fuse)
("libarchive" ,libarchive)))
(native-inputs `(("pkg-config" ,pkg-config)))
- (home-page "http://www.cybernoia.de/software/archivemount")
+ (home-page "https://www.cybernoia.de/software/archivemount.html")
(synopsis "Tool for mounting archive files with FUSE")
(description "archivemount is a FUSE-based file system for Unix variants,
including Linux. Its purpose is to mount archives (i.e. tar, tar.gz, etc.) to a
@@ -3022,7 +3021,7 @@ arrays when needed.")
(define-public multipath-tools
(package
(name "multipath-tools")
- (version "0.7.7")
+ (version "0.7.9")
(source (origin
(method url-fetch)
(uri (string-append "https://git.opensvc.com/?p=multipath-tools/"
@@ -3030,7 +3029,7 @@ arrays when needed.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1lirhjjv37jnf42r1ylrhi8kbzx9j9xnyfzvxpp6bzcp0fawigig"))
+ "1jhi6bhl4ih75rfmyyjxd35ghgch5ls1gw40cjxwy9d6bd41z6q1"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -3068,7 +3067,7 @@ arrays when needed.")
(("/usr/include/libudev.h")
(string-append udev "/include/libudev.h")))
#t)))
- (delete 'configure))))
+ (delete 'configure)))) ; no configure script
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
@@ -3093,7 +3092,7 @@ Linux Device Mapper multipathing driver:
@code{dm} multipath devices.
@item @command{kpartx} - Create device maps from partition tables.
@end enumerate")
- (license (list license:gpl2+ ; Main distribution.
+ (license (list license:gpl2+ ; main distribution
license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h
(define-public libaio
@@ -3690,7 +3689,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
(package
(name "rng-tools")
(home-page "https://github.com/nhorman/rng-tools")
- (version "6.6")
+ (version "6.7")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
@@ -3698,11 +3697,12 @@ The collection contains a set of bandwidth and latency benchmark such as:
(file-name (git-file-name name version))
(sha256
(base32
- "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"))))
+ "19f75m6mzg8h7b4snzg7d6ypvkz6nq32lrpi9ja95gqz4wsd18a5"))))
(build-system gnu-build-system)
(arguments
`(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB.
- #:configure-flags '("--without-nistbeacon")))
+ #:configure-flags '("--without-nistbeacon"
+ "--without-pkcs11")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 93dc1aaf80..5aad298399 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm