[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 9 Feb 2018 01:51:46 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit efe2a2833c6d306d0c60127fdfebaff6dc415b4c
Merge: 53f826c 8d0edc8
Author: Mark H Weaver <address@hidden>
Date: Fri Feb 9 01:46:34 2018 -0500
Merge branch 'master' into core-updates
Makefile.am | 3 +
configure.ac | 10 +-
doc/guix.texi | 109 ++++++-
etc/guix-daemon.cil.in | 285 +++++++++++++++++++
gnu/build/linux-boot.scm | 1 -
gnu/local.mk | 13 +-
gnu/packages/admin.scm | 61 +++-
gnu/packages/audio.scm | 31 +-
gnu/packages/code.scm | 4 +-
gnu/packages/compression.scm | 7 +-
gnu/packages/conky.scm | 4 +-
gnu/packages/cran.scm | 213 +++++++++++++-
gnu/packages/databases.scm | 4 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/documentation.scm | 18 +-
gnu/packages/emacs.scm | 126 +++++++-
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnunet.scm | 5 +-
gnu/packages/gps.scm | 71 ++++-
gnu/packages/guile.scm | 7 +-
gnu/packages/julia.scm | 12 +
gnu/packages/linux.scm | 8 +-
gnu/packages/lua.scm | 28 +-
gnu/packages/mail.scm | 15 +-
gnu/packages/maths.scm | 34 +++
gnu/packages/mc.scm | 15 +-
gnu/packages/mpi.scm | 23 +-
gnu/packages/music.scm | 29 +-
gnu/packages/networking.scm | 21 +-
gnu/packages/nim.scm | 13 +-
gnu/packages/onc-rpc.scm | 1 +
gnu/packages/password-utils.scm | 4 +-
gnu/packages/patches/gpsbabel-minizip.patch | 13 +
gnu/packages/patches/gpsbabel-qstring.patch | 69 +++++
.../patches/hwloc-tests-without-sysfs.patch | 42 +++
gnu/packages/patches/luajit-symlinks.patch | 25 --
gnu/packages/patches/mpv-CVE-2018-6360-1.patch | 138 +++++++++
gnu/packages/patches/mpv-CVE-2018-6360-2.patch | 59 ++++
gnu/packages/patches/mpv-CVE-2018-6360-3.patch | 84 ++++++
gnu/packages/patches/mupdf-CVE-2017-17858.patch | 111 ++++++++
gnu/packages/patches/p7zip-CVE-2017-17969.patch | 35 +++
gnu/packages/pdf.scm | 3 +-
gnu/packages/perl-check.scm | 4 +-
gnu/packages/python.scm | 148 +++++++++-
gnu/packages/rdf.scm | 5 +-
gnu/packages/sawfish.scm | 5 +-
gnu/packages/scheme.scm | 47 +--
gnu/packages/shells.scm | 4 +-
gnu/packages/ssh.scm | 59 ++--
gnu/packages/syncthing.scm | 316 +++++++++++++++++++--
gnu/packages/tcl.scm | 5 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 5 +-
gnu/packages/web.scm | 16 +-
gnu/packages/xorg.scm | 4 +-
guix/build-system/emacs.scm | 3 +-
guix/build/emacs-build-system.scm | 92 ++++--
guix/build/emacs-utils.scm | 11 +-
59 files changed, 2237 insertions(+), 261 deletions(-)
diff --cc gnu/local.mk
index 3da59ec,2ef483d..f20d104
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -719,8 -717,10 +719,10 @@@ dist_patch_DATA =
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
+ %D%/packages/patches/gpm-glibc-2.26.patch \
+ %D%/packages/patches/gpsbabel-minizip.patch \
+ %D%/packages/patches/gpsbabel-qstring.patch \
%D%/packages/patches/graphite2-ffloat-store.patch \
- %D%/packages/patches/grep-gnulib-lock.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/groff-source-date-epoch.patch \
%D%/packages/patches/gsl-test-i686.patch \
@@@ -900,8 -922,10 +905,9 @@@
%D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mupdf-build-with-latest-openjpeg.patch \
+ %D%/packages/patches/mupdf-CVE-2017-17858.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mutt-store-references.patch \
- %D%/packages/patches/ncurses-CVE-2017-10684-10685.patch \
%D%/packages/patches/net-tools-bitrot.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netcdf-tst_h_par.patch \
diff --cc gnu/packages/documentation.scm
index c870084,dd9d51b..eebd382
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@@ -5,7 -5,7 +5,8 @@@
;;; Copyright © 2016 Roel Janssen <address@hidden>
;;; Copyright © 2016 Thomas Danckaert <address@hidden>
;;; Copyright © 2017 Kei Kebreau <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/mail.scm
index fcb3472,b0bb590..e085c2d
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@@ -545,7 -546,8 +546,8 @@@ security functionality including PGP, S
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; for gtester
- ("emacs" ,emacs-minimal)))
+ ("emacs" ,emacs-minimal)
- ("tzdata" ,tzdata-2017a))) ;for mu/test/test-mu-query.c
++ ("tzdata" ,tzdata-for-tests))) ;for mu/test/test-mu-query.c
;; TODO: Add webkit and gtk to build the mug GUI.
(inputs
`(("xapian" ,xapian)
diff --cc gnu/packages/onc-rpc.scm
index 5997571,61a643b..03d51d9
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@@ -1,7 -1,8 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 John Darrington <address@hidden>
-;;; Copyright © 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2017, 2018 Leo Famulari <address@hidden>
+ ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/python.scm
index 40c6077,777590b..8ee85f7
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -12502,3 -12416,142 +12501,142 @@@ style guide, even if the original code
(define-public python2-yapf
(package-with-python2 python-yapf))
+
+ (define-public python-gyp
+ (let ((commit "5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f")
+ (revision "0"))
+ (package
+ (name "python-gyp")
+ ;; Google does not release versions,
+ ;; based on second most recent commit date.
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ ;; Google does not release tarballs,
+ ;; git checkout is needed.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://chromium.googlesource.com/external/gyp";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fr7nxcrk292djmxzpcjaphnsd123k31gp8jnd91vwknhq6snmv9"))))
+ (build-system python-build-system)
+ (home-page "https://gyp.gsrc.io/";)
+ (synopsis "GYP is a Meta-Build system")
+ (description
+ "GYP builds build systems for large, cross platform applications.
+ It can be used to generate XCode projects, Visual Studio projects, Ninja build
+ files, and Makefiles.")
+ (license license:bsd-3))))
+
+ (define-public python2-gyp
+ (package-with-python2 python-gyp))
+
+ (define-public python-whatever
+ (package
+ (name "python-whatever")
+ (version "0.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Suor/whatever/archive/"; version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1iqvnaf0zpc6b4rvbqq4xy45mszcscyzpzknv8wg6j84pbp22sap"))
+ (file-name (string-append name "-" version ".tar.gz"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "py.test"))))))
+ (native-inputs
- `(("python-pytest-3.0" ,python-pytest-3.0)))
++ `(("python-pytest" ,python-pytest)))
+ (home-page "http://github.com/Suor/whatever";)
+ (synopsis "Make anonymous functions by partial application of operators")
+ (description "@code{whatever} provides an easy way to make anonymous
+ functions by partial application of operators.")
+ (license license:bsd-3)))
+
+ (define-public python2-whatever
+ (package-with-python2 python-whatever))
+
+ (define-public python-funcy
+ (package
+ (name "python-funcy")
+ (version "1.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Suor/funcy/archive/"; version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1fanxivsip29vgarw6dn39xym3q4pbxcpa11plpp548lvxajpahz"))
+ (file-name (string-append name "-" version ".tar.gz"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "py.test"))))))
+ (native-inputs
- `(("python-pytest-3.0" ,python-pytest-3.0)
++ `(("python-pytest" ,python-pytest)
+ ("python-pytest-warnings" ,python-pytest-warnings)
+ ("python-whatever" ,python-whatever)))
+ (home-page "http://github.com/Suor/funcy";)
+ (synopsis "Functional tools")
+ (description "@code{funcy} is a library that provides functional tools.
+ Examples are:
+ @enumerate
+ @item merge - Merges collections of the same type
+ @item walk - Type-preserving map
+ @item select - Selects a part of a collection
+ @item take - Takes the first n items of a collection
+ @item first - Takes the first item of a collection
+ @item remove - Predicated-removes items of a collection
+ @item concat - Concatenates two collections
+ @item flatten - Flattens a collection with subcollections
+ @item distinct - Returns only distinct items
+ @item split - Predicated-splits a collection
+ @item split_at - Splits a collection at a given item
+ @item group_by - Groups items by group
+ @item pairwise - Pairs off adjacent items
+ @item partial - Partially-applies a function
+ @item curry - Curries a function
+ @item compose - Composes functions
+ @item complement - Complements a predicate
+ @item all_fn - \"all\" with predicate
+ @end enumerate")
+ (license license:bsd-3)))
+
+ (define-public python2-funcy
+ (package-with-python2 python-funcy))
+
+ (define-public python-isoweek
+ (package
+ (name "python-isoweek")
+ (version "1.3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "isoweek" version))
+ (sha256
+ (base32
+ "1s7zsf0pab0l9gn6456qadnz5i5h90hafcjwnhx5mq23qjxggwvk"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/gisle/isoweek";)
+ (synopsis "Objects representing a week")
+ (description "The @code{isoweek} module provide the class Week that
+ implements the week definition of ISO 8601. This standard also defines
+ a notation for identifying weeks; yyyyWww (where the W is a literal).
+ Week instances stringify to this form.")
+ (license license:bsd-3)))
+
+ (define-public python2-isoweek
+ (package-with-python2 python-isoweek))