diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-12 16:50:47 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-12 17:46:23 +0000 |
| commit | a1eca979fb8da842e73c42f4f53be29b169810f2 (patch) | |
| tree | 681c7283e412bb8a29c2531c4408b49c3e184764 /gnu/packages/ruby.scm | |
| parent | 48d86a9ec6d8d2e97da2299ea41a03ef4cdaab83 (diff) | |
| parent | 371aa5777a3805a3886f3feea5f1960fe3fe4219 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates-frozen.
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9dfa5043ed0..332a03f96b8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm | |||
| @@ -1151,18 +1151,10 @@ structure. Supports custom object formatting via plugins.") | |||
| 1151 | "03a11clhycyn0jhc7g9davpqd83sn60jqwjy1y145ag9sq6sp935")))) | 1151 | "03a11clhycyn0jhc7g9davpqd83sn60jqwjy1y145ag9sq6sp935")))) |
| 1152 | (build-system ruby-build-system) | 1152 | (build-system ruby-build-system) |
| 1153 | (arguments | 1153 | (arguments |
| 1154 | `(#:phases | 1154 | `(#:tests? #f ; Disable tests since they depend on pandoc behavior |
| 1155 | ; and there are no upstream releases. | ||
| 1156 | #:phases | ||
| 1155 | (modify-phases %standard-phases | 1157 | (modify-phases %standard-phases |
| 1156 | (add-after 'unpack 'disable-failing-tests | ||
| 1157 | ;; TODO: Remove this phase after ghc-pandoc gets upgraded to 2.9.2+ | ||
| 1158 | ;; (see: https://github.com/xwmx/pandoc-ruby/issues/39). | ||
| 1159 | (lambda _ | ||
| 1160 | (substitute* "test/test_conversions.rb" | ||
| 1161 | (("next if from == to.*" all) | ||
| 1162 | (string-append | ||
| 1163 | all | ||
| 1164 | " next if ['plain', 'beamer'].include? to\n"))) | ||
| 1165 | #t)) | ||
| 1166 | (add-after 'unpack 'patch-pandoc-path | 1158 | (add-after 'unpack 'patch-pandoc-path |
| 1167 | (lambda* (#:key inputs #:allow-other-keys) | 1159 | (lambda* (#:key inputs #:allow-other-keys) |
| 1168 | (let ((pandoc (search-input-file inputs "/bin/pandoc"))) | 1160 | (let ((pandoc (search-input-file inputs "/bin/pandoc"))) |
