diff options
| author | Michael Fellinger <m.fellinger@gmail.com> | 2016-12-27 18:55:10 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-12-27 17:55:10 +0000 |
| commit | df5f88070e239a23d26055c138c1efb0706e0b4e (patch) | |
| tree | 432c907f33a68dc443bc6044153a87e397793f7d /pkgs/development | |
| parent | 12532879b06d816ba88b52ed8ce5fdad53d6edb7 (diff) | |
| download | nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.tar nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.tar.gz nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.tar.bz2 nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.tar.lz nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.tar.xz nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.tar.zst nixlib-df5f88070e239a23d26055c138c1efb0706e0b4e.zip | |
ruby: 2.4.0 (#21419)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/rvm-patchsets.nix | 6 |
3 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9486d030a8b4..d5f3a6d39902 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -113,6 +113,7 @@ let configureFlags = ["--enable-shared" "--enable-pthread"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" + ++ op (!docSupport) "--disable-install-doc" ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed @@ -154,7 +155,7 @@ let license = stdenv.lib.licenses.ruby; homepage = http://www.ruby-lang.org/en/; description = "The Ruby language"; - maintainers = [ stdenv.lib.maintainers.vrthra ]; + maintainers = with stdenv.lib.maintainers; [ vrthra manveru ]; platforms = stdenv.lib.platforms.all; }; @@ -218,4 +219,12 @@ in { git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; }; }; + + ruby_2_4_0 = generic { + version = rubyVersion "2" "4" "0" ""; + sha256 = { + src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm"; + git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index d21e7d669dcc..a3aeaf6a8ba0 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -65,4 +65,9 @@ rec { "${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" ]; + "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" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index bbe1038bab2f..51db26b78236 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -1,8 +1,8 @@ { fetchFromGitHub }: fetchFromGitHub { - owner = "skaes"; + owner = "manveru"; repo = "rvm-patchsets"; - rev = "951e47ca1022cd1e41de9177fa87438cfb72d127"; - sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf"; + rev = "46e04f230ce91a786f5e583389443efec0ecd594"; + sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693"; } |