[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Mon, 13 Apr 2020 14:44:20 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit fc58cb5bd2f4a4fb9e910f553009fce8a60e56e9
Merge: 9d89818 bad368b
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Apr 13 20:26:21 2020 +0200
Merge branch 'master' into core-updates
doc/build.scm | 178 +++++++++++++++++++++++++++++++-------
gnu/packages/batik.scm | 6 +-
gnu/packages/bioconductor.scm | 8 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/build-tools.scm | 14 +--
gnu/packages/check.scm | 8 +-
gnu/packages/chromium.scm | 42 +++++----
gnu/packages/cran.scm | 6 +-
gnu/packages/databases.scm | 13 ++-
gnu/packages/datastructures.scm | 36 ++++----
gnu/packages/debian.scm | 7 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/display-managers.scm | 6 +-
gnu/packages/dns.scm | 17 +---
gnu/packages/emacs-xyz.scm | 110 ++++++++++++++++++-----
gnu/packages/finance.scm | 4 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/games.scm | 19 ++--
gnu/packages/geo.scm | 6 +-
gnu/packages/gimp.scm | 83 ++++++++++--------
gnu/packages/gnome-xyz.scm | 2 +-
gnu/packages/gnome.scm | 6 +-
gnu/packages/golang.scm | 2 +-
gnu/packages/guile-xyz.scm | 26 ++----
gnu/packages/haskell-xyz.scm | 2 +-
gnu/packages/icu4c.scm | 20 ++++-
gnu/packages/irc.scm | 6 +-
gnu/packages/java.scm | 8 +-
gnu/packages/julia.scm | 2 +-
gnu/packages/kde-internet.scm | 2 +-
gnu/packages/kde-multimedia.scm | 2 +-
gnu/packages/kde-pim.scm | 8 +-
gnu/packages/kde-systemtools.scm | 2 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/linux.scm | 8 +-
gnu/packages/lirc.scm | 2 +-
gnu/packages/lisp-xyz.scm | 56 ++++++++++--
gnu/packages/llvm.scm | 2 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/matrix.scm | 1 +
gnu/packages/messaging.scm | 108 ++++++++++-------------
gnu/packages/monitoring.scm | 6 +-
gnu/packages/ocaml.scm | 6 +-
gnu/packages/password-utils.scm | 10 +--
gnu/packages/pdf.scm | 6 +-
gnu/packages/perl.scm | 2 +-
gnu/packages/python-xyz.scm | 31 +------
gnu/packages/ruby.scm | 4 +-
gnu/packages/sagemath.scm | 4 +-
gnu/packages/statistics.scm | 6 +-
gnu/packages/syncthing.scm | 43 +++++----
gnu/packages/text-editors.scm | 98 ++++++++++++++++++++-
gnu/packages/version-control.scm | 18 ++++
gnu/packages/web.scm | 2 +-
gnu/packages/wine.scm | 8 +-
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xfce.scm | 57 ++++++------
gnu/packages/xiph.scm | 2 +-
gnu/services/virtualization.scm | 2 +-
guix/build/julia-build-system.scm | 51 +++++------
guix/self.scm | 7 ++
63 files changed, 763 insertions(+), 462 deletions(-)
diff --cc gnu/packages/icu4c.scm
index 046e35e,beeb2d7..d8a8982
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@@ -4,8 -4,7 +4,8 @@@
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2017 Clément Lassieur <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
- ;;; Copyright © 2019 Marius Bakke <address@hidden>
+ ;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -95,25 -106,35 +95,43 @@@ C/C++ part."
(license x11)
(home-page "http://site.icu-project.org/";)))
-(define icu4c/fixed
+(define-public icu4c-build-root
(package
(inherit icu4c)
- (source (origin
- (inherit (package-source icu4c))
- (patch-flags '("-p2"))
- (patches (append
- (origin-patches (package-source icu4c))
- (search-patches
- "icu4c-CVE-2020-10531.patch")))))))
+ (name "icu4c-build-root")
+ (arguments
+ (substitute-keyword-arguments (package-arguments icu4c)
+ ((#:tests? _ '())
+ #f)
+ ((#:out-of-source? _ '())
+ #t)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (copy-recursively "../build" out)
+ #t)))))))
+ (native-inputs '())))
+ (define-public icu4c-66.1
+ (package
+ (inherit icu4c)
+ (version "66.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+
"https://github.com/unicode-org/icu/releases/download/release-";
+ (string-map (lambda (x) (if (char=? x #\.) #\- x))
version)
+ "/icu4c-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x))
version)
+ "-src.tgz"))
+ (patch-flags '("-p2"))
+ (patches (search-patches "icu4c-CVE-2020-10531.patch"))
+ (sha256
+ (base32
+ "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))))
+
(define-public java-icu4j
(package
(name "java-icu4j")
diff --cc gnu/packages/linux.scm
index 886b67d,3bad3e6..8793e55
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -1539,13 -1510,13 +1539,13 @@@ slabtop, and skill."
(method url-fetch)
(uri (string-append
"mirror://kernel.org/linux/kernel/people/tytso/"
- name "/v" version "/"
- name "-" version ".tar.xz"))
+ "e2fsprogs/v" version "/"
+ "e2fsprogs-" version ".tar.xz"))
(sha256
(base32
- "1pmf8inp736l587rqq7qsd8bv0mmg5cwrivxg5p5awqgv70crypr"))))
+ "0mj2yizwygs7xww8jfy5mxjn8ww4pvc0b1hg1p2vsnirailsx9zz"))))
(build-system gnu-build-system)
- (inputs `(("util-linux" ,util-linux)))
+ (inputs `(("util-linux" ,util-linux "lib")))
(native-inputs `(("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ;for the libext2fs Info manual
diff --cc gnu/packages/messaging.scm
index e37585c,c6217a9..da2c76b
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@@ -728,68 -728,52 +728,52 @@@ on Axolotl and PEP."
(license license:gpl3+)))
(define-public dino
- ;; The only release tarball is for version 0.0, but it is very old and fails
- ;; to build.
- (let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417")
- (revision "4"))
- (package
- (name "dino")
- (version (git-version "0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dino/dino.git";)
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m"))))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f ; there are no tests
- #:parallel-build? #f ; not supported
- ; Use our libsignal-protocol-c instead of the git submodule.
- #:configure-flags '("-DSHARED_SIGNAL_PROTOCOL=yes")
- #:modules ((guix build cmake-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix
glib-or-gtk:)
- (guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
- (guix build cmake-build-system)
- (guix build glib-or-gtk-build-system))
- #:phases
- (modify-phases %standard-phases
- ;; The signal-protocol plugin accesses internal headers of
- ;; libsignal-protocol-c, so we need to put the sources there.
- (add-after 'unpack 'unpack-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion
"plugins/signal-protocol/libsignal-protocol-c"
- (invoke "tar" "xvf"
- (assoc-ref inputs "libsignal-protocol-c-source")
- "--strip-components=1"))))
- (add-after 'install 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
- (inputs
- `(("libgee" ,libgee)
- ("libsignal-protocol-c" ,libsignal-protocol-c)
- ("libgcrypt" ,libgcrypt)
- ("libsoup" ,libsoup)
- ("qrencode" ,qrencode)
- ("sqlite" ,sqlite)
- ("gpgme" ,gpgme)
- ("gtk+" ,gtk+)
- ("glib-networking" ,glib-networking)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("libsignal-protocol-c-source" ,(package-source
libsignal-protocol-c))
- ("glib" ,glib "bin")
- ("vala" ,vala)
- ("gettext" ,gettext-minimal)))
- (home-page "https://dino.im";)
- (synopsis "Graphical Jabber (XMPP) client")
- (description "Dino is a Jabber (XMPP) client which aims to fit well into
+ (package
+ (name "dino")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/dino/dino/releases/download/v";
+ version "/dino-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f
+ #:parallel-build? #f ; not supported
+ #:modules ((guix build cmake-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix
glib-or-gtk:)
+ (guix build utils))
+ #:imported-modules (,@%gnu-build-system-modules
+ (guix build cmake-build-system)
+ (guix build glib-or-gtk-build-system))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (inputs
+ `(("libgee" ,libgee)
+ ("libsignal-protocol-c" ,libsignal-protocol-c)
+ ("libgcrypt" ,libgcrypt)
+ ("libsoup" ,libsoup)
+ ("qrencode" ,qrencode)
- ("sqlite" ,sqlite-with-column-metadata)
++ ("sqlite" ,sqlite)
+ ("gpgme" ,gpgme)
+ ("gtk+" ,gtk+)
+ ("glib-networking" ,glib-networking)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("glib" ,glib "bin")
+ ("vala" ,vala)
+ ("gettext" ,gettext-minimal)))
+ (home-page "https://dino.im";)
+ (synopsis "Graphical Jabber (XMPP) client")
+ (description "Dino is a Jabber (XMPP) client which aims to fit well into
a graphical desktop environment like GNOME.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public prosody
(package