git.iko.soy/typeable/nixpkgs
on master help sign in
ruby: 2.4.0 (#21419)
commitdf5f88070e239a23d26055c138c1efb0706e0b4e authorMichael Fellinger <m.fellinger@gmail.com> dateTue 27 Dec 2016, 18:55 (10 years ago) parent1253287
4 files changed+21−5
compare with master
unifiedsplit
pkgs/development/interpreters/ruby/default.nix+10−1 pkgs/development/interpreters/ruby/patchsets.nix+5 pkgs/development/interpreters/ruby/rvm-patchsets.nix+3−3 pkgs/top-level/all-packages.nix+3−1
pkgs/development/interpreters/ruby/default.nix+10−1
@@ -113,6 +113,7 @@ let
113113
114114 configureFlags = ["--enable-shared" "--enable-pthread"]
115115 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
116+ ++ op (!docSupport) "--disable-install-doc"
116117 ++ ops stdenv.isDarwin [
117118 # on darwin, we have /usr/include/tk.h -- so the configure script detects
118119 # that tk is installed
@@ -154,7 +155,7 @@ let
154155 license = stdenv.lib.licenses.ruby;
155156 homepage = http://www.ruby-lang.org/en/;
156157 description = "The Ruby language";
157− maintainers = [ stdenv.lib.maintainers.vrthra ];
158+ maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
158159 platforms = stdenv.lib.platforms.all;
159160 };
160161
@@ -218,4 +219,12 @@ in {
218219 git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
219220 };
220221 };
222+
223+ ruby_2_4_0 = generic {
224+ version = rubyVersion "2" "4" "0" "";
225+ sha256 = {
226+ src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
227+ git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
228+ };
229+ };
221230}
pkgs/development/interpreters/ruby/patchsets.nix+5
@@ -65,4 +65,9 @@ rec {
6565 "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
6666 "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
6767 ];
68+ "2.4.0" = ops useRailsExpress [
69+ "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"
70+ "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"
71+ "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"
72+ ];
6873}
pkgs/development/interpreters/ruby/rvm-patchsets.nix+3−3
@@ -1,8 +1,8 @@
11{ fetchFromGitHub }:
22
33fetchFromGitHub {
4− owner = "skaes";
4+ owner = "manveru";
55 repo = "rvm-patchsets";
6− rev = "951e47ca1022cd1e41de9177fa87438cfb72d127";
7− sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf";
6+ rev = "46e04f230ce91a786f5e583389443efec0ecd594";
7+ sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
88}
pkgs/top-level/all-packages.nix+3−1
@@ -5777,7 +5777,8 @@ in
57775777 ruby_2_0_0
57785778 ruby_2_1_10
57795779 ruby_2_2_5
5780− ruby_2_3_3;
5780+ ruby_2_3_3
5781+ ruby_2_4_0;
57815782
57825783 # Ruby aliases
57835784 ruby = ruby_2_3;
@@ -5786,6 +5787,7 @@ in
57865787 ruby_2_1 = ruby_2_1_10;
57875788 ruby_2_2 = ruby_2_2_5;
57885789 ruby_2_3 = ruby_2_3_3;
5790+ ruby_2_4 = ruby_2_4_0;
57895791
57905792 scsh = callPackage ../development/interpreters/scsh { };
57915793