Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Ludovic Courtès 2016-12-09 18:11:14 +01:00
commit f80b4d2ce0
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
72 changed files with 5789 additions and 2859 deletions

View file

@ -102,6 +102,7 @@ a focus on simplicity and productivity.")
(define-public ruby-2.2
(package (inherit ruby)
(replacement #f)
(version "2.2.6")
(source
(origin
@ -115,6 +116,7 @@ a focus on simplicity and productivity.")
(define-public ruby-2.1
(package (inherit ruby)
(replacement #f)
(version "2.1.10")
(source
(origin
@ -148,6 +150,7 @@ a focus on simplicity and productivity.")
(define-public ruby-1.8
(package (inherit ruby)
(replacement #f)
(version "1.8.7-p374")
(source
(origin