[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into staging
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into staging |
|
Date: |
Fri, 9 Dec 2016 17:13:23 +0000 (UTC) |
civodul pushed a commit to branch staging
in repository guix.
commit f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5
Merge: 13b5f44 2608e40
Author: Ludovic Courtès <address@hidden>
Date: Fri Dec 9 18:11:14 2016 +0100
Merge remote-tracking branch 'origin/master' into staging
Makefile.am | 1 +
build-aux/hydra/gnu-system.scm | 20 +-
doc/guix.texi | 53 +-
gnu/build/cross-toolchain.scm | 178 +
gnu/local.mk | 9 +
gnu/packages/admin.scm | 7 +-
gnu/packages/aspell.scm | 9 +
gnu/packages/base.scm | 13 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/bittorrent.scm | 35 +-
gnu/packages/cross-base.scm | 292 +-
gnu/packages/dav.scm | 8 +-
gnu/packages/emacs.scm | 38 +-
gnu/packages/enlightenment.scm | 8 +-
gnu/packages/gnome.scm | 36 +
gnu/packages/guile.scm | 13 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 93 +-
gnu/packages/libreoffice.scm | 12 +-
gnu/packages/libunistring.scm | 6 +-
gnu/packages/links.scm | 4 +-
gnu/packages/linux.scm | 48 +-
gnu/packages/lua.scm | 36 +
gnu/packages/mail.scm | 16 +-
gnu/packages/make-bootstrap.scm | 67 +-
gnu/packages/mingw.scm | 84 +
gnu/packages/mtools.scm | 4 +-
gnu/packages/multiprecision.scm | 9 +-
gnu/packages/music.scm | 78 +-
gnu/packages/ncurses.scm | 231 +-
gnu/packages/onc-rpc.scm | 8 +
gnu/packages/package-management.scm | 6 +-
gnu/packages/parallel.scm | 4 +-
.../patches/gcc-4.9.3-mingw-gthr-default.patch | 11 +
gnu/packages/patches/httpd-CVE-2016-8740.patch | 36 +
.../patches/mingw-w64-5.0rc2-gcc-4.9.3.patch | 218 +
gnu/packages/patches/readline-7.0-mingw.patch | 28 +
gnu/packages/patches/seq24-rename-mutex.patch | 124 +
.../patches/tcsh-fix-out-of-bounds-read.patch | 31 +
gnu/packages/php.scm | 4 +-
gnu/packages/python.scm | 93 +-
gnu/packages/qt.scm | 40 +-
gnu/packages/readline.scm | 14 +-
gnu/packages/ruby.scm | 3 +
gnu/packages/samba.scm | 10 +-
gnu/packages/shells.scm | 10 +
gnu/packages/terminals.scm | 31 +
gnu/packages/text-editors.scm | 77 +
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 7 +-
gnu/packages/video.scm | 41 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/web.scm | 4 +-
gnu/packages/wm.scm | 40 +-
gnu/packages/xorg.scm | 5 +-
gnu/services/base.scm | 22 +-
gnu/services/networking.scm | 3 +
guix/build/make-bootstrap.scm | 84 +
guix/scripts/offload.scm | 116 +-
guix/scripts/publish.scm | 17 +-
guix/scripts/refresh.scm | 2 +-
guix/scripts/system.scm | 2 +-
guix/store.scm | 53 +-
guix/utils.scm | 5 +
nix/libstore/build.cc | 21 +
nix/libstore/globals.hh | 6 +
nix/libstore/optimise-store.cc | 4 +-
nix/nix-daemon/nix-daemon.cc | 12 +
po/guix/da.po | 1059 +++--
po/packages/POTFILES.in | 3 +-
po/packages/da.po | 4957 ++++++++++++--------
tests/store.scm | 9 +
72 files changed, 5787 insertions(+), 2857 deletions(-)
diff --cc gnu/packages/ruby.scm
index c57b09e,f7b0903..276aa5b
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -100,8 -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)
+ (replacement #f)
(version "2.2.6")
(source
(origin