[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Sun, 23 Oct 2016 18:21:13 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3
Merge: f08add0 903276d
Author: Mark H Weaver <address@hidden>
Date: Sun Oct 23 14:16:39 2016 -0400
Merge branch 'master' into core-updates
build-aux/hydra/gnu-system.scm | 3 +-
doc/emacs.texi | 8 +-
doc/guix.texi | 5 +-
gnu/local.mk | 8 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 30 +-
gnu/packages/backup.scm | 12 +-
gnu/packages/bioinformatics.scm | 48 ++++
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/display-managers.scm | 2 +
gnu/packages/emacs.scm | 22 ++
gnu/packages/ftp.scm | 73 ++---
gnu/packages/games.scm | 75 +++++
gnu/packages/gnome.scm | 64 +++++
gnu/packages/golang.scm | 4 +-
gnu/packages/guile.scm | 11 +-
gnu/packages/image.scm | 6 +-
gnu/packages/linux.scm | 51 +++-
gnu/packages/mail.scm | 82 +++++-
gnu/packages/make-bootstrap.scm | 11 +
gnu/packages/mp3.scm | 38 ++-
gnu/packages/music.scm | 172 ++++++++----
gnu/packages/networking.scm | 4 +-
gnu/packages/patches/hop-bigloo-4.0b.patch | 122 --------
.../lftp-dont-save-unknown-host-fingerprint.patch | 81 ------
.../patches/linux-libre-4.1-CVE-2016-5195.patch | 99 +++++++
.../notmuch-emacs-25-compatibility-fix.patch | 46 +++
.../patches/openssh-memory-exhaustion.patch | 39 +++
gnu/packages/patches/slim-login.patch | 35 +++
gnu/packages/patches/slim-reset.patch | 33 +++
gnu/packages/perl.scm | 4 +-
gnu/packages/psyc.scm | 145 ++++++++++
gnu/packages/python.scm | 292 +++++++++++++++++++-
gnu/packages/scheme.scm | 151 +++++-----
gnu/packages/search.scm | 28 +-
gnu/packages/ssh.scm | 1 +
gnu/packages/video.scm | 8 +-
gnu/packages/vim.scm | 71 ++++-
gnu/packages/vpn.scm | 4 +-
gnu/services/networking.scm | 23 +-
guix/import/pypi.scm | 2 +-
43 files changed, 1474 insertions(+), 455 deletions(-)
diff --cc gnu/local.mk
index df86b94,df9f8fc..adccab3
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -670,8 -669,18 +669,9 @@@ dist_patch_DATA =
%D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
%D%/packages/patches/libwmf-CVE-2015-4695.patch \
%D%/packages/patches/libwmf-CVE-2015-4696.patch \
- %D%/packages/patches/libx11-CVE-2016-7942.patch \
- %D%/packages/patches/libx11-CVE-2016-7943.patch \
- %D%/packages/patches/libxfixes-CVE-2016-7944.patch \
- %D%/packages/patches/libxi-CVE-2016-7945-CVE-2016-7946.patch \
- %D%/packages/patches/libxrandr-CVE-2016-7947-CVE-2016-7948.patch \
- %D%/packages/patches/libxrender-CVE-2016-7949.patch \
- %D%/packages/patches/libxrender-CVE-2016-7950.patch \
- %D%/packages/patches/libxtst-CVE-2016-7951-CVE-2016-7952.patch \
- %D%/packages/patches/libxv-CVE-2016-5407.patch \
- %D%/packages/patches/libxvmc-CVE-2016-7953.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
+ %D%/packages/patches/linux-pam-no-setfsuid.patch \
+ %D%/packages/patches/linux-libre-4.1-CVE-2016-5195.patch \
%D%/packages/patches/lirc-localstatedir.patch \
%D%/packages/patches/llvm-for-extempore.patch \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
diff --cc gnu/packages/make-bootstrap.scm
index 1b7352f,336ad2e..d2df69d
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@@ -181,8 -184,19 +181,19 @@@ for `sh' in $PATH, and without nscd, an
(("-Wl,-export-dynamic") "")))
,phases)))))
(inputs (if (%current-target-system)
- `(("bash" ,%bash-static))
+ `(("bash" ,static-bash))
'()))))
+ (tar (package (inherit tar)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'build 'set-shell-file-name
+ (lambda _
+ ;; Do not use "/bin/sh" to run programs; see
+ ;;
<http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
+ (substitute* "src/system.c"
+ (("/bin/sh") "sh")
+ (("execv ") "execvp "))
+ #t)))))))
(finalize (compose static-package
package-with-relocatable-glibc)))
`(,@(map (match-lambda
diff --cc gnu/packages/python.scm
index 559bdc6,2407368..929ea20
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -11134,34 -11094,239 +11169,271 @@@ provide extendible implementations of c
focus on building massively scalable web applications.")
(license license:expat)))
+(define-public python-betamax
+ (package
+ (name "python-betamax")
+ (version "0.8.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "betamax" version))
+ (sha256
+ (base32
+ "18f8v5gng3j773jlbbzx4rg1i4y2zw3m2l1zpmbvp8bh5a2q1i42"))))
+ (build-system python-build-system)
+ (arguments
+ '(;; Many tests fail because they require networking.
+ #:tests? #f))
+ (inputs
+ `(("python-requests" ,python-requests)))
+ (home-page "https://github.com/sigmavirus24/betamax";)
+ (synopsis "Record HTTP interactions with python-requests")
+ (description "Betamax will record your test suite's HTTP interactions and
+replay them during future tests. It is designed to work with
python-requests.")
+ (license license:expat)
+ (properties `((python2-variant . ,(delay python2-betamax))))))
+
+(define-public python2-betamax
+ (let ((base (package-with-python2 (strip-python2-variant python-betamax))))
+ (package
+ (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
++
+ (define-public python-s3transfer
+ (package
+ (name "python-s3transfer")
+ (version "0.1.8")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "s3transfer" version))
+ (sha256
+ (base32
+ "1jivjkp3xqif9gzr5fiq28jsskmh50vzzd7ldsb4rbyiw1iyv3hy"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-docutils" ,python-docutils)))
+ (inputs
+ `(("python-botocore" ,python-botocore)))
+ (synopsis "Amazon S3 Transfer Manager")
+ (description "S3transfer is a Python library for managing Amazon S3
+ transfers.")
+ (home-page "https://github.com/boto/s3transfer";)
+ (license license:asl2.0)
+ (properties `((python2-variant . ,(delay python2-s3transfer))))))
+
+ (define-public python2-s3transfer
+ (let ((base (package-with-python2 (strip-python2-variant
python-s3transfer))))
+ (package
+ (inherit base)
+ (native-inputs
+ `(("python2-futures" ,python2-futures)
+ ("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
+
+ (define-public python-setproctitle
+ (package
+ (name "python-setproctitle")
+ (version "1.1.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "setproctitle" version))
+ (sha256
+ (base32
+ "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'patch-Makefile
+ ;; Stricly this is only required for the python2 variant.
+ ;; But adding a phase in an inherited package seems to be
+ ;; cumbersum. So we patch even for python3.
+ (lambda _
+ (let ((nose (assoc-ref %build-inputs "python2-nose")))
+ (when nose
+ (substitute* "Makefile"
+ (("\\$\\(PYTHON\\) [^ ]which nosetests[^ ] ")
+ (string-append nose "/bin/nosetests "))))
+ #t)))
+ (replace 'check
+ (lambda _
+ (setenv "PYTHON" (or (which "python3") (which "python")))
+ (setenv "PYCONFIG" (or (which "python3-config")
+ (which "python-config")))
+ (setenv "CC" "gcc")
+ ;; No need to extend PYTHONPATH to find the built package, since
+ ;; the Makefile will build anyway
+ (zero? (system* "make" "check")))))))
+ (native-inputs
+ `(("procps" ,procps))) ; required for tests
+ (home-page
+ "https://github.com/dvarrazzo/py-setproctitle";)
+ (synopsis
+ "Setproctitle implementation for Python to customize the process title")
+ (description "The library allows a process to change its title (as displayed
+ by system tools such as ps and top).
+
+ Changing the title is mostly useful in multi-process systems, for
+ example when a master process is forked: changing the children's title
+ allows to identify the task each process is busy with. The technique
+ is used by PostgreSQL and the OpenSSH Server for example.")
+ (license license:bsd-3)
+ (properties `((python2-variant . ,(delay python2-setproctitle))))))
+
+ (define-public python2-setproctitle
+ (let ((base (package-with-python2
+ (strip-python2-variant python-setproctitle))))
+ (package
+ (inherit base)
+ (native-inputs `(("python2-nose" ,python2-nose)
+ ,@(package-native-inputs base))))))
+
+ (define-public python-validictory
+ (package
+ (name "python-validictory")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "validictory" version))
+ (sha256
+ (base32
+ "1zf1g9sw47xzp5f80bd94pb42j9yqv82lcrgcvdwr6nkaphfi37q"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'bootstrap
+ ;; Move the tests out of the package directory to avoid
+ ;; packaging them.
+ (lambda* _
+ (rename-file "validictory/tests" "tests")
+ (delete-file "tests/__init__.py")))
+ (replace 'check
+ (lambda _
+ ;; Extend PYTHONPATH so the built package will be found.
+ (setenv "PYTHONPATH"
+ (string-append (getcwd) "/build/lib:"
+ (getenv "PYTHONPATH")))
+ (zero? (system* "py.test" "-vv" )))))))
+ (native-inputs
+ `(("python-pytest" ,python-pytest)))
+ (home-page
+ "https://github.com/jamesturk/validictory";)
+ (synopsis "General purpose Python data validator")
+ (description "It allows validation of arbitrary Python data structures.
+
+ The schema format is based on the JSON Schema
+ proposal (http://json-schema.org), so combined with json the library is also
+ useful as a validator for JSON data.")
+ (license license:expat)
+ (properties `((python2-variant . ,(delay python2-validictory))))))
+
+ (define-public python2-validictory
+ (let ((base (package-with-python2
+ (strip-python2-variant python-validictory))))
+ (package
+ (inherit base)
+ (native-inputs `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
+
+ (define-public python-aniso8601
+ (package
+ (name "python-aniso8601")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "aniso8601" version))
+ (sha256
+ (base32
+ "1k5mjg9iqbjfslb5prrsfz7dhlvi6s35p1jxq8dm87w1b7dn5i2g"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-dateutil-2" ,python-dateutil-2)))
+ (home-page
+ "https://bitbucket.org/nielsenb/aniso8601";)
+ (synopsis
+ "Python library for parsing ISO 8601 strings")
+ (description
+ "This package contains a library for parsing ISO 8601 datetime
strings.")
+ (license license:bsd-3)))
+
+ (define-public python-flask-restful
+ (package
+ (name "python-flask-restful")
+ (version "0.3.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "Flask-RESTful" version))
+ (sha256
+ (base32
+ "0hjcmdb56b7z4bkw848lxfkyrpnkwzmqn2dgnlv12mwvjpzsxr6c"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-aniso8601" ,python-aniso8601)
+ ("python-flask" ,python-flask)
+ ("python-pycrypto" ,python-pycrypto)
+ ("python-pytz" ,python-pytz)))
+ (native-inputs
+ `(;; Optional dependency of Flask. Tests need it.
+ ("python-blinker" ,python-blinker)
+ ("python-mock" ,python-mock) ; For tests
+ ("python-nose" ,python-nose) ; For tests
+ ("python-sphinx" ,python-sphinx)))
+ (home-page
+ "https://www.github.com/flask-restful/flask-restful/";)
+ (synopsis
+ "Flask module for creating REST APIs")
+ (description
+ "This package contains a Flask module for creating REST APIs.")
+ (license license:bsd-3)))
+
+ (define-public python-flask-basicauth
+ (package
+ (name "python-flask-basicauth")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "Flask-BasicAuth" version))
+ (sha256
+ (base32
+ "1zq1spkjr4sjdnalpp8wl242kdqyk6fhbnhr8hi4r4f0km4bspnz"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-flask" ,python-flask)))
+ (home-page
+ "https://github.com/jpvanhal/flask-basicauth";)
+ (synopsis
+ "HTTP basic access authentication for Flask")
+ (description
+ "This package provides HTTP basic access authentication for Flask.")
+ (license license:bsd-3)))
+
+ (define-public python-flask-sqlalchemy
+ (package
+ (name "python-flask-sqlalchemy")
+ (version "2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "Flask-SQLAlchemy" version))
+ (sha256
+ (base32
+ "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-flask" ,python-flask)
+ ("python-sqlalchemy" ,python-sqlalchemy)))
+ (home-page
+ "http://github.com/mitsuhiko/flask-sqlalchemy";)
+ (synopsis
+ "Module adding SQLAlchemy support to your Flask application")
+ (description
+ "This package adds SQLAlchemy support to your Flask application.")
+ (license license:bsd-3)))