public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ruby_2_5: init at 2.5.0 (#33293)

Browse Source
This commit is contained in:
Mario Rodas 2018-01-02 04:50:37 -05:00 committed by zimbatm
parent a0be858835
commit 59be35113d
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/interpreters/ruby/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, darwin ? null , autoconf, darwin ? null
, buildEnv, bundler, bundix , buildEnv, bundler, bundix, Foundation
} @ args: } @ args:
let let
@ -27,6 +27,7 @@ let
tag = ver.gitTag; tag = ver.gitTag;
isRuby20 = ver.majMin == "2.0"; isRuby20 = ver.majMin == "2.0";
isRuby21 = ver.majMin == "2.1"; isRuby21 = ver.majMin == "2.1";
isRuby25 = ver.majMin == "2.5";
baseruby = self.override { useRailsExpress = false; }; baseruby = self.override { useRailsExpress = false; };
self = lib.makeOverridable ( self = lib.makeOverridable (
{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
@ -40,7 +41,7 @@ let
, libffi, fiddleSupport ? true , libffi, fiddleSupport ? true
, autoreconfHook, bison, autoconf , autoreconfHook, bison, autoconf
, darwin ? null , darwin ? null
, buildEnv, bundler, bundix , buildEnv, bundler, bundix, Foundation
}: }:
let rubySrc = let rubySrc =
if useRailsExpress then fetchFromGitHub { if useRailsExpress then fetchFromGitHub {
@ -75,11 +76,13 @@ let
++ (op opensslSupport openssl) ++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm) ++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml) ++ (op yamlSupport libyaml)
++ (op isRuby25 autoconf)
# Looks like ruby fails to build on darwin without readline even if curses # Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
# running on darwin # running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline) ++ (op (!cursesSupport && stdenv.isDarwin) readline)
++ (op (isRuby25 && stdenv.isDarwin) Foundation)
++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
enableParallelBuilding = true; enableParallelBuilding = true;
@ -106,6 +109,11 @@ let
cp ${config}/config.guess tool/ cp ${config}/config.guess tool/
cp ${config}/config.sub tool/ cp ${config}/config.sub tool/
'' ''
else if isRuby25 then ''
sed -i configure.ac -e '/config.guess/d'
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
''
else opString useRailsExpress '' else opString useRailsExpress ''
sed -i configure.in -e '/config.guess/d' sed -i configure.in -e '/config.guess/d'
cp ${config}/config.guess tool/ cp ${config}/config.guess tool/
@ -220,4 +228,12 @@ in {
git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl";
}; };
}; };
ruby_2_5_0 = generic {
version = rubyVersion "2" "5" "0" "";
sha256 = {
src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6";
git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd";
};
};
} }

5
pkgs/development/interpreters/ruby/patchsets.nix
View File

@ -39,4 +39,9 @@ rec {
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
]; ];
"2.5.0" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
];
} }

4
pkgs/development/interpreters/ruby/rvm-patchsets.nix
View File

@ -3,6 +3,6 @@
fetchFromGitHub { fetchFromGitHub {
owner = "skaes"; owner = "skaes";
repo = "rvm-patchsets"; repo = "rvm-patchsets";
rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; rev = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3";
sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz";
} }

6
pkgs/top-level/all-packages.nix
View File

@ -6916,12 +6916,13 @@ with pkgs;
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
inherit (callPackage ../development/interpreters/ruby {}) inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; })
ruby_2_0_0 ruby_2_0_0
ruby_2_1_10 ruby_2_1_10
ruby_2_2_8 ruby_2_2_8
ruby_2_3_5 ruby_2_3_5
ruby_2_4_2; ruby_2_4_2
ruby_2_5_0;
# Ruby aliases # Ruby aliases
ruby = ruby_2_3; ruby = ruby_2_3;
@ -6930,6 +6931,7 @@ with pkgs;
ruby_2_2 = ruby_2_2_8; ruby_2_2 = ruby_2_2_8;
ruby_2_3 = ruby_2_3_5; ruby_2_3 = ruby_2_3_5;
ruby_2_4 = ruby_2_4_2; ruby_2_4 = ruby_2_4_2;
ruby_2_5 = ruby_2_5_0;
scsh = callPackage ../development/interpreters/scsh { }; scsh = callPackage ../development/interpreters/scsh { };