[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 10 Apr 2020 18:13:04 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit bdb90df764661c11b37c988ea129c8e7a01b1889
Merge: b859a1b 8ec9c5f
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Apr 11 00:10:23 2020 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 12 +
etc/news.scm | 10 +-
gnu/build/vm.scm | 19 ++
gnu/installer.scm | 14 +-
gnu/installer/keymap.scm | 10 +-
gnu/installer/newt/keymap.scm | 82 +++++-
gnu/installer/record.scm | 3 +-
gnu/installer/tests.scm | 9 +-
gnu/installer/utils.scm | 5 +-
gnu/local.mk | 9 +-
gnu/packages/audio.scm | 36 +++
gnu/packages/backup.scm | 16 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/cdrom.scm | 20 +-
gnu/packages/cpp.scm | 10 +-
gnu/packages/cran.scm | 5 +-
gnu/packages/cross-base.scm | 5 +-
gnu/packages/databases.scm | 28 +-
gnu/packages/disk.scm | 50 ++++
gnu/packages/distributed.scm | 4 +-
gnu/packages/emacs-xyz.scm | 107 ++++---
gnu/packages/finance.scm | 39 +++
gnu/packages/games.scm | 116 ++++----
gnu/packages/graphics.scm | 56 ++++
gnu/packages/ham-radio.scm | 308 ++++++++++++++++++++-
gnu/packages/haskell-apps.scm | 2 +-
gnu/packages/haskell-xyz.scm | 2 +-
gnu/packages/image-viewers.scm | 125 ++++++---
gnu/packages/kde-pim.scm | 2 +-
gnu/packages/linux.scm | 12 +-
gnu/packages/music.scm | 5 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ntp.scm | 70 ++++-
...ly-relo.patch => akonadi-not-relocatable.patch} | 0
...atch => binutils-mingw-w64-deterministic.patch} | 0
...mp.patch => binutils-mingw-w64-timestamp.patch} | 0
.../patches/kmscon-runtime-keymap-switch.patch | 27 +-
...BitmapTo.patch => sdl-pango-header-guard.patch} | 0
gnu/packages/python-science.scm | 3 -
gnu/packages/python-xyz.scm | 107 +++++--
gnu/packages/sdl.scm | 14 +-
gnu/packages/ssh.scm | 14 +-
gnu/packages/video.scm | 4 +-
gnu/packages/xfce.scm | 4 +-
gnu/services/desktop.scm | 3 +-
gnu/services/web.scm | 4 +-
gnu/system/vm.scm | 37 ++-
gnu/tests/install.scm | 9 +-
gnu/tests/networking.scm | 3 +-
guix/download.scm | 10 +-
guix/lint.scm | 7 +-
51 files changed, 1151 insertions(+), 292 deletions(-)
diff --cc etc/news.scm
index ba15f12,fd75225..61fc6b6
--- a/etc/news.scm
+++ b/etc/news.scm
@@@ -16,16 -17,13 +17,21 @@@
service responsible for log rotation, has been added to @code{%base-services}.
If your operating system configuration for Guix System is explicitly adding
@code{rottlog-service-type} to the services, you should now remove it. See
- the ``Log Rotation'' section of the manual for more information.")))
+ the ``Log Rotation'' section of the manual for more information.")
+ (de "Eine Instanz des @code{rottlog-service-type} für
+ Log-Rotation wurde zu den @code{%base-services} hinzugefügt. Wenn der
+ Systemdienst bereits in Ihrer Konfiguration für Guix System ausdrücklich
+ genannt wurde, sollten Sie ihn jetzt daraus entfernen. Siehe den Abschnitt
+ „Log-Rotation“ im Handbuch für weitere Informationen.")))
+ (entry (commit "b6bee63bed4f013064c0d902e7c8b83ed7514ade")
+ (title (en "@code{guile} package now refers to version 3.0"))
+ (body (en "The @code{guile} package has been upgraded to version 3.0
+ (instead of 2.2). The @code{guile3.0-} packages have been renamed to their
+original name, and @code{guile2.2-} variants of these packages have been
+defined. Additionally, derivations are now all built with Guile 3.0, and
+system services also run on 3.0.")))
+
(entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444")
(title (en "@command{guix pull} now supports SSH authenticated
repositories")
diff --cc gnu/local.mk
index b10c856,73f9d5d..e7e5d00
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -722,11 -723,10 +723,11 @@@ dist_patch_DATA =
%D%/packages/patches/aegis-test-fixup-1.patch \
%D%/packages/patches/aegis-test-fixup-2.patch \
%D%/packages/patches/aegisub-icu59-include-unistr.patch \
- %D%/packages/patches/aegisub-boost68.patch \
+ %D%/packages/patches/aegisub-boost68.patch \
+ %D%/packages/patches/aegisub-make43.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/akonadi-paths.patch \
- %D%/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch \
+ %D%/packages/patches/akonadi-not-relocatable.patch \
%D%/packages/patches/akonadi-timestamps.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
%D%/packages/patches/amule-crypto-6.patch \
diff --cc gnu/packages/graphics.scm
index 7f56d26,dd50417..16ab9d2
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@@ -87,6 -88,61 +88,61 @@@
#:use-module (guix packages)
#:use-module (guix utils))
+ (define-public fox
+ (package
+ (name "fox")
+ (version "1.6.57")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://fox-toolkit.org/ftp/fox-"; version ".tar.gz"))
+ (sha256
+ (base32 "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* "configure"
+ (("-I/usr/include/freetype2")
+ (string-append "-I"
+ (string-append
+ (assoc-ref %build-inputs "freetype")
+ "/include/freetype2"))))
+ #t)))))
+ (native-inputs
+ `(("doxygen" ,doxygen)))
+ (inputs
+ `(("bzip2" ,lbzip2)
+ ("freetype" ,freetype)
+ ("gl" ,mesa)
+ ("glu" ,glu)
- ("jpeg" ,libjpeg)
++ ("jpeg" ,libjpeg-turbo)
+ ("png" ,libpng)
+ ("tiff" ,libtiff)
+ ("x11" ,libx11)
+ ("xcursor" ,libxcursor)
+ ("xext" ,libxext)
+ ("xfixes" ,libxfixes)
+ ("xft" ,libxft)
+ ("xinput" ,libxi)
+ ("xrandr" ,libxrandr)
+ ("xrender" ,libxrender)
+ ("xshm" ,libxshmfence)
+ ("zlib" ,zlib)))
+ (synopsis "Widget Toolkit for building GUI")
+ (description"FOX (Free Objects for X) is a C++ based Toolkit for
developing
+ Graphical User Interfaces easily and effectively. It offers a wide, and
+ growing, collection of Controls, and provides state of the art facilities such
+ as drag and drop, selection, as well as OpenGL widgets for 3D graphical
+ manipulation. FOX also implements icons, images, and user-convenience
features
+ such as status line help, and tooltips. Tooltips may even be used for 3D
+ objects!")
+ (home-page "http://www.fox-toolkit.org";)
+ (license license:lgpl2.1+)))
+
(define-public blender
(package
(name "blender")