[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Thu, 21 Mar 2019 18:27:47 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 081850816f98c7f5d815ac7251c69bf2ada50cc0
Merge: 792d526 93f178b
Author: Marius Bakke <address@hidden>
Date: Thu Mar 21 23:18:54 2019 +0100
Merge branch 'master' into staging
.mailmap | 28 +-
Makefile.am | 3 +-
doc/guix.de.texi | 2 +-
doc/guix.fr.texi | 2 +-
doc/guix.texi | 626 ++++++++++++++-
etc/completion/fish/guix.fish | 2 +-
gnu/bootloader/extlinux.scm | 8 +-
gnu/bootloader/grub.scm | 16 +-
gnu/build/bootloader.scm | 63 +-
gnu/local.mk | 11 +-
gnu/packages/accessibility.scm | 2 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/algebra.scm | 38 +-
gnu/packages/animation.scm | 6 +-
gnu/packages/arcan.scm | 105 +++
gnu/packages/audio.scm | 19 +-
gnu/packages/autotools.scm | 2 +-
gnu/packages/aux-files/run-in-namespace.c | 47 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 42 +-
gnu/packages/bioinformatics.scm | 437 +++++++++-
gnu/packages/cdrom.scm | 2 +-
gnu/packages/check.scm | 24 +-
gnu/packages/cinnamon.scm | 2 +-
gnu/packages/compression.scm | 20 +-
gnu/packages/coq.scm | 9 +-
gnu/packages/cran.scm | 316 +++++---
gnu/packages/crypto.scm | 2 +-
gnu/packages/cups.scm | 40 +-
gnu/packages/curl.scm | 26 +-
gnu/packages/databases.scm | 28 +-
gnu/packages/debug.scm | 29 +-
gnu/packages/django.scm | 11 +-
gnu/packages/dns.scm | 12 +-
gnu/packages/docker.scm | 18 +-
gnu/packages/easyrpg.scm | 9 +-
gnu/packages/education.scm | 68 +-
gnu/packages/electronics.scm | 6 +-
gnu/packages/elixir.scm | 9 +-
gnu/packages/emacs-xyz.scm | 816 +++++++++++++------
gnu/packages/emacs.scm | 2 +-
gnu/packages/engineering.scm | 36 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/fonts.scm | 42 +-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/forth.scm | 2 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/fvwm.scm | 2 +-
gnu/packages/game-development.scm | 20 +-
gnu/packages/games.scm | 207 ++++-
gnu/packages/gd.scm | 12 +-
gnu/packages/genimage.scm | 4 +-
gnu/packages/geo.scm | 29 +-
gnu/packages/gl.scm | 2 +-
gnu/packages/glib.scm | 6 +-
gnu/packages/gnome.scm | 85 +-
gnu/packages/gnunet.scm | 8 +-
gnu/packages/gnupg.scm | 6 +-
gnu/packages/gnuzilla.scm | 16 +-
gnu/packages/gobby.scm | 8 +-
gnu/packages/golang.scm | 884 ++++++++++-----------
gnu/packages/graphics.scm | 93 ++-
gnu/packages/gstreamer.scm | 1 +
gnu/packages/gtk.scm | 10 +-
gnu/packages/guile-wm.scm | 71 +-
gnu/packages/guile-xyz.scm | 2 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-crypto.scm | 21 +-
gnu/packages/haskell.scm | 7 +-
gnu/packages/hyperledger.scm | 8 +-
gnu/packages/image-processing.scm | 66 +-
gnu/packages/image-viewers.scm | 15 +-
gnu/packages/image.scm | 2 +-
gnu/packages/ipfs.scm | 21 +-
gnu/packages/irc.scm | 2 +-
gnu/packages/language.scm | 2 +-
gnu/packages/libcanberra.scm | 2 +-
gnu/packages/libevent.scm | 4 +-
gnu/packages/libreoffice.scm | 34 +-
gnu/packages/libusb.scm | 20 +-
gnu/packages/linux.scm | 93 ++-
gnu/packages/lisp.scm | 2 +-
gnu/packages/llvm.scm | 2 +-
gnu/packages/lolcode.scm | 2 +-
gnu/packages/lua.scm | 8 +-
gnu/packages/lxde.scm | 21 +-
gnu/packages/lxqt.scm | 313 +++++---
gnu/packages/machine-learning.scm | 224 +++++-
gnu/packages/mail.scm | 148 ++--
gnu/packages/markup.scm | 2 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/maths.scm | 27 +-
gnu/packages/mc.scm | 2 +-
gnu/packages/messaging.scm | 32 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 46 ++
gnu/packages/music.scm | 32 +-
gnu/packages/ncurses.scm | 2 +-
gnu/packages/networking.scm | 108 +--
gnu/packages/nickle.scm | 2 +-
gnu/packages/ntp.scm | 7 +-
gnu/packages/ocaml.scm | 16 +-
gnu/packages/openbox.scm | 2 +-
gnu/packages/openldap.scm | 40 +-
gnu/packages/password-utils.scm | 22 +-
.../patches/blender-2.79-newer-ffmpeg.patch | 80 ++
.../patches/blender-2.79-python-3.7-fix.patch | 43 +
gnu/packages/patches/cracklib-CVE-2016-6318.patch | 95 ---
.../patches/cracklib-fix-buffer-overflow.patch | 39 -
gnu/packages/patches/elixir-path-length.patch | 15 +
.../patches/knot-include-system-lmdb-header.patch | 34 +
.../patches/libextractor-CVE-2018-20430.patch | 60 --
.../patches/libextractor-CVE-2018-20431.patch | 53 --
gnu/packages/patches/libgit2-oom-test.patch | 62 --
gnu/packages/patches/python-flint-includes.patch | 131 +++
gnu/packages/pdf.scm | 2 +-
gnu/packages/perl-check.scm | 69 +-
gnu/packages/perl.scm | 40 +-
gnu/packages/photo.scm | 23 +-
gnu/packages/pretty-print.scm | 12 +-
gnu/packages/protobuf.scm | 25 +
gnu/packages/python-check.scm | 48 ++
gnu/packages/python-compression.scm | 2 +-
gnu/packages/python-crypto.scm | 2 +-
gnu/packages/python-web.scm | 65 +-
gnu/packages/python-xyz.scm | 208 ++++-
gnu/packages/python.scm | 2 +-
gnu/packages/qt.scm | 6 +-
gnu/packages/rails.scm | 40 +-
gnu/packages/ruby.scm | 14 +-
gnu/packages/rust.scm | 10 +-
gnu/packages/samba.scm | 7 +-
gnu/packages/scanner.scm | 12 +-
gnu/packages/scheme.scm | 2 +-
gnu/packages/serialization.scm | 2 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/shellutils.scm | 6 +-
gnu/packages/ssh.scm | 10 +-
gnu/packages/statistics.scm | 84 +-
gnu/packages/storage.scm | 15 +-
gnu/packages/suckless.scm | 17 +-
gnu/packages/syncthing.scm | 655 ++++++++-------
gnu/packages/syndication.scm | 51 +-
gnu/packages/tbb.scm | 17 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/terminals.scm | 1 -
gnu/packages/terraform.scm | 6 +-
gnu/packages/text-editors.scm | 66 +-
gnu/packages/textutils.scm | 24 +-
gnu/packages/time.scm | 2 +-
gnu/packages/tls.scm | 2 +-
gnu/packages/tor.scm | 2 +-
gnu/packages/uml.scm | 4 +-
gnu/packages/version-control.scm | 9 +-
gnu/packages/video.scm | 123 ++-
gnu/packages/vim.scm | 56 +-
gnu/packages/virtualization.scm | 1 +
gnu/packages/web.scm | 109 ++-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 36 +-
gnu/packages/xdisorg.scm | 9 +-
gnu/packages/xfce.scm | 154 ++--
gnu/packages/xml.scm | 26 +-
gnu/packages/xorg.scm | 72 +-
gnu/services/audio.scm | 9 +
gnu/services/authentication.scm | 511 +++++++++++-
gnu/services/certbot.scm | 2 +-
gnu/services/desktop.scm | 48 +-
gnu/services/version-control.scm | 2 +-
gnu/services/web.scm | 2 +-
gnu/system/vm.scm | 5 +-
gnu/tests/ldap.scm | 160 ++++
guix/build-system/glib-or-gtk.scm | 9 +-
guix/build-system/go.scm | 2 +
guix/build-system/meson.scm | 30 +-
guix/build/go-build-system.scm | 139 ++--
guix/describe.scm | 25 +-
guix/download.scm | 6 +-
guix/import/hackage.scm | 2 +-
guix/import/launchpad.scm | 124 +++
guix/licenses.scm | 2 +-
guix/packages.scm | 38 +
guix/scripts.scm | 50 +-
guix/scripts/build.scm | 146 ++--
guix/scripts/describe.scm | 6 +-
guix/scripts/pack.scm | 76 +-
guix/scripts/package.scm | 9 +-
guix/scripts/system.scm | 13 +-
guix/tests.scm | 15 +
po/guix/POTFILES.in | 2 +
tests/build-utils.scm | 52 +-
tests/guix-pack-relocatable.sh | 21 +-
tests/packages.scm | 51 ++
tests/scripts-build.scm | 109 ++-
tests/scripts.scm | 15 +-
197 files changed, 7328 insertions(+), 2970 deletions(-)
diff --cc gnu/packages/gnome.scm
index c4521ce,060379a..38edce3
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -5762,63 -5689,65 +5763,80 @@@ properties, screen resolution, and othe
"/logo/Guix-horizontal-white.svg")
"data/theme/guix-logo.svg")
#t))))
- (build-system glib-or-gtk-build-system)
+ (build-system meson-build-system)
(arguments
- '(#:glib-or-gtk? #t
- `(#:disallowed-references ((,glib "bin")
++ `(#:glib-or-gtk? #t
++ #:disallowed-references ((,glib "bin")
+ ,inkscape ,libxslt
+ ,ruby-sass)
+ #:configure-flags
+ (list "-Dsystemd=false"
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib/gnome-shell"))
+
- #:modules ((guix build glib-or-gtk-build-system)
++ #:modules ((guix build meson-build-system)
+ (guix build utils)
+ (srfi srfi-1))
+
#:phases
(modify-phases %standard-phases
- (add-before 'build 'rebuild-css
- (lambda _
- ;; Rebuild the CSS files from the .scss files that our patch
- ;; modifies.
- (invoke "make" "-C" "data"
- "theme/gnome-shell.css"
- "theme/gnome-shell-high-contrast.css")))
- (add-before 'build 'convert-logo-to-png
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Convert the logo from SVG to PNG.
- (invoke "inkscape" "--export-png=data/theme/guix-logo.png"
- "data/theme/guix-logo.svg")))
- (replace 'install
+ (add-after 'unpack 'fix-keysdir
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(keysdir (string-append
out "/share/gnome-control-center/keybindings")))
- (zero? (system* "make"
- (string-append "keysdir=" keysdir)
- "install")))))
- (add-after
- 'install 'wrap-programs
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
- (wrap-program (string-append out "/bin/gnome-shell")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
- (for-each
- (lambda (prog)
- (wrap-program (string-append out "/bin/" prog)
- `("PYTHONPATH" ":" prefix (,python-path))
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
- '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))
- #t)))
+ (substitute* "meson.build"
+ (("keysdir =.*")
+ (string-append "keysdir = '" keysdir "'\n")))
+ #t)))
+ (add-before 'configure 'convert-logo-to-png
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Convert the logo from SVG to PNG.
+ (invoke "inkscape" "--export-png=data/theme/guix-logo.png"
+ "data/theme/guix-logo.svg")))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Tests require a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ #t))
+ (add-after 'install 'wrap-programs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (python-path (getenv "PYTHONPATH")))
+ (wrap-program (string-append out "/bin/gnome-shell")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+ ;; FIXME: gnome-shell loads these libraries with unqualified
+ ;; names only, so they need to be on LD_LIBRARY_PATH. The
+ ;; alternative might be to patch gnome-shell.
+ `("LD_LIBRARY_PATH" ":" prefix
+ ,(map (lambda (pkg)
+ (string-append (assoc-ref inputs pkg) "/lib"))
+ '("gnome-bluetooth" "librsvg" "libgweather"))))
+ (for-each
+ (lambda (prog)
+ (wrap-program (string-append out "/bin/" prog)
+ `("PYTHONPATH" ":" prefix (,python-path))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+ '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))
- #t))))))
++ #t)))
+ (replace 'glib-or-gtk-wrap
+ (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap)))
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest rest)
+ ;; By default Inkscape et al. would end up in the XDG_DATA_DIRS
+ ;; settings of the wrappers created by the 'glib-or-gtk-wrap'
+ ;; phase. Fix that since we don't need these.
+ (wrap #:inputs (fold alist-delete inputs
+ '("inkscape" "intltool" "glib:bin"))
+ #:outputs outputs)))))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
+ ("desktop-file-utils" ,desktop-file-utils) ; for
update-desktop-database
("gobject-introspection" ,gobject-introspection)
+ ("inkscape" ,inkscape)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("python" ,python)
diff --cc gnu/packages/gtk.scm
index 83ed840,aab3927..1d1bcd2
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -394,15 -399,15 +394,15 @@@ printing and other features typical of
(define-public gtksourceview
(package
(name "gtksourceview")
- (version "3.24.10")
+ (version "4.0.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
+ (uri (string-append "mirror://gnome/sources/gtksourceview/"
(version-major+minor version) "/"
- name "-" version ".tar.xz"))
+ "gtksourceview-" version ".tar.xz"))
(sha256
(base32
- "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))
+ "1b2z9c0skxrgw2vh08hv6qxky8jbvamc4rgww82j0kpp533rz0hm"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@@ -439,19 -444,6 +439,19 @@@ GTK+ text widget GtkTextView. It impro
highlighting and other features typical of a source code editor.")
(license license:lgpl2.1+)))
+(define-public gtksourceview-3
+ (package (inherit gtksourceview)
+ (name "gtksourceview")
- (version "3.24.7")
++ (version "3.24.10")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
- "1rp8zspwyw3mmdgccsas3pa6v7s0hqjaaglg6n4kcls7ccx0vhm5"))))))
++ "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))))
+
(define-public gdk-pixbuf
(package
(name "gdk-pixbuf")
diff --cc gnu/packages/linux.scm
index 4082d04,0a7a5d8..da7dd1f
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -15,10 -15,10 +15,10 @@@
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2016 John Darrington <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <address@hidden>
;;; Copyright © 2016, 2018 Rene Saavedra <address@hidden>
;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
- ;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
+ ;;; Copyright © 2016, 2017 ng0 <address@hidden>
;;; Copyright © 2017, 2018 Leo Famulari <address@hidden>
;;; Copyright © 2017 José Miguel Sánchez García <address@hidden>
;;; Copyright © 2017 Gábor Boskovits <address@hidden>