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

ruby: 2.4.0 (#21419)

Browse Source
This commit is contained in:
Michael Fellinger 2016-12-27 18:55:10 +01:00 committed by zimbatm
parent 12532879b0
commit df5f88070e
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,7 @@ let
configureFlags = ["--enable-shared" "--enable-pthread"] configureFlags = ["--enable-shared" "--enable-pthread"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [ ++ ops stdenv.isDarwin [
# on darwin, we have /usr/include/tk.h -- so the configure script detects # on darwin, we have /usr/include/tk.h -- so the configure script detects
# that tk is installed # that tk is installed
@ -154,7 +155,7 @@ let
license = stdenv.lib.licenses.ruby; license = stdenv.lib.licenses.ruby;
homepage = http://www.ruby-lang.org/en/; homepage = http://www.ruby-lang.org/en/;
description = "The Ruby language"; description = "The Ruby language";
maintainers = [ stdenv.lib.maintainers.vrthra ]; maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
@ -218,4 +219,12 @@ in {
git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
}; };
}; };
ruby_2_4_0 = generic {
version = rubyVersion "2" "4" "0" "";
sha256 = {
src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
};
};
} }

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

@ -65,4 +65,9 @@ rec {
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
]; ];
"2.4.0" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"
];
} }

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

@ -1,8 +1,8 @@
{ fetchFromGitHub }: { fetchFromGitHub }:
fetchFromGitHub { fetchFromGitHub {
owner = "skaes"; owner = "manveru";
repo = "rvm-patchsets"; repo = "rvm-patchsets";
rev = "951e47ca1022cd1e41de9177fa87438cfb72d127"; rev = "46e04f230ce91a786f5e583389443efec0ecd594";
sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf"; sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
} }

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

@ -5777,7 +5777,8 @@ in
ruby_2_0_0 ruby_2_0_0
ruby_2_1_10 ruby_2_1_10
ruby_2_2_5 ruby_2_2_5
ruby_2_3_3; ruby_2_3_3
ruby_2_4_0;
# Ruby aliases # Ruby aliases
ruby = ruby_2_3; ruby = ruby_2_3;
@ -5786,6 +5787,7 @@ in
ruby_2_1 = ruby_2_1_10; ruby_2_1 = ruby_2_1_10;
ruby_2_2 = ruby_2_2_5; ruby_2_2 = ruby_2_2_5;
ruby_2_3 = ruby_2_3_3; ruby_2_3 = ruby_2_3_3;
ruby_2_4 = ruby_2_4_0;
scsh = callPackage ../development/interpreters/scsh { }; scsh = callPackage ../development/interpreters/scsh { };