[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into staging
|
From: |
Leo Famulari |
|
Subject: |
01/02: Merge branch 'master' into staging |
|
Date: |
Thu, 24 Nov 2016 03:56:35 +0000 (UTC) |
lfam pushed a commit to branch staging
in repository guix.
commit 2ac7d54616819c65405ea27260dbff462160f290
Merge: 6132093 1c9f78e
Author: Leo Famulari <address@hidden>
Date: Wed Nov 23 22:24:52 2016 -0500
Merge branch 'master' into staging
.gitignore | 1 +
Makefile.am | 9 +-
config-daemon.ac | 2 +
doc/guix.texi | 86 +-
gnu/build/marionette.scm | 17 +-
gnu/local.mk | 11 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/aspell.scm | 10 +-
gnu/packages/audio.scm | 58 +-
gnu/packages/bioinformatics.scm | 11 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/chez.scm | 15 +-
gnu/packages/connman.scm | 4 +-
gnu/packages/crypto.scm | 2 +-
gnu/packages/cryptsetup.scm | 65 ++
gnu/packages/databases.scm | 26 +-
gnu/packages/dico.scm | 10 +-
gnu/packages/emacs.scm | 69 +-
gnu/packages/firmware.scm | 92 ++
gnu/packages/ftp.scm | 2 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gcc.scm | 2 +-
gnu/packages/gnome.scm | 5 +-
gnu/packages/gnupg.scm | 17 +-
gnu/packages/gnuzilla.scm | 34 +-
gnu/packages/grub.scm | 11 +-
gnu/packages/gstreamer.scm | 33 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile.scm | 3 +-
gnu/packages/image.scm | 33 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/linux.scm | 33 +-
gnu/packages/mail.scm | 33 +-
gnu/packages/maths.scm | 1 -
gnu/packages/mp3.scm | 1 -
gnu/packages/mpd.scm | 6 +-
gnu/packages/music.scm | 201 ++--
gnu/packages/networking.scm | 6 +-
gnu/packages/package-management.scm | 8 +-
.../patches/gd-fix-chunk-size-on-boundaries.patch | 102 ++
.../gd-fix-truecolor-format-correction.patch | 95 ++
gnu/packages/patches/guile-repl-server-test.patch | 48 +
.../patches/handbrake-pkg-config-path.patch | 24 +
gnu/packages/patches/icecat-CVE-2016-9064.patch | 996 ++++++++++++++++++++
gnu/packages/patches/libtiff-CVE-2016-5652.patch | 47 -
gnu/packages/patches/libtiff-CVE-2016-9273.patch | 41 -
gnu/packages/patches/lvm2-static-link.patch | 14 +
gnu/packages/patches/pixman-CVE-2016-5296.patch | 19 +
gnu/packages/pdf.scm | 1 -
gnu/packages/perl.scm | 33 +-
gnu/packages/php.scm | 334 +++++++
gnu/packages/psyc.scm | 2 +-
gnu/packages/python.scm | 14 +-
gnu/packages/qemu.scm | 1 -
gnu/packages/ruby.scm | 26 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/syndication.scm | 2 +-
gnu/packages/telephony.scm | 5 +-
gnu/packages/video.scm | 123 ++-
gnu/packages/vim.scm | 6 +-
gnu/packages/w3m.scm | 22 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 51 +-
gnu/packages/xiph.scm | 4 +-
gnu/services/dict.scm | 20 +-
gnu/services/networking.scm | 68 +-
gnu/services/version-control.scm | 141 +++
gnu/system.scm | 3 +-
gnu/system/vm.scm | 2 -
gnu/tests/base.scm | 20 +-
guix/build/syscalls.scm | 220 ++++-
guix/derivations.scm | 4 +
guix/download.scm | 159 +++-
guix/gexp.scm | 3 -
guix/profiles.scm | 4 -
guix/scripts/download.scm | 58 +-
guix/scripts/lint.scm | 43 +-
guix/scripts/perform-download.scm | 113 +++
guix/scripts/system.scm | 3 -
guix/store.scm | 29 +-
guix/tests/http.scm | 120 +++
guix/ui.scm | 6 +-
nix/libstore/build.cc | 36 +-
nix/libstore/builtins.cc | 79 ++
nix/libstore/builtins.hh | 44 +
nix/libstore/worker-protocol.hh | 5 +-
nix/local.mk | 5 +-
nix/nix-daemon/nix-daemon.cc | 9 +
nix/scripts/download.in | 11 +
tests/derivations.scm | 74 ++
tests/gexp.scm | 59 +-
tests/guix-download.sh | 9 +-
tests/lint.scm | 133 +--
tests/syscalls.scm | 45 +
94 files changed, 3801 insertions(+), 680 deletions(-)
diff --cc gnu/packages/ruby.scm
index 31eb8df,baae553..6471f2f
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -100,9 -102,28 +100,9 @@@ a focus on simplicity and productivity.
(home-page "https://ruby-lang.org";)
(license license:ruby)))
-(define ruby-2.3.3
- (package
- (inherit ruby)
- (version "2.3.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/";
- (version-major+minor version)
- "/ruby-" version ".tar.xz"))
- (sha256
- (base32
- "1p0rfk0blrbfjcnv0vb0ha4hxflgkfhv9zbzp4vvld2pi31ahkqs"))
- (modules '((guix build utils)))
- (snippet `(begin
- ;; Remove bundled libffi
- (delete-file-recursively "ext/fiddle/libffi-3.2.1")
- #t))))))
-
(define-public ruby-2.2
(package (inherit ruby)
- (version "2.2.5")
+ (version "2.2.6")
(source
(origin
(method url-fetch)