diff options
author | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:17:08 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:52:11 +0100 |
commit | 5fec94f3a3d4c67b748f11847064ed60d67c5ade (patch) | |
tree | 9f2c7a21ad8f2c061a8d46aac817e4c68d307086 /gnu/packages/ruby.scm | |
parent | 6931ca9baaaee4c7e85cf3cd5d0f7e4eb5cfd88e (diff) | |
parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) |
Merge remote-tracking branch 'savannah/master' into core-updates
Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/ruby.scm')
-rw-r--r-- | gnu/packages/ruby.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 32f072b74c..a8e825e360 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> -;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; @@ -64,6 +64,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) @@ -9862,7 +9863,7 @@ navigation capabilities to @code{pry}, using @code{byebug}.") ;; This test often fails (("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 + ;; /gnu/store/...-stackprof-0.2.26.gem (("def test_raw") "def skip_test_raw")))) (add-before 'check 'build-tests (lambda _ |