[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: |
Tue, 21 Jan 2020 15:51:35 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 715110a8a2e9e4b1a89635950744eb5260b8ee7f
Merge: b3c2ebd 79e074e
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Jan 21 21:34:41 2020 +0100
Merge branch 'master' into staging
.mailmap | 1 +
build-aux/git-authenticate.scm | 3 +-
configure.ac | 2 +-
doc/contributing.texi | 2 +-
doc/guix-cookbook.texi | 10 +-
doc/guix.texi | 106 +-
etc/guix-install.sh | 21 +
gnu/installer/newt/final.scm | 8 +-
gnu/installer/newt/page.scm | 133 +-
gnu/local.mk | 18 +-
gnu/packages.scm | 3 +
gnu/packages/audio.scm | 76 +-
gnu/packages/aux-files/linux-libre/4.14-arm.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.14-i686.conf | 12 +-
.../aux-files/linux-libre/4.14-x86_64.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.19-arm.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.19-i686.conf | 12 +-
.../aux-files/linux-libre/4.19-x86_64.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.4-i686.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.9-i686.conf | 12 +-
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 12 +-
.../aux-files/linux-libre/5.4-arm-veyron.conf | 12 +-
gnu/packages/aux-files/linux-libre/5.4-arm.conf | 12 +-
gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 12 +-
gnu/packages/aux-files/linux-libre/5.4-i686.conf | 12 +-
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 12 +-
gnu/packages/avahi.scm | 2 +-
gnu/packages/bioconductor.scm | 54 +-
gnu/packages/bioinformatics.scm | 115 +-
gnu/packages/check.scm | 42 +-
gnu/packages/chez.scm | 4 +-
gnu/packages/chromium.scm | 42 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/code.scm | 4 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cran.scm | 178 +-
gnu/packages/crates-io.scm | 2569 ++++++++++++++++----
gnu/packages/crypto.scm | 1 -
gnu/packages/databases.scm | 45 +-
gnu/packages/dictionaries.scm | 5 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 2 +-
gnu/packages/django.scm | 3 +-
gnu/packages/dns.scm | 6 +-
gnu/packages/docbook.scm | 14 +-
gnu/packages/drones.scm | 1 +
gnu/packages/easyrpg.scm | 10 +-
gnu/packages/emacs-xyz.scm | 43 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/embedded.scm | 2 +-
gnu/packages/emulators.scm | 11 +-
gnu/packages/finance.scm | 99 +
gnu/packages/fonts.scm | 2 +-
gnu/packages/fpga.scm | 2 +-
gnu/packages/game-development.scm | 84 +-
gnu/packages/games.scm | 557 +++--
gnu/packages/genealogy.scm | 6 +-
gnu/packages/geo.scm | 129 +-
gnu/packages/gnome.scm | 656 ++++-
gnu/packages/gnucash.scm | 7 +-
gnu/packages/gnuzilla.scm | 79 +-
gnu/packages/graph.scm | 2 +-
gnu/packages/graphics.scm | 6 +-
gnu/packages/graphviz.scm | 26 +-
gnu/packages/gtk.scm | 10 +
gnu/packages/guile-xyz.scm | 216 +-
gnu/packages/guile.scm | 68 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haskell-xyz.scm | 8 +-
gnu/packages/image-viewers.scm | 94 +-
gnu/packages/image.scm | 6 +-
gnu/packages/java.scm | 9 +-
gnu/packages/lean.scm | 2 +-
gnu/packages/libreoffice.scm | 1 -
gnu/packages/libusb.scm | 20 +-
gnu/packages/linux.scm | 50 +-
gnu/packages/lisp-xyz.scm | 549 ++++-
gnu/packages/lisp.scm | 103 +-
gnu/packages/mail.scm | 27 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 30 +-
gnu/packages/messaging.scm | 7 +-
gnu/packages/mpd.scm | 8 +-
gnu/packages/music.scm | 7 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/nim.scm | 10 +-
gnu/packages/node-xyz.scm | 246 ++
gnu/packages/noweb.scm | 50 +-
gnu/packages/nutrition.scm | 3 +-
gnu/packages/ocaml.scm | 151 +-
gnu/packages/openstack.scm | 1 +
gnu/packages/package-management.scm | 21 +-
gnu/packages/password-utils.scm | 5 +-
.../patches/gzdoom-find-system-libgme.patch | 21 +
.../patches/python-packaging-test-arch.patch | 65 +
.../python2-parameterized-docstring-test.patch | 18 +
.../red-eclipse-remove-gamma-name-hack.patch | 52 -
gnu/packages/patches/spice-fix-test-armhf.patch | 19 +
.../supercollider-boost-1.70-build-fix.patch | 28 -
.../patches/teeworlds-use-latest-wavpack.patch | 126 -
.../patches/usb-modeswitch-accept-config-arg.patch | 42 -
gnu/packages/patches/xmoto-remove-glext.patch | 23 +
gnu/packages/patches/xmoto-reproducible.patch | 24 +
gnu/packages/patches/xmoto-utf8.patch | 16 +
gnu/packages/perl.scm | 36 +
gnu/packages/plotutils.scm | 21 +-
gnu/packages/popt.scm | 10 +-
gnu/packages/pulseaudio.scm | 1 +
gnu/packages/python-check.scm | 3 +-
gnu/packages/python-compression.scm | 23 +-
gnu/packages/python-science.scm | 1 +
gnu/packages/python-web.scm | 32 +-
gnu/packages/python-xyz.scm | 419 +++-
gnu/packages/qt.scm | 96 +-
gnu/packages/rcm.scm | 62 +
gnu/packages/regex.scm | 4 +-
gnu/packages/rsync.scm | 4 +-
gnu/packages/ruby.scm | 4 +-
gnu/packages/rust-apps.scm | 93 +-
gnu/packages/sagemath.scm | 14 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scheme.scm | 19 +-
gnu/packages/sdr.scm | 58 +
gnu/packages/shells.scm | 2 +-
gnu/packages/spice.scm | 1 +
gnu/packages/ssh.scm | 9 +-
gnu/packages/statistics.scm | 83 +-
gnu/packages/synergy.scm | 15 +-
gnu/packages/telephony.scm | 18 +-
gnu/packages/text-editors.scm | 106 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/tryton.scm | 1 +
gnu/packages/uml.scm | 2 +-
gnu/packages/upnp.scm | 6 +-
gnu/packages/usb-modeswitch.scm | 31 +-
gnu/packages/version-control.scm | 148 +-
gnu/packages/video.scm | 40 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/web-browsers.scm | 45 +-
gnu/packages/web.scm | 69 +-
gnu/packages/wireservice.scm | 3 +-
gnu/packages/wm.scm | 5 +-
gnu/packages/xdisorg.scm | 6 +-
gnu/packages/xml.scm | 95 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/avahi.scm | 2 +-
gnu/services/databases.scm | 8 +-
gnu/services/desktop.scm | 29 +-
gnu/services/getmail.scm | 21 +-
gnu/tests/install.scm | 14 +-
gnu/tests/mail.scm | 2 -
guix/build/clojure-utils.scm | 15 +-
guix/build/syscalls.scm | 4 +-
guix/import/cpan.scm | 161 +-
guix/import/cran.scm | 9 +-
guix/import/crate.scm | 3 +-
guix/import/elpa.scm | 5 +-
guix/import/opam.scm | 21 +-
guix/import/texlive.scm | 5 +-
guix/inferior.scm | 5 +-
guix/lint.scm | 25 +-
guix/lzlib.scm | 42 +-
guix/records.scm | 19 +-
guix/scripts/challenge.scm | 7 +-
guix/scripts/edit.scm | 10 +-
guix/scripts/graph.scm | 8 +
guix/scripts/package.scm | 21 +-
guix/scripts/publish.scm | 4 +-
guix/scripts/refresh.scm | 18 +
guix/scripts/repl.scm | 39 +-
guix/scripts/size.scm | 8 +
guix/scripts/substitute.scm | 2 +-
guix/serialization.scm | 3 +-
guix/ui.scm | 15 +-
tests/cpan.scm | 114 +-
tests/cran.scm | 6 +-
tests/crate.scm | 5 +-
tests/elpa.scm | 101 +-
tests/guix-graph.sh | 27 +-
tests/guix-system.sh | 29 +-
tests/lint.scm | 18 +-
tests/lzlib.scm | 3 +-
tests/opam.scm | 67 +-
tests/packages.scm | 11 +-
tests/publish.scm | 8 +-
tests/records.scm | 34 +-
tests/texlive.scm | 14 +-
189 files changed, 7649 insertions(+), 2457 deletions(-)
diff --cc gnu/packages/databases.scm
index 283c892,e90fdfe..d06d586
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -919,6 -914,58 +919,31 @@@ Language."
as a drop-in replacement of MySQL.")
(license license:gpl2)))
-;; TODO: mysql_install_db is broken in MariaDB. This package is here as
-;; a workaround for packages that need it. Merge with 'mariadb' in the next
-;; rebuild cycle.
-(define-public mariadb/fixed-install-db
- (hidden-package
- (package/inherit
- mariadb
- (name "mariadb-fixed")
- (native-inputs '())
- (inputs
- `(("mariadb" ,mariadb)
- ("mariadb:lib" ,mariadb "lib")))
- (outputs '("out"))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules ((guix build utils)))
- (let ((out (assoc-ref %outputs "out")))
- (copy-recursively (assoc-ref %build-inputs "mariadb") out)
- (substitute* (string-append out "/bin/mysql_install_db")
- (("\\$basedir/share/mysql")
- (string-append (assoc-ref %build-inputs "mariadb:lib")
- "/share/mysql")))
- #t)))))))
-
+ (define-public mariadb-connector-c
+ (package
+ (name "mariadb-connector-c")
+ (version "3.1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://downloads.mariadb.org/f/connector-c-";
+ version "/mariadb-connector-c-"
+ version "-src.tar.gz"))
+ (sha256
+ (base32
+ "083724f5daaqyzdcx508caz6fk2hs89jff85zg28ih43vxkvnrnj"))))
+ (inputs
+ `(("openssl" ,openssl)))
+ (build-system cmake-build-system)
+ (arguments
+ ;; No tests.
+ '(#:tests? #f))
+ (home-page "https://mariadb.com/kb/en/mariadb-connector-c/";)
+ (synopsis "Client library to connect to MySQL or MariaDB")
+ (description "The MariaDB Connector/C is used to connect applications
+ developed in C/C++ to MariaDB and MySQL databases.")
+ (license license:lgpl2.1+)))
+
;; Don't forget to update the other postgresql packages when upgrading this
one.
(define-public postgresql
(package