[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'master' into staging |
|
Date: |
Thu, 14 Mar 2019 11:27:41 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit ebfe259f6682b43d7f0d3b57b525e25f97410052
Merge: 47b3eed 8cc3983
Author: Marius Bakke <address@hidden>
Date: Thu Mar 14 15:06:06 2019 +0100
Merge branch 'master' into staging
Makefile.am | 38 +-
doc/contributing.de.texi | 590 +-
doc/guix.de.texi | 18629 ++++++++++---------
doc/guix.texi | 168 +-
doc/images/installer-network.png | Bin 0 -> 24342 bytes
doc/images/installer-partitions.png | Bin 0 -> 55847 bytes
doc/images/installer-resume.png | Bin 0 -> 35829 bytes
doc/local.mk | 7 +-
gnu/bootloader/extlinux.scm | 4 +-
gnu/bootloader/grub.scm | 8 +-
gnu/build/linux-modules.scm | 27 +-
gnu/build/vm.scm | 6 +-
gnu/ci.scm | 4 +-
gnu/installer/newt/network.scm | 6 +-
gnu/installer/newt/welcome.scm | 4 +-
gnu/local.mk | 1 +
gnu/packages.scm | 17 +-
gnu/packages/admin.scm | 29 +-
gnu/packages/aspell.scm | 26 +-
gnu/packages/audio.scm | 27 +-
gnu/packages/bioconductor.scm | 789 +
gnu/packages/bioinformatics.scm | 160 +-
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/compression.scm | 6 +-
gnu/packages/cran.scm | 900 +
gnu/packages/curl.scm | 2 +-
gnu/packages/databases.scm | 42 +-
gnu/packages/education.scm | 23 +-
gnu/packages/emacs-xyz.scm | 305 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/emulators.scm | 2 +-
gnu/packages/engineering.scm | 12 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 32 +-
gnu/packages/ftp.scm | 6 +-
gnu/packages/games.scm | 20 +-
gnu/packages/geo.scm | 4 +-
gnu/packages/gnome.scm | 74 +-
gnu/packages/guile-xyz.scm | 125 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/image.scm | 4 +-
gnu/packages/julia.scm | 2 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kodi.scm | 20 +-
gnu/packages/libevent.scm | 6 +-
gnu/packages/linux.scm | 14 +-
gnu/packages/llvm.scm | 8 +-
gnu/packages/machine-learning.scm | 103 +
gnu/packages/music.scm | 10 +-
gnu/packages/networking.scm | 101 +-
gnu/packages/package-management.scm | 4 +-
.../patches/pugixml-versioned-libdir.patch | 61 +
gnu/packages/photo.scm | 21 +-
gnu/packages/polkit.scm | 2 +-
gnu/packages/python-xyz.scm | 44 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/skarnet.scm | 45 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/terminals.scm | 72 +-
gnu/packages/tex.scm | 8 +-
gnu/packages/tls.scm | 11 +-
gnu/packages/tmux.scm | 50 +
gnu/packages/video.scm | 155 +-
gnu/packages/w3m.scm | 4 +-
gnu/packages/web-browsers.scm | 2 +-
gnu/packages/web.scm | 32 +-
gnu/packages/webkit.scm | 9 +-
gnu/packages/wm.scm | 148 +
gnu/packages/xml.scm | 8 +-
gnu/packages/xorg.scm | 38 +-
gnu/services/base.scm | 77 +-
gnu/services/configuration.scm | 5 +
gnu/services/cups.scm | 2 +-
gnu/services/desktop.scm | 6 +-
gnu/services/mail.scm | 2 +-
gnu/services/messaging.scm | 2 +-
gnu/services/monitoring.scm | 57 +-
gnu/system/examples/vm-image.tmpl | 2 +-
gnu/system/install.scm | 2 +-
gnu/system/linux-container.scm | 14 +-
gnu/system/mapped-devices.scm | 57 +-
gnu/system/vm.scm | 6 +-
gnu/tests/install.scm | 4 +-
guix/describe.scm | 31 +-
guix/modules.scm | 4 +-
guix/packages.scm | 16 +-
nix/libstore/optimise-store.cc | 2 +-
po/doc/guix-manual.de.po | 2598 +--
89 files changed, 15302 insertions(+), 10688 deletions(-)
diff --cc gnu/packages/freedesktop.scm
index ae4c18e,4750450..6e2061b
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -152,10 -153,10 +153,10 @@@ freedesktop.org project."
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/";
- name "-" version ".tar.xz"))
+ "libinput-" version ".tar.xz"))
(sha256
(base32
- "0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj"))))
+ "0pgla0mc6mvyr1ljy10mcqvfz8i5z6yp7dbx2bcd70y67wx05d0j"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocumentation=false")))
diff --cc gnu/packages/gnome.scm
index c6447d2,ea6d255..ea04261
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -5766,62 -5684,52 +5755,67 @@@ properties, screen resolution, and othe
(copy-file #$(file-append %artwork-repository
"/slim/0.x/background.png")
"data/theme/guix-background.png")
- (invoke #+(file-append inkscape "/bin/inkscape")
- "--export-png=data/theme/guix-logo.png"
- #$(file-append %artwork-repository
- "/logo/Guix-horizontal-white.svg"))
+ (copy-file #$(file-append %artwork-repository
+
"/logo/Guix-horizontal-white.svg")
+ "data/theme/guix-logo.svg")
#t))))
- (build-system glib-or-gtk-build-system)
+ (build-system meson-build-system)
(arguments
- '(#:phases
+ '(#:glib-or-gtk? #t
+ #: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"))
+ #: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))))))
(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)