From 3a506a348c44167f77caaccf02bf48174e805c7b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 21 Oct 2025 22:09:54 +0200 Subject: [PATCH] jruby: 10.0.0.0 -> 10.0.2.0 Fixes CVE-2025-46551. Changes: https://github.com/jruby/jruby/releases/tag/10.0.2.0 https://github.com/jruby/jruby/releases/tag/10.0.1.0 --- pkgs/development/interpreters/jruby/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index af054c353d85..0b8a388d3ea4 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -3,6 +3,7 @@ stdenv, callPackage, fetchurl, + fetchMavenArtifact, gitUpdater, mkRubyVersion, makeBinaryWrapper, @@ -11,15 +12,15 @@ let # The version number here is whatever is reported by the RUBY_VERSION string - rubyVersion = mkRubyVersion "3" "1" "4" ""; + rubyVersion = mkRubyVersion "3" "4" "2" ""; in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "10.0.0.0"; + version = "10.0.2.0"; src = fetchurl { - url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-Qn2YJ+0j/mtNEf5hZlx13XR2ujagQ4N26zEM4qjSRzM="; + url = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/${finalAttrs.version}/jruby-dist-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-uKAm84qphGGgTtCqCyCJHOJX7L5T4SRxnOnuW4BFJfE="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' mkdir -pv $out/share/jruby/docs mv * $out - rm $out/bin/*.{bat,dll,exe,sh} + rm $out/bin/*.{bat,dll,exe} mv $out/samples $out/share/jruby/ mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/ @@ -36,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: { --set JAVA_HOME ${jre.home} done - ln -s $out/bin/jruby $out/bin/ruby - # Bundler tries to create this directory mkdir -pv $out/${finalAttrs.passthru.gemPath} mkdir -p $out/nix-support