[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/63: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
36/63: Merge branch 'master' into staging |
|
Date: |
Tue, 26 May 2020 17:18:10 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86
Merge: 8ab211d b4f04e0
Author: Marius Bakke <address@hidden>
AuthorDate: Tue May 26 22:34:46 2020 +0200
Merge branch 'master' into staging
.dir-locals.el | 1 +
.gitignore | 2 +-
.mailmap | 1 +
configure.ac | 9 -
doc/build.scm | 37 +-
doc/guix.texi | 187 ++++++-
etc/gnu-store.mount.in | 14 +
etc/guix-install.sh | 17 +-
etc/{indent-code.el.in => indent-code.el} | 52 +-
etc/news.scm | 57 ++-
gnu/bootloader/depthcharge.scm | 3 +-
gnu/bootloader/extlinux.scm | 3 +-
gnu/bootloader/grub.scm | 220 ++++----
gnu/build/file-systems.scm | 6 +-
gnu/build/linux-boot.scm | 63 ++-
gnu/local.mk | 8 +-
gnu/packages/admin.scm | 37 +-
gnu/packages/antivirus.scm | 9 +-
gnu/packages/astronomy.scm | 10 +-
gnu/packages/audio.scm | 10 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bioinformatics.scm | 29 +-
gnu/packages/boost.scm | 41 +-
gnu/packages/busybox.scm | 6 +-
gnu/packages/check.scm | 5 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/cups.scm | 2 +-
gnu/packages/databases.scm | 26 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/docker.scm | 4 +-
gnu/packages/efi.scm | 8 +-
gnu/packages/elf.scm | 13 +-
gnu/packages/emacs-xyz.scm | 153 ++++--
gnu/packages/embedded.scm | 7 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/engineering.scm | 135 ++++-
gnu/packages/finance.scm | 68 ++-
gnu/packages/fonts.scm | 33 ++
gnu/packages/fontutils.scm | 14 +
gnu/packages/fpga.scm | 4 +-
gnu/packages/game-development.scm | 71 +--
gnu/packages/games.scm | 104 +++-
gnu/packages/geo.scm | 3 +-
gnu/packages/gl.scm | 7 +-
gnu/packages/gnome-xyz.scm | 26 +-
gnu/packages/gnome.scm | 52 +-
gnu/packages/gnustep.scm | 8 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile-xyz.scm | 134 ++---
gnu/packages/jami.scm | 256 +++++++++-
gnu/packages/java-compression.scm | 4 +-
gnu/packages/java.scm | 206 +++++---
gnu/packages/julia.scm | 2 +-
gnu/packages/kde.scm | 35 +-
gnu/packages/kerberos.scm | 6 +-
gnu/packages/linux.scm | 69 ++-
gnu/packages/lisp-xyz.scm | 353 +++++++------
gnu/packages/mail.scm | 35 +-
gnu/packages/maths.scm | 13 +-
gnu/packages/messaging.scm | 14 +-
gnu/packages/mpd.scm | 6 +-
gnu/packages/music.scm | 20 +-
gnu/packages/networking.scm | 65 ++-
gnu/packages/ocaml.scm | 61 ++-
gnu/packages/openkinect.scm | 141 ++++++
gnu/packages/pantheon.scm | 109 ++++
.../http-parser-fix-assertion-on-armhf.patch | 39 ++
gnu/packages/patches/kpmcore-fix-tests.patch | 30 --
.../patches/kpmcore-remove-broken-test.patch | 139 -----
.../patches/multipath-tools-sans-systemd.patch | 83 +++
gnu/packages/patches/openjdk-14-builtins.patch | 11 +
.../patches/python-shouldbe-0.1.2-cpy3.8.patch | 82 +++
.../soundconverter-remove-gconf-dependency.patch | 29 --
gnu/packages/perl-check.scm | 35 ++
gnu/packages/perl.scm | 28 ++
gnu/packages/python-web.scm | 302 ++++++++++-
gnu/packages/python-xyz.scm | 137 ++++-
gnu/packages/radio.scm | 4 +-
gnu/packages/rails.scm | 6 -
gnu/packages/ruby.scm | 559 +++++++++++++++++++--
gnu/packages/scanner.scm | 8 +-
gnu/packages/scheme.scm | 6 +-
gnu/packages/shells.scm | 27 +-
gnu/packages/shellutils.scm | 6 +-
gnu/packages/suckless.scm | 278 ++++++----
gnu/packages/syndication.scm | 27 +
gnu/packages/telephony.scm | 3 +-
gnu/packages/textutils.scm | 37 +-
gnu/packages/tor.scm | 16 +-
gnu/packages/valgrind.scm | 6 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 17 +-
gnu/packages/virtualization.scm | 62 +--
gnu/packages/vpn.scm | 8 +-
gnu/packages/web-browsers.scm | 47 +-
gnu/packages/web.scm | 175 +++++--
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 10 +-
gnu/packages/xdisorg.scm | 29 ++
gnu/packages/xfce.scm | 12 +-
gnu/packages/xml.scm | 12 +-
gnu/packages/xorg.scm | 12 +-
gnu/services/shepherd.scm | 6 +-
gnu/system.scm | 9 +-
gnu/system/file-systems.scm | 86 ++++
gnu/system/linux-initrd.scm | 29 +-
gnu/system/vm.scm | 15 +-
gnu/tests/install.scm | 94 ++++
guix/build-system/asdf.scm | 5 +-
guix/build-system/guile.scm | 6 +
guix/build/asdf-build-system.scm | 54 +-
guix/build/minify-build-system.scm | 9 +-
guix/build/syscalls.scm | 113 ++++-
guix/channels.scm | 24 +-
guix/gexp.scm | 184 +++++--
guix/licenses.scm | 4 +-
guix/quirks.scm | 37 +-
guix/scripts/describe.scm | 17 +-
guix/scripts/publish.scm | 1 +
guix/utils.scm | 21 +-
nix/local.mk | 13 +-
tests/file-systems.scm | 64 +++
tests/gexp.scm | 54 ++
125 files changed, 4679 insertions(+), 1589 deletions(-)
diff --cc gnu/packages/cups.scm
index 0487dc5,0250f16..9381cb5
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@@ -243,8 -250,21 +243,8 @@@ device-specific programs to convert an
;; CUPS is Apache 2.0 with exceptions, see the NOTICE file.
(license license:asl2.0)))
-(define-public cups-minimal-2.3.3
- (package
- (inherit cups-minimal)
- (version "2.3.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/apple/cups/releases/download/v";
- version "/cups-" version "-source.tar.gz"))
- (sha256
- (base32
- "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"))))))
-
(define-public cups
- (package (inherit cups-minimal)
+ (package/inherit cups-minimal
(name "cups")
(arguments
`(;; Three tests fail:
diff --cc gnu/packages/linux.scm
index b45b372,f6acc08..a5b9014
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -4241,9 -4254,12 +4263,12 @@@ arrays when needed."
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
- ("valgrind" ,valgrind)))
+ ("valgrind" ,valgrind)
+
+ ;; For tests.
+ ("cmocka" ,cmocka)))
(inputs
- `(("json-c" ,json-c)
+ `(("json-c" ,json-c-0.13)
("libaio" ,libaio)
("liburcu" ,liburcu)
("lvm2" ,lvm2)
- 10/63: gnu: libva: Update to 2.7.1., (continued)
- 10/63: gnu: libva: Update to 2.7.1., guix-commits, 2020/05/26
- 19/63: gnu: python-certifi: Update to 2020.4.5.1., guix-commits, 2020/05/26
- 17/63: gnu: python-pycairo: Update to 1.19.1., guix-commits, 2020/05/26
- 24/63: gnu: python-cython: Update to 0.29.17., guix-commits, 2020/05/26
- 25/63: gnu: python-pycparser: Update to 2.20., guix-commits, 2020/05/26
- 29/63: gnu: pcre2: Update to 10.35., guix-commits, 2020/05/26
- 37/63: gnu: cogl: Fix build with Mesa 20., guix-commits, 2020/05/26
- 38/63: gnu: gstreamer: Increase test timeouts., guix-commits, 2020/05/26
- 43/63: gnu: glslang: Build shared libraries., guix-commits, 2020/05/26
- 39/63: gnu: spirv-headers: Update to 1.5.3., guix-commits, 2020/05/26
- 36/63: Merge branch 'master' into staging,
guix-commits <=
- 15/63: gnu: CUPS: Update to 2.3.3., guix-commits, 2020/05/26
- 18/63: gnu: python-cffi: Update to 1.14.0., guix-commits, 2020/05/26
- 47/63: gnu: vulkan-tools: Update to 1.2.140., guix-commits, 2020/05/26
- 51/63: gnu: Mesa: Remove unused input., guix-commits, 2020/05/26
- 22/63: gnu: python-urllib3: Update to 1.25.9., guix-commits, 2020/05/26
- 31/63: gnu: python-jinja2: Update to 2.11.2., guix-commits, 2020/05/26
- 41/63: gnu: spirv-tools: Do not build static libraries., guix-commits, 2020/05/26
- 52/63: gnu: Mesa: Remove obsolete phase., guix-commits, 2020/05/26
- 30/63: gnu: json-c: Update to 0.14., guix-commits, 2020/05/26
- 54/63: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/26