[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
02/02: Merge branch 'master' into staging |
|
Date: |
Wed, 4 Oct 2017 18:46:54 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 7716ccd59c0c17f9399d73abec05001b775d100b
Merge: 86edcc5 a35532f
Author: Marius Bakke <address@hidden>
Date: Thu Oct 5 00:45:38 2017 +0200
Merge branch 'master' into staging
.mailmap | 1 +
Makefile.am | 13 +
build-aux/cuirass/gnu-system.scm | 47 ++
build-aux/hydra/evaluate.scm | 13 +-
build-aux/hydra/gnu-system.scm | 19 +
doc/guix.texi | 155 +++++-
gnu/local.mk | 11 +-
gnu/packages/accessibility.scm | 45 +-
gnu/packages/android.scm | 38 ++
gnu/packages/aspell.scm | 2 +-
gnu/packages/audio.scm | 66 ++-
gnu/packages/autotools.scm | 5 +-
gnu/packages/bdw-gc.scm | 12 +-
gnu/packages/calendar.scm | 7 +-
gnu/packages/check.scm | 24 +
gnu/packages/ci.scm | 17 +-
gnu/packages/code.scm | 6 +-
gnu/packages/compression.scm | 2 +-
gnu/packages/cran.scm | 17 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/databases.scm | 70 ++-
gnu/packages/dav.scm | 5 +-
gnu/packages/dns.scm | 10 +-
gnu/packages/dunst.scm | 17 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/emacs.scm | 199 +++++++-
gnu/packages/embedded.scm | 119 +++--
gnu/packages/engineering.scm | 154 +++++-
gnu/packages/finance.scm | 62 +--
gnu/packages/flashing-tools.scm | 67 ++-
gnu/packages/fonts.scm | 27 +
gnu/packages/fpga.scm | 2 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gnome.scm | 76 ++-
gnu/packages/gnunet.scm | 6 +-
gnu/packages/gnuzilla.scm | 28 +-
gnu/packages/graphviz.scm | 2 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/imagemagick.scm | 7 +-
gnu/packages/java.scm | 564 +++++++++++++++++++++
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/libusb.scm | 2 +-
gnu/packages/linux.scm | 12 +-
gnu/packages/lirc.scm | 14 +-
gnu/packages/lisp.scm | 32 +-
gnu/packages/mail.scm | 10 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/messaging.scm | 132 +++--
gnu/packages/mpi.scm | 1 +
gnu/packages/music.scm | 12 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/ocaml.scm | 351 +++++++++++++
.../patches/clisp-remove-failing-test.patch | 43 ++
gnu/packages/patches/cube-nocheck.patch | 16 +
.../patches/graphicsmagick-CVE-2017-14649.patch | 210 ++++++++
.../ocaml-graph-honor-source-date-epoch.patch | 34 ++
gnu/packages/patches/openocd-nrf52.patch | 64 +--
.../python-nose-timer-drop-ordereddict.patch | 44 ++
gnu/packages/patches/qemu-CVE-2017-13711.patch | 89 ----
gnu/packages/patches/qemu-CVE-2017-14167.patch | 69 ---
.../patches/xorg-server-CVE-2017-10971.patch | 153 ------
.../patches/xorg-server-CVE-2017-10972.patch | 35 --
gnu/packages/php.scm | 4 +-
gnu/packages/profiling.scm | 399 +++++++++++++++
gnu/packages/pulseaudio.scm | 31 ++
gnu/packages/python.scm | 194 ++++++-
gnu/packages/qt.scm | 16 +-
gnu/packages/ruby.scm | 229 ++++++++-
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 20 +-
gnu/packages/tcl.scm | 3 +-
gnu/packages/terminals.scm | 9 +-
gnu/packages/tls.scm | 18 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/uml.scm | 2 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 6 +-
gnu/packages/vpn.scm | 7 +-
gnu/packages/web.scm | 34 +-
gnu/packages/wxwidgets.scm | 2 +-
gnu/packages/xdisorg.scm | 35 ++
gnu/packages/xorg.scm | 10 +-
gnu/services/version-control.scm | 119 ++++-
gnu/services/web.scm | 6 +
gnu/system/vm.scm | 22 +-
gnu/tests/version-control.scm | 176 +++++++
guix/build-system/ant.scm | 6 +
guix/build/ant-build-system.scm | 38 +-
guix/import/print.scm | 164 ++++++
guix/import/utils.scm | 90 +++-
guix/scripts/import.scm | 2 +-
guix/scripts/import/json.scm | 102 ++++
tests/import-utils.scm | 40 +-
tests/print.scm | 64 +++
95 files changed, 4373 insertions(+), 751 deletions(-)
diff --cc gnu/local.mk
index 0afda9f,6db176b..392ca82
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -574,6 -578,8 +577,7 @@@ dist_patch_DATA =
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/crossmap-allow-system-pysam.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
+ %D%/packages/patches/cube-nocheck.patch \
- %D%/packages/patches/curl-bounds-check.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \
diff --cc gnu/packages/databases.scm
index 5f01006,fbfb341..2afc94c
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -221,39 -224,79 +223,78 @@@ SQL, Key/Value, XML/XQuery or Java Obje
`(#:tests? #f ; no check target available
#:disallowed-references ("doc")
#:phases
- (alist-replace
- 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- ;; '--docdir' is not honored, so we need to patch.
- (substitute* "dist/Makefile.in"
- (("docdir[[:blank:]]*=.*")
- (string-append "docdir = " doc "/share/doc/bdb")))
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ ;; '--docdir' is not honored, so we need to patch.
+ (substitute* "dist/Makefile.in"
+ (("docdir[[:blank:]]*=.*")
+ (string-append "docdir = " doc "/share/doc/bdb")))
- (zero?
- (system* "./dist/configure"
- (string-append "--prefix=" out)
- (string-append "CONFIG_SHELL=" (which "bash"))
- (string-append "SHELL=" (which "bash"))
+ (zero?
+ (system* "./dist/configure"
+ (string-append "--prefix=" out)
+ (string-append "CONFIG_SHELL=" (which "bash"))
+ (string-append "SHELL=" (which "bash"))
- ;; Bdb doesn't recognize aarch64 as an architecture.
- ,@(if (string=? "aarch64-linux" (%current-system))
- '("--build=aarch64-unknown-linux-gnu")
- '())
+ ;; Bdb doesn't recognize aarch64 as an architecture.
+ ,@(if (string=? "aarch64-linux" (%current-system))
+ '("--build=aarch64-unknown-linux-gnu")
+ '())
- ;; Remove 7 MiB of .a files.
- "--disable-static"
+ ;; Remove 7 MiB of .a files.
+ "--disable-static"
- ;; The compatibility mode is needed by some packages,
- ;; notably iproute2.
- "--enable-compat185"
+ ;; The compatibility mode is needed by some packages,
+ ;; notably iproute2.
+ "--enable-compat185"
- ;; The following flag is needed so that the inclusion
- ;; of db_cxx.h into C++ files works; it leads to
- ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
- "--enable-cxx"))))
- %standard-phases)))))
+ ;; The following flag is needed so that the inclusion
+ ;; of db_cxx.h into C++ files works; it leads to
+ ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
+ "--enable-cxx"))))))))))
+ (define-public es-dump-restore
+ (package
+ (name "es-dump-restore")
+ (version "2.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (rubygems-uri "es_dump_restore" version))
+ (sha256
+ (base32
+ "020yk7f1hw48clmf5501z3xv9shsdchyymcv0y2cci2c1xvr1mim"))))
+ (build-system ruby-build-system)
+ (arguments
+ '(#:tests? #f ;; No testsuite.
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-bin-es_dump_restore
+ (lambda* (#:key outputs #:allow-other-keys)
+ (wrap-program (string-append (assoc-ref outputs "out")
+ "/bin/es_dump_restore")
+ `("GEM_PATH" ":" prefix (,(string-append
+ (getenv "GEM_PATH")
+ ":"
+ (getenv "GEM_HOME")))))
+ #t)))))
+ (propagated-inputs
+ `(("ruby-httpclient" ,ruby-httpclient)
+ ("ruby-multi-json" ,ruby-multi-json)
+ ("ruby-progress_bar" ,ruby-progress_bar)
+ ("ruby-rubyzip" ,ruby-rubyzip)
+ ("ruby-thor" ,ruby-thor)))
+ (synopsis "Utility for dumping and restoring ElasticSearch indexes")
+ (description
+ "This package provides a utility for dumping the contents of an
+ ElasticSearch index to a compressed file and restoring the dumpfile back to an
+ ElasticSearch server")
+ (home-page "https://github.com/patientslikeme/es_dump_restore";)
+ (license license:expat)))
+
(define-public leveldb
(package
(name "leveldb")
diff --cc gnu/packages/ruby.scm
index ab8e572,f2333db..83a8901
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -184,22 -205,43 +184,48 @@@ a focus on simplicity and productivity.
`(#:test-target "test"
#:parallel-tests? #f
#:phases
- (alist-cons-before
- 'configure 'replace-bin-sh
- (lambda _
- (substitute* '("Makefile.in"
- "ext/pty/pty.c"
- "io.c"
- "lib/mkmf.rb"
- "process.c")
- (("/bin/sh") (which "sh"))))
- %standard-phases)))))
+ (modify-phases %standard-phases
+ (add-before 'configure 'replace-bin-sh
+ (lambda _
+ (substitute* '("Makefile.in"
+ "ext/pty/pty.c"
+ "io.c"
+ "lib/mkmf.rb"
+ "process.c")
+ (("/bin/sh") (which "sh")))
+ #t)))))))
+
+(define (gem-directory ruby-version)
+ "Return the relative gem install directory for RUBY-VERSION."
+ (string-append "/lib/ruby/gems/" (version-major+minor ruby-version)
+ ".0/gems"))
+ (define-public ruby-highline
+ (package
+ (name "ruby-highline")
+ (version "1.7.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (rubygems-uri "highline" version))
+ (sha256
+ (base32
+ "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"))))
+ (build-system ruby-build-system)
+ (arguments
+ `(#:tests? #f)) ;; TODO: NameError: uninitialized constant SPEC
+ (native-inputs
+ `(("bundler" ,bundler)
+ ("ruby-code-statistics" ,ruby-code-statistics)))
+ (synopsis
+ "HighLine helps you build command-line interfaces")
+ (description
+ "HighLine provides a high-level IO library that provides validation,
+ type conversion, and more for command-line interfaces. HighLine also includes
+ a menu system for providing multiple options to the user.")
+ (home-page "https://github.com/JEG2/highline";)
+ (license (list license:gpl2 license:ruby))))
+
(define-public ruby-hoe
(package
(name "ruby-hoe")