diff options
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9d1a414914..121948b4fc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1,13 +1,13 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Pjotr Prins <[email protected]> -;;; Copyright © 2014, 2015, 2016, 2017, 2021 Ludovic Courtès <[email protected]> +;;; Copyright © 2014-2017, 2021-2022 Ludovic Courtès <[email protected]> ;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]> ;;; Copyright © 2014, 2015 David Thompson <[email protected]> ;;; Copyright © 2015, 2019 Ricardo Wurmus <[email protected]> ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <[email protected]> ;;; Copyright © 2017 Nikita <[email protected]> ;;; Copyright © 2017, 2019, 2020, 2021 Marius Bakke <[email protected]> -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner <[email protected]> +;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <[email protected]> ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2017 Clément Lassieur <[email protected]> ;;; Copyright © 2017, 2018, 2019 Christopher Baines <[email protected]> @@ -5717,7 +5717,14 @@ aware transformations between times in different time zones.") (uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz.asc") (sha256 (base32 - "1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g"))))))))) + "1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g"))))) + + ;; XXX: Explicitly depend on 'guile-final', which was previously + ;; implied via the '%guile-for-build' fluid but not explicit. + ;; TODO: Remove this argument on the next rebuild cycle. + #:guile (module-ref (resolve-interface + '(gnu packages commencement)) + 'guile-final))))) (synopsis "Data from the IANA Time Zone database") (description "This library provides @code{TZInfo::Data}, which contains data from the @@ -7139,7 +7146,9 @@ run.") "0wjw9vpzr4f3nf1zf010bag71w4hdi0haybdn7r5rlmw45pmim29")))) (build-system ruby-build-system) (arguments - '(#:test-target "default" + `(#:test-target "default" + ;; TODO: Figure out why test hangs. + #:tests? ,(not (target-riscv64?)) #:phases (modify-phases %standard-phases (add-before 'check 'set-home @@ -7476,11 +7485,15 @@ navigation capabilities to @code{pry}, using @code{byebug}.") `(#:phases (modify-phases %standard-phases (add-before 'check 'skip-dubious-test - ;; This unreliable test can fail with "Expected 0 to be >= 1." (lambda _ - (substitute* "test/test_stackprof.rb" - (("def test_(cputime)" _ name) - (string-append "def skip_" name))))) + ,@(if (target-riscv64?) + ;; This unreliable test can fail with "Expected 32 to be <= 25." + '((substitute* "test/test_stackprof.rb" + ((".*assert_operator profile\\[:missed_samples.*") ""))) + ;; This unreliable test can fail with "Expected 0 to be >= 1." + '((substitute* "test/test_stackprof.rb" + (("def test_(cputime)" _ name) + (string-append "def skip_" name))))))) (add-before 'check 'build-tests (lambda _ (invoke "rake" "compile")))))) @@ -11386,7 +11399,16 @@ serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.") (base32 "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch")))) (build-system ruby-build-system) (native-inputs - (list ruby-simplecov)) + `(("ruby-simplecov" ,ruby-simplecov) + ("test-patch" + ,(search-patch "ruby-mustache-1.1.1-fix-race-condition-tests.patch")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (invoke "patch" "-p1" "--batch" "-i" + (assoc-ref inputs "test-patch"))))))) (synopsis "framework-agnostic way to render logic-free views") (description "Mustache is a framework-agnostic way to render logic-free views. |