diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
| commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
| tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/ruby.scm | |
| parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
| parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
| download | patches-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar patches-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 243ff9e5db..6251145f09 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -121,7 +121,10 @@ a focus on simplicity and productivity.") (snippet `(begin ;; Remove bundled libffi (delete-file-recursively "ext/fiddle/libffi-3.2.1") - #t)))))) + #t)) + (patches + (search-patches "ruby-rubygems-2612-ruby24.patch" + "ruby-rubygems-2613-ruby24.patch")))))) (define-public ruby-2.3 (package @@ -137,6 +140,7 @@ a focus on simplicity and productivity.") (base32 "132p5kc1sx97svbx04g40pz5pr7p8f6jlmnq5r2prlcz5q1xj71l")) (modules '((guix build utils))) + (patches (search-patches "ruby-2.3.4-rubygems-2613-ruby23.patch")) (snippet `(begin ;; Remove bundled libffi (delete-file-recursively "ext/fiddle/libffi-3.2.1") @@ -151,6 +155,7 @@ a focus on simplicity and productivity.") (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" (version-major+minor version) "/ruby-" version ".tar.xz")) + (patches (search-patches "ruby-2.2.7-rubygems-2613-ruby22.patch")) (sha256 (base32 "0lyb7gnbbhs3a3v9grsjgbaixm20wxz6x3h0czyrxnj3cpp8lk13")))))) |