[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: |
Sun, 20 Jan 2019 16:24:07 -0500 (EST) |
civodul pushed a commit to branch staging
in repository guix.
commit 3e2d4e69c340c3520f546f8c7e21e52383058d1c
Merge: ad79ae7 e5ad2cd
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 20 22:12:10 2019 +0100
Merge branch 'master' into staging
TODO | 36 +
configure.ac | 15 +
doc/guix.texi | 116 +-
gnu/bootloader.scm | 13 +-
gnu/build/file-systems.scm | 14 +-
gnu/ci.scm | 65 +-
gnu/installer.scm | 358 +
gnu/installer/aux-files/SUPPORTED | 484 +
gnu/installer/aux-files/logo.txt | 19 +
gnu/installer/connman.scm | 400 +
gnu/installer/final.scm | 36 +
gnu/installer/hostname.scm | 23 +
gnu/installer/keymap.scm | 172 +
gnu/installer/locale.scm | 210 +
gnu/installer/newt.scm | 128 +
gnu/installer/newt/ethernet.scm | 81 +
gnu/installer/newt/final.scm | 86 +
gnu/installer/newt/hostname.scm | 26 +
gnu/installer/newt/keymap.scm | 122 +
gnu/installer/newt/locale.scm | 217 +
gnu/installer/newt/menu.scm | 44 +
gnu/installer/newt/network.scm | 173 +
gnu/installer/newt/page.scm | 530 +
gnu/installer/newt/partition.scm | 766 +
gnu/installer/newt/services.scm | 48 +
gnu/installer/newt/timezone.scm | 83 +
gnu/installer/newt/user.scm | 175 +
gnu/installer/newt/utils.scm | 43 +
gnu/installer/newt/welcome.scm | 118 +
gnu/installer/newt/wifi.scm | 243 +
gnu/installer/parted.scm | 1312 ++
gnu/installer/record.scm | 84 +
gnu/installer/services.scm | 59 +
gnu/installer/steps.scm | 237 +
gnu/installer/timezone.scm | 127 +
gnu/installer/user.scm | 50 +
gnu/installer/utils.scm | 63 +
gnu/local.mk | 55 +-
gnu/packages.scm | 259 +-
gnu/packages/ada.scm | 3 +-
gnu/packages/admin.scm | 7 +-
gnu/packages/adns.scm | 32 +
gnu/packages/android.scm | 1 +
gnu/packages/animation.scm | 42 +
gnu/packages/apl.scm | 4 +-
gnu/packages/audio.scm | 16 +-
gnu/packages/avahi.scm | 2 +-
gnu/packages/backup.scm | 2 +
gnu/packages/benchmark.scm | 1 +
gnu/packages/bioconductor.scm | 49 +-
gnu/packages/bioinformatics.scm | 79 +-
gnu/packages/bittorrent.scm | 3 +-
gnu/packages/bootloaders.scm | 23 +-
gnu/packages/calendar.scm | 3 +-
gnu/packages/check.scm | 49 +
gnu/packages/chemistry.scm | 1 +
gnu/packages/ci.scm | 1 +
gnu/packages/cluster.scm | 2 +-
gnu/packages/cobol.scm | 2 +-
gnu/packages/code.scm | 2 +-
gnu/packages/compression.scm | 289 -
gnu/packages/connman.scm | 1 +
gnu/packages/cran.scm | 62 +-
gnu/packages/crypto.scm | 3 +-
gnu/packages/cups.scm | 1 +
gnu/packages/cyrus-sasl.scm | 2 +-
gnu/packages/databases.scm | 209 +-
gnu/packages/datastructures.scm | 8 +-
gnu/packages/dav.scm | 3 +-
gnu/packages/dbm.scm | 159 +
gnu/packages/dc.scm | 2 +-
gnu/packages/debug.scm | 3 +-
gnu/packages/direct-connect.scm | 2 +-
gnu/packages/disk.scm | 3 +-
gnu/packages/django.scm | 3 +-
gnu/packages/dlang.scm | 1 +
gnu/packages/docker.scm | 2 +-
gnu/packages/ebook.scm | 2 +
gnu/packages/education.scm | 2 +-
gnu/packages/elf.scm | 1 +
gnu/packages/{emacs.scm => emacs-xyz.scm} | 522 +-
gnu/packages/emacs.scm | 12771 +---------------
gnu/packages/emulators.scm | 24 +-
gnu/packages/engineering.scm | 1 +
gnu/packages/enlightenment.scm | 1 +
gnu/packages/file-systems.scm | 37 +-
gnu/packages/finance.scm | 6 +-
gnu/packages/fltk.scm | 1 +
gnu/packages/fonts.scm | 32 +-
gnu/packages/fontutils.scm | 1 +
gnu/packages/fpga.scm | 33 +-
gnu/packages/freedesktop.scm | 3 +-
gnu/packages/ftp.scm | 2 +-
gnu/packages/game-development.scm | 3 +-
gnu/packages/games.scm | 68 +-
gnu/packages/geo.scm | 2 +
gnu/packages/gl.scm | 1 +
gnu/packages/gnome.scm | 50 +
gnu/packages/gnunet.scm | 12 +-
gnu/packages/gnupg.scm | 3 +-
gnu/packages/gnuzilla.scm | 76 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 1 +
gnu/packages/graphics.scm | 1 +
gnu/packages/graphviz.scm | 109 +-
gnu/packages/groff.scm | 30 +
gnu/packages/gtk.scm | 8 +-
gnu/packages/guile.scm | 75 +-
gnu/packages/ham-radio.scm | 1 +
gnu/packages/haskell-crypto.scm | 5 +-
gnu/packages/haskell.scm | 44 +-
gnu/packages/ibus.scm | 9 +-
gnu/packages/image-processing.scm | 102 +-
gnu/packages/image-viewers.scm | 1 +
gnu/packages/image.scm | 1 +
gnu/packages/inkscape.scm | 38 +-
gnu/packages/irc.scm | 1 +
gnu/packages/java-compression.scm | 3 +-
gnu/packages/jrnl.scm | 1 +
gnu/packages/julia.scm | 1 +
gnu/packages/kde-frameworks.scm | 92 +-
gnu/packages/kerberos.scm | 3 +-
gnu/packages/key-mon.scm | 1 +
gnu/packages/kodi.scm | 3 +
gnu/packages/libevent.scm | 31 +
gnu/packages/libffi.scm | 1 +
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/libusb.scm | 117 +-
gnu/packages/linux.scm | 31 +-
gnu/packages/lirc.scm | 3 +-
gnu/packages/lisp.scm | 1 +
gnu/packages/logging.scm | 1 +
gnu/packages/lxde.scm | 14 +-
gnu/packages/machine-learning.scm | 1 +
gnu/packages/mail.scm | 3 +
gnu/packages/man.scm | 13 +-
gnu/packages/mate.scm | 1 +
gnu/packages/maths.scm | 5 +-
gnu/packages/medical.scm | 2 +-
gnu/packages/messaging.scm | 39 +-
gnu/packages/monitoring.scm | 1 +
gnu/packages/mp3.scm | 1 +
gnu/packages/mpd.scm | 3 +-
gnu/packages/music.scm | 3 +-
gnu/packages/networking.scm | 3 +-
gnu/packages/nfs.scm | 2 +-
gnu/packages/nutrition.scm | 3 +-
gnu/packages/nvi.scm | 2 +-
gnu/packages/ocaml.scm | 310 +-
gnu/packages/ocr.scm | 5 +-
gnu/packages/openldap.scm | 3 +-
gnu/packages/openstack.scm | 10 +-
gnu/packages/package-management.scm | 37 +-
gnu/packages/password-utils.scm | 1 +
.../patches/kmscon-runtime-keymap-switch.patch | 229 +
gnu/packages/patches/kodi-skip-test-449.patch | 53 +
.../patches/libssh-hostname-parser-bug.patch | 17 -
.../patches/opencv-rgbd-aarch64-test-fix.patch | 40 +
gnu/packages/patches/openssh-CVE-2018-20685.patch | 44 +
gnu/packages/patchutils.scm | 69 +-
gnu/packages/pdf.scm | 3 +-
gnu/packages/perl-compression.scm | 154 +
gnu/packages/perl.scm | 30 +-
gnu/packages/photo.scm | 3 +-
gnu/packages/php.scm | 16 +-
gnu/packages/polkit.scm | 1 -
gnu/packages/protobuf.scm | 18 +-
gnu/packages/pulseaudio.scm | 2 +-
gnu/packages/python-compression.scm | 207 +
gnu/packages/python-crypto.scm | 1 +
gnu/packages/python-web.scm | 1 +
gnu/packages/{python.scm => python-xyz.scm} | 527 +-
gnu/packages/python.scm | 14604 +------------------
gnu/packages/qt.scm | 2 +
gnu/packages/rdf.scm | 3 +-
gnu/packages/ruby.scm | 3 +
gnu/packages/sawfish.scm | 2 +-
gnu/packages/scheme.scm | 78 +-
gnu/packages/search.scm | 1 +
gnu/packages/selinux.scm | 1 +
gnu/packages/serialization.scm | 1 +
gnu/packages/shells.scm | 1 +
gnu/packages/simulation.scm | 1 +
gnu/packages/sqlite.scm | 125 +
gnu/packages/ssh.scm | 46 +-
gnu/packages/statistics.scm | 6 +-
gnu/packages/storage.scm | 1 +
gnu/packages/sync.scm | 4 +-
gnu/packages/syndication.scm | 2 +-
gnu/packages/terminals.scm | 3 +
gnu/packages/tex.scm | 465 +-
gnu/packages/textutils.scm | 1 +
gnu/packages/time.scm | 3 +-
gnu/packages/tls.scm | 1 +
gnu/packages/tor.scm | 1 +
gnu/packages/tryton.scm | 1 +
gnu/packages/version-control.scm | 7 +-
gnu/packages/video.scm | 17 +-
gnu/packages/virtualization.scm | 1 +
gnu/packages/vpn.scm | 9 +-
gnu/packages/web-browsers.scm | 9 +-
gnu/packages/web.scm | 1 +
gnu/packages/webkit.scm | 2 +-
gnu/packages/wicd.scm | 3 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/xdisorg.scm | 1 +
gnu/packages/xorg.scm | 123 +-
gnu/services/avahi.scm | 52 +-
gnu/services/base.scm | 52 +-
gnu/services/desktop.scm | 6 +-
gnu/services/herd.scm | 7 +-
gnu/services/ssh.scm | 10 +
gnu/system.scm | 3 +
gnu/system/examples/docker-image.tmpl | 2 +-
gnu/system/install.scm | 27 +-
gnu/tests/base.scm | 3 +-
gnu/tests/docker.scm | 81 +-
gnu/tests/install.scm | 4 +-
guix/build-system/scons.scm | 2 +-
guix/build/profiles.scm | 23 +-
guix/build/syscalls.scm | 27 +
guix/channels.scm | 269 +-
guix/discovery.scm | 28 +-
guix/import/github.scm | 4 +-
guix/inferior.scm | 33 +
guix/profiles.scm | 50 +-
guix/profiling.scm | 25 +-
guix/scripts/copy.scm | 23 +-
guix/scripts/download.scm | 2 +-
guix/scripts/edit.scm | 29 +-
guix/scripts/lint.scm | 7 +-
guix/scripts/package.scm | 116 +-
guix/scripts/pull.scm | 18 +-
guix/self.scm | 8 +-
guix/serialization.scm | 13 +-
guix/status.scm | 26 +-
po/guix/POTFILES.in | 26 +
tests/channels.scm | 88 +-
tests/guix-package-net.sh | 33 +-
tests/lint.scm | 2 +-
tests/nar.scm | 36 +-
tests/packages.scm | 77 +-
tests/profiles.scm | 34 +-
243 files changed, 11846 insertions(+), 29356 deletions(-)
diff --cc gnu/packages/python-compression.scm
index 0000000,3792f37..e13227b
mode 000000,100644..100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@@ -1,0 -1,206 +1,207 @@@
+ ;;; GNU Guix --- Functional package management for GNU
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2017 Nils Gillmann <address@hidden>
+ ;;; Copyright © 2017 Julien Lepiller <address@hidden>
+ ;;; Copyright © 2018, 2019 Efraim Flashner <address@hidden>
+ ;;;
+ ;;; This file is part of GNU Guix.
+ ;;;
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
+ ;;; under the terms of the GNU General Public License as published by
+ ;;; the Free Software Foundation; either version 3 of the License, or (at
+ ;;; your option) any later version.
+ ;;;
+ ;;; GNU Guix is distributed in the hope that it will be useful, but
+ ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+ ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ;;; GNU General Public License for more details.
+ ;;;
+ ;;; You should have received a copy of the GNU General Public License
+ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+ (define-module (gnu packages python-compression)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix utils)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages maths)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz))
+
+ (define-public python-lzo
+ (package
+ (name "python-lzo")
+ (version "1.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "python-lzo" version))
+ (sha256
+ (base32
+ "0iakqgd51n1cd7r3lpdylm2rgbmd16y74cra9kcapwg84mlf9a4p"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:test-target "check"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-setuppy
+ (lambda _
+ (substitute* "setup.py"
+ (("include_dirs.append\\(.*\\)")
+ (string-append "include_dirs.append('"
+ (assoc-ref %build-inputs "lzo")
+ "/include/lzo"
+ "')")))
+ #t)))))
+ (inputs
+ `(("lzo" ,lzo)))
+ (home-page "https://github.com/jd-boyd/python-lzo";)
+ (synopsis "Python bindings for the LZO data compression library")
+ (description
+ "Python-LZO provides Python bindings for LZO, i.e. you can access
+ the LZO library from your Python scripts thereby compressing ordinary
+ Python strings.")
+ (license license:gpl2+)))
+
+ (define-public python2-lzo
+ (package-with-python2 python-lzo))
+
+ (define-public python-lz4
+ (package
+ (name "python-lz4")
+ (version "0.10.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "lz4" version))
+ (sha256
+ (base32
+ "0ghv1xbaq693kgww1x9c22bplz479ls9szjsaa4ig778ls834hm0"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-nose" ,python-nose)
+ ("python-setuptools-scm" ,python-setuptools-scm)))
+ (home-page "https://github.com/python-lz4/python-lz4";)
+ (synopsis "LZ4 bindings for Python")
+ (description
+ "This package provides python bindings for the lz4 compression library
+ by Yann Collet. The project contains bindings for the LZ4 block format and
+ the LZ4 frame format.")
+ (license license:bsd-3)))
+
+ (define-public python2-lz4
+ (package-with-python2 python-lz4))
+
+ (define-public python-lzstring
+ (package
+ (name "python-lzstring")
+ (version "1.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "lzstring" version))
+ (sha256
+ (base32
+ "18ly9pppy2yspxzw7k1b23wk77k7m44rz2g0271bqgqrk3jn3yhs"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-future" ,python-future)))
+ (home-page "https://github.com/gkovacs/lz-string-python";)
+ (synopsis "String compression")
+ (description "Lz-string is a string compressor library for Python.")
+ (license license:expat)))
+
+ (define-public python2-lzstring
+ (package-with-python2 python-lzstring))
+
+ (define-public bitshuffle
+ (package
+ (name "bitshuffle")
+ (version "0.3.5")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "bitshuffle" version))
+ (sha256
+ (base32
+ "1823x61kyax4dc2hjmc1xraskxi1193y8lvxd03vqv029jrj8cjy"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove generated Cython files.
+ (delete-file "bitshuffle/h5.c")
+ (delete-file "bitshuffle/ext.c")
+ #t))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ; fail: https://github.com/h5py/h5py/issues/769
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-neon-detection
+ ;; Neon is only for aarch64 ATM
+ ;; see: https://github.com/kiyo-masui/bitshuffle/pull/73
+ (lambda _
+ (substitute* "src/bitshuffle_core.c"
+ (("#define USEARMNEON")
+ "#ifdef __aarch64__\n#define USEARMNEON\n#endif"))
+ #t))
+ (add-after 'unpack 'dont-build-native
+ (lambda _
+ (substitute* "setup.py"
+ (("'-march=native', ") ""))
+ #t)))))
+ (inputs
+ `(("numpy" ,python-numpy)
+ ("h5py" ,python-h5py)
+ ("hdf5" ,hdf5)))
+ (native-inputs
+ `(("cython" ,python-cython)))
+ (home-page "https://github.com/kiyo-masui/bitshuffle";)
+ (synopsis "Filter for improving compression of typed binary data")
+ (description "Bitshuffle is an algorithm that rearranges typed, binary
data
+ for improving compression, as well as a python/C package that implements this
+ algorithm within the Numpy framework.")
+ (license license:expat)))
+
+ (define-public bitshuffle-for-snappy
+ (package
+ (inherit bitshuffle)
+ (name "bitshuffle-for-snappy")
+ (build-system gnu-build-system)
+ (arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (with-output-to-file "Makefile"
- (lambda _
- (format #t "\
++ (substitute-keyword-arguments (package-arguments bitshuffle)
++ ((#:tests? _ #f) #f)
++ ((#:phases phases)
++ `(modify-phases %standard-phases
++ (replace 'configure
++ (lambda* (#:key outputs #:allow-other-keys)
++ (with-output-to-file "Makefile"
++ (lambda _
++ (format #t "\
+ libbitshuffle.so: src/bitshuffle.o src/bitshuffle_core.o src/iochain.o
lz4/lz4.o
+ \tgcc -O3 -ffast-math -std=c99 -o $@ -shared -fPIC $^
+
+ %.o: %.c
+ \tgcc -O3 -ffast-math -std=c99 -fPIC -Isrc -Ilz4 -c $< -o $@
+
+ PREFIX:=~a
+ LIBDIR:=$(PREFIX)/lib
+ INCLUDEDIR:=$(PREFIX)/include
+
+ install: libbitshuffle.so
+ \tinstall -dm755 $(LIBDIR)
+ \tinstall -dm755 $(INCLUDEDIR)
+ \tinstall -m755 libbitshuffle.so $(LIBDIR)
+ \tinstall -m644 src/bitshuffle.h $(INCLUDEDIR)
+ \tinstall -m644 src/bitshuffle_core.h $(INCLUDEDIR)
+ \tinstall -m644 src/iochain.h $(INCLUDEDIR)
+ \tinstall -m644 lz4/lz4.h $(INCLUDEDIR)
+ " (assoc-ref outputs "out"))))
- #t)))))
++ #t))))))
+ (inputs '())
+ (native-inputs '())))