diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-03-16 10:19:30 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-03-16 10:19:30 +0000 |
| commit | 618cae45dc2a45079e910e72be2062c58590f262 (patch) | |
| tree | 45536e51dafe3d34bd2cf55ee252e3345bf08803 /gnu/packages/ruby.scm | |
| parent | 2ee54513196bad8e663e78ac695b6ffa0da49051 (diff) | |
| parent | 00bf07ecccee86da4ced281bd28948c96db284e6 (diff) | |
Merge remote-tracking branch 'savannah/master' into gnome-team
Change-Id: I775274c2693536e2efa36c9abca4c54c5c458e26
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cc775ec6ef..0dea780882 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017, 2019-2022 Marius Bakke <marius@gnu.org> -;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net> @@ -34,7 +34,7 @@ ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; ;;; This file is part of GNU Guix. @@ -3259,7 +3259,10 @@ error streams.") (file-name (git-file-name name version)) (sha256 (base32 - "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y")))) + "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y")) + (patches + (search-patches + "ruby-x25519-automatic-fallback-non-x86_64.patch")))) (build-system ruby-build-system) (arguments (list #:test-target "spec" @@ -9847,13 +9850,13 @@ navigation capabilities to @code{pry}, using @code{byebug}.") (define-public ruby-stackprof (package (name "ruby-stackprof") - (version "0.2.25") + (version "0.2.26") (source (origin (method url-fetch) (uri (rubygems-uri "stackprof" version)) (sha256 - (base32 "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8")))) + (base32 "1gdqqwnampxmc54nf6zfy9apkmkpdavzipvfssmjlhnrrjy8qh7f")))) (build-system ruby-build-system) (arguments (list @@ -9873,7 +9876,10 @@ navigation capabilities to @code{pry}, using @code{byebug}.") (("def test_(cputime)" _ name) (string-append "def skip_" name)) ;; This test often fails - (("def test_gc") "def skip_test_gc")))) + (("def test_gc") "def skip_test_gc") + ;; This test is known to fail on 32-bit systems. + ;; /gnu/store/w8y8wm82by1cnp33n5vy976wbrns9jys-stackprof-0.2.26.gem + (("def test_raw") "def skip_test_raw")))) (add-before 'check 'build-tests (lambda _ (invoke "rake" "compile"))) |