[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into wip-gnome-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into wip-gnome-updates |
|
Date: |
Sun, 10 Nov 2019 18:28:49 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.
commit 9ee17ac0367aff4712f4f82114a26fab7e4adce8
Merge: 1a9df94 9e4e66c
Author: Kei Kebreau <address@hidden>
Date: Sun Nov 10 18:25:34 2019 -0500
Merge branch 'master' into wip-gnome-updates
README | 3 +-
configure.ac | 12 +-
doc/contributing.texi | 3 +-
doc/guix.texi | 32 +++-
etc/news.scm | 75 +++++++-
gnu/local.mk | 2 +
gnu/packages/admin.scm | 2 +
gnu/packages/algebra.scm | 1 +
gnu/packages/audio.scm | 43 ++---
gnu/packages/bioinformatics.scm | 2 +
gnu/packages/boost.scm | 50 +++++
gnu/packages/commencement.scm | 2 +-
gnu/packages/cran.scm | 13 +-
gnu/packages/crypto.scm | 16 +-
gnu/packages/cups.scm | 125 ++++++++-----
gnu/packages/debug.scm | 2 +-
gnu/packages/digest.scm | 1 +
gnu/packages/emacs-xyz.scm | 12 ++
gnu/packages/engineering.scm | 1 +
gnu/packages/fcitx.scm | 12 +-
gnu/packages/finance.scm | 46 ++++-
gnu/packages/freedesktop.scm | 1 +
gnu/packages/fribidi.scm | 13 +-
gnu/packages/fvwm.scm | 7 +-
gnu/packages/gimp.scm | 42 +++--
gnu/packages/gnome-xyz.scm | 213 ++++++++++++++++++++++
gnu/packages/gnome.scm | 136 +++++++++-----
gnu/packages/gnupg.scm | 34 ++--
gnu/packages/golang.scm | 2 +
gnu/packages/graphics.scm | 12 +-
gnu/packages/guile-xyz.scm | 3 +
gnu/packages/haskell-apps.scm | 37 +++-
gnu/packages/haskell-xyz.scm | 38 ++++
gnu/packages/image-viewers.scm | 1 +
gnu/packages/irc.scm | 5 +-
gnu/packages/java-maths.scm | 1 +
gnu/packages/linux.scm | 20 +-
gnu/packages/llvm.scm | 1 +
gnu/packages/logging.scm | 1 +
gnu/packages/make-bootstrap.scm | 80 ++++----
gnu/packages/mpi.scm | 15 +-
gnu/packages/music.scm | 42 ++++-
gnu/packages/networking.scm | 9 +-
gnu/packages/ocaml.scm | 2 +
gnu/packages/password-utils.scm | 148 ++++++++++-----
gnu/packages/patches/fribidi-CVE-2019-18397.patch | 26 +++
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl.scm | 48 ++++-
gnu/packages/pkg-config.scm | 67 +++----
gnu/packages/polkit.scm | 6 +-
gnu/packages/python-xyz.scm | 29 +--
gnu/packages/qt.scm | 4 +-
gnu/packages/rdesktop.scm | 34 ++--
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 14 +-
gnu/packages/terminals.scm | 1 +
gnu/packages/tigervnc.scm | 1 +
gnu/packages/tls.scm | 12 +-
gnu/packages/upnp.scm | 45 +----
gnu/packages/video.scm | 16 +-
gnu/packages/vim.scm | 5 +-
gnu/packages/virtualization.scm | 11 +-
gnu/packages/web.scm | 150 ++++++++++++++-
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 2 +
gnu/packages/xfce.scm | 18 +-
gnu/services.scm | 40 ++--
gnu/services/audio.scm | 7 +
gnu/services/web.scm | 35 +++-
gnu/tests/docker.scm | 2 +-
gnu/tests/singularity.scm | 2 +-
guix/build/syscalls.scm | 35 +++-
guix/derivations.scm | 2 +-
guix/scripts/graph.scm | 105 ++++++-----
guix/scripts/package.scm | 70 ++++---
guix/scripts/system/search.scm | 10 +-
guix/ui.scm | 64 ++++++-
tests/guix-build.sh | 4 +
tests/guix-graph.sh | 8 +-
tests/guix-package.sh | 10 +-
80 files changed, 1615 insertions(+), 598 deletions(-)
diff --cc gnu/packages/gnome.scm
index d4ecdf3,bb77f67..ad2b843
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -581,11 -567,19 +581,19 @@@ and keep up to date translations of doc
name "-" version ".tar.xz"))
(sha256
(base32
- "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"))))
+ "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"))))
(build-system meson-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("gtk-update-icon-cache") "true"))
+ #t)))))
(native-inputs
`(("glib:bin" ,glib "bin")
- ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("docbook-xml" ,docbook-xml)
@@@ -3507,10 -3470,17 +3515,18 @@@ both a traditional UI or a modern UI wi
name "-" version ".tar.xz"))
(sha256
(base32
- "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a"))))
+ "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"))))
(build-system meson-build-system)
(arguments
- '(#:glib-or-gtk? #t))
- '(#:phases
++ '(#:glib-or-gtk? #t
++ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("gtk-update-icon-cache") "true"))
+ #t)))))
(native-inputs
`(("intltool" ,intltool)
("itstool" ,itstool)
@@@ -4009,12 -3947,9 +4024,11 @@@ for application developers."
("desktop-file-utils" ,desktop-file-utils)
("gobject-introspection" ,gobject-introspection)
("glib:bin" ,glib "bin") ;for 'glib-mkenums'
- ("gtk:bin" ,gtk+ "bin") ;for 'gtk-update-icon-cache'
("intltool" ,intltool)
("itstool" ,itstool)
- ("xmllint" ,libxml2)))
+ ("xmllint" ,libxml2)
+ ("python-pylint" ,python-pylint)
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
`(("dconf" ,dconf)))
(inputs