diff options
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 92 |
1 files changed, 54 insertions, 38 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0e25a20cb2..791c96baf8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8,14 +8,15 @@ ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2019, 2020 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> -;;; Copyright © 2020, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2023 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> -;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2023 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr> +;;; Copyright © 2025 Remco van 't Veer <remco@remworks.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +89,7 @@ (define-public ruby-3.4 (package (name "ruby") - (version "3.4.4") + (version "3.4.6") (source (origin (method url-fetch) @@ -97,7 +98,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "1x18dr3qhr1mypbvxc7yr46z06l11if3cx3babcfv7a9x7pn6vgp")))) + "1f2r91mfcas1wz0dyplmsfd40cxi7h8d603h29ss92lk4ay9ajc0")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -120,7 +121,7 @@ "lib/mkmf.rb" "process.c" "test/rubygems/test_gem_ext_configure_builder.rb" - "test/rdoc/test_rdoc_parser.rb" + "test/rdoc/rdoc_parser_test.rb" "test/ruby/test_rubyoptions.rb" "test/ruby/test_process.rb" "test/ruby/test_system.rb" @@ -147,36 +148,8 @@ a focus on simplicity and productivity.") (define-public ruby-3.3 (package - (inherit ruby-3.4) - (version "3.3.8") - (source - (origin - (method url-fetch) - (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" - (version-major+minor version) - "/ruby-" version ".tar.xz")) - (sha256 - (base32 - "0hl6bi27w711hva96f95hg02vqzb30kabdw9hbj3rnj3w3z71bj4")))))) - -(define-public ruby-3.2 - (package - (inherit ruby-3.3) - (version "3.2.8") - (source - (origin - (method url-fetch) - (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" - (version-major+minor version) - "/ruby-" version ".tar.xz")) - (sha256 - (base32 - "0g3s68kcxb24y4h24wvikvk5v3q6l6hs0kjxms9m49sm048d7k0w")))))) - -(define-public ruby-3.1 - (package - (inherit ruby-3.2) - (version "3.1.7") + (name "ruby") + (version "3.3.9") (source (origin (method url-fetch) @@ -185,10 +158,53 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "0ddhh3nzfnwwb0ks3rsmf3w1m71ban30wf61djn8gnkbbd2wr2k5")))) + "1fvng8x44x90pn8nl4sxa5nzb34jwq0is6l5k7066zrg18ca491b")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:configure-flags + ,(if (%current-target-system) + '(list (string-append + "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--enable-shared") + ''("--enable-shared")) ; dynamic linking + #:phases + (modify-phases %standard-phases + (add-before 'configure 'replace-bin-sh-and-remove-libffi + (lambda _ + (substitute* '("configure.ac" + "template/Makefile.in" + "lib/rubygems/installer.rb" + "ext/pty/pty.c" + "io.c" + "lib/mkmf.rb" + "process.c" + "test/rubygems/test_gem_ext_configure_builder.rb" + "test/rdoc/test_rdoc_parser.rb" + "test/ruby/test_rubyoptions.rb" + "test/ruby/test_process.rb" + "test/ruby/test_system.rb" + "tool/rbinstall.rb") + (("/bin/sh") (which "sh")))))))) + (native-inputs + (append (if (%current-target-system) + (list this-package) + '()) + (list autoconf libyaml))) (inputs - (modify-inputs (package-inputs ruby-3.2) - (delete "libyaml"))))) + (list readline openssl-1.1 libffi gdbm)) + (propagated-inputs + (list zlib)) + (native-search-paths + (list (search-path-specification + (variable "GEM_PATH") + (files (list (string-append "lib/ruby/vendor_ruby")))))) + (synopsis "Programming language interpreter") + (description "Ruby is a dynamic object-oriented programming language with +a focus on simplicity and productivity.") + (home-page "https://www.ruby-lang.org") + (license license:ruby))) (define-public ruby-2.7 (package |