diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-05-04 10:31:08 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-05-04 10:31:08 +0100 |
| commit | 007ea84222f31ee96202ad96d68446ce2795e387 (patch) | |
| tree | 92e0269b858ffd67d085ec2cdab25c8399933b56 | |
| parent | eecd06409f2c6cb93d54e63d26ee352b93719a7a (diff) | |
| parent | 6e353bb17f3ccd032d72c32a7b2e51fb86c80ccf (diff) | |
| download | nixlib-007ea84222f31ee96202ad96d68446ce2795e387.tar nixlib-007ea84222f31ee96202ad96d68446ce2795e387.tar.gz nixlib-007ea84222f31ee96202ad96d68446ce2795e387.tar.bz2 nixlib-007ea84222f31ee96202ad96d68446ce2795e387.tar.lz nixlib-007ea84222f31ee96202ad96d68446ce2795e387.tar.xz nixlib-007ea84222f31ee96202ad96d68446ce2795e387.tar.zst nixlib-007ea84222f31ee96202ad96d68446ce2795e387.zip | |
Merge pull request #15181 from bradediger/ruby-2.3.1
ruby: update 2.3 series to 2.3.1
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2ff960f6fcc6..8db9dd4eaf9a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -206,15 +206,14 @@ in { }; }; - ruby_2_3_0 = generic { + ruby_2_3_1 = generic { majorVersion = "2"; minorVersion = "3"; - teenyVersion = "0"; + teenyVersion = "1"; patchLevel = "0"; sha256 = { - # src = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; - src = "01z5cya4a7y751d4pb3aak5qcwmmvnwkbgz9z171p8hsbw7acnxs"; - git = "0nl0pp96m0jxi422mqx09jqn9bff90pzz0xxa0ikrx7by0g00npg"; + src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q"; + git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index ded72b8695ec..0e81db4e047f 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -54,9 +54,9 @@ rec { "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.0" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.3.1" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.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" ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 685f1441b1d7..5376b8a5e0f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5595,7 +5595,7 @@ in ruby_2_0_0 ruby_2_1_7 ruby_2_2_3 - ruby_2_3_0; + ruby_2_3_1; # Ruby aliases ruby = ruby_2_3; @@ -5603,7 +5603,7 @@ in ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_7; ruby_2_2 = ruby_2_2_3; - ruby_2_3 = ruby_2_3_0; + ruby_2_3 = ruby_2_3_1; scsh = callPackage ../development/interpreters/scsh { }; |