b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #237187 from marsam/update-jruby

Browse source 
jruby: 9.3.9.0 -> 9.4.3.0
This commit is contained in:
Pol Dellaiera 2023-06-13 05:53:18 +02:00 committed by GitHub
parent 14e5e0f7f7 671243193c
commit 202850e1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
pkgs/development/interpreters/jruby/default.nix
View file

@ -1,43 +1,44 @@
{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }:
{ lib, stdenv, callPackage, fetchurl, mkRubyVersion, makeBinaryWrapper, jre }:
let
# The version number here is whatever is reported by the RUBY_VERSION string
rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
# The version number here is whatever is reported by the RUBY_VERSION string
rubyVersion = mkRubyVersion "3" "1" "4" "";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jruby";
version = "9.3.9.0";
version = "9.4.3.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "sha256-JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg=";
url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
mkdir -pv $out/docs
mv * $out
rm $out/bin/*.{bat,dll,exe,sh}
mv $out/COPYING $out/LICENSE* $out/docs
mkdir -pv $out/share/jruby/docs
mv * $out
rm $out/bin/*.{bat,dll,exe,sh}
mv $out/samples $out/share/jruby/
mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/
for i in $out/bin/jruby{,.bash}; do
wrapProgram $i \
--set JAVA_HOME ${jre.home}
done
for i in $out/bin/jruby; do
wrapProgram $i \
--set JAVA_HOME ${jre.home}
done
ln -s $out/bin/jruby $out/bin/ruby
ln -s $out/bin/jruby $out/bin/ruby
# Bundler tries to create this directory
mkdir -pv $out/${passthru.gemPath}
mkdir -p $out/nix-support
cat > $out/nix-support/setup-hook <<EOF
addGemPath() {
addToSearchPath GEM_PATH \$1/${passthru.gemPath}
}
# Bundler tries to create this directory
mkdir -pv $out/${finalAttrs.passthru.gemPath}
mkdir -p $out/nix-support
cat > $out/nix-support/setup-hook <<EOF
addGemPath() {
addToSearchPath GEM_PATH \$1/${finalAttrs.passthru.gemPath}
}
addEnvHooks "$hostOffset" addGemPath
EOF
addEnvHooks "$hostOffset" addGemPath
EOF
'';
postFixup = ''
@ -48,21 +49,18 @@ jruby = stdenv.mkDerivation rec {
rubyEngine = "jruby";
gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}";
libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
devEnv = callPackage ../ruby/dev.nix {
ruby = finalAttrs.finalPackage;
};
};
meta = with lib; {
description = "Ruby interpreter written in Java";
homepage = "http://jruby.org/";
homepage = "https://www.jruby.org/";
changelog = "https://github.com/jruby/jruby/releases/tag/${version}";
license = with licenses; [ cpl10 gpl2 lgpl21 ];
platforms = platforms.unix;
platforms = jre.meta.platforms;
maintainers = [ maintainers.fzakaria ];
sourceProvenance = with sourceTypes; [ binaryBytecode ];
};
};
in jruby.overrideAttrs (oldAttrs: {
passthru = oldAttrs.passthru // {
devEnv = callPackage ../ruby/dev.nix {
ruby = jruby;
};
};
})

2
pkgs/development/ruby-modules/gem/default.nix
View file

@ -136,7 +136,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
# As of ruby 3.0, ruby headers require -fdeclspec when building with clang
# Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (ruby.rubyEngine == "ruby" && stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [
"-fdeclspec"
]);