From fa832b8a8e741663c5ac2a55177eee3664ee3b99 Mon Sep 17 00:00:00 2001 From: Remco van 't Veer Date: Mon, 25 Aug 2025 10:34:17 +0200 Subject: [PATCH] gnu: ruby-3.3: Disinherit from ruby-3.4. Remove inheritance relation between ruby-3.3 and ruby-3.4 to prevent rebuilds of ruby-3.3 when ruby-3.4 changes. * gnu/packages/ruby.scm (ruby-3.3): Disinherit from ruby-3.4 package. Copy-paste the fields instead. Change-Id: I93c1e1b8d57e6a3d4a6b6b5c0b00273a0f3430cc Signed-off-by: Andreas Enge --- gnu/packages/ruby.scm | 50 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a21e5c210e0..adfcfec6b27 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -148,7 +148,7 @@ a focus on simplicity and productivity.") (define-public ruby-3.3 (package - (inherit ruby-3.4) + (name "ruby") (version "3.3.9") (source (origin @@ -158,7 +158,53 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "1fvng8x44x90pn8nl4sxa5nzb34jwq0is6l5k7066zrg18ca491b")))))) + "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 + (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