diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-04-03 15:33:26 -0400 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-10-07 21:26:37 +0100 |
| commit | b1018291eefbb457c63baa88fe6e306a62226a34 (patch) | |
| tree | 063dc3e16b95f81770aedc556f61a20b1084852a | |
| parent | firefox: revert the upgrade for now (diff) | |
| download | nixpkgs-b1018291eefbb457c63baa88fe6e306a62226a34.tar.gz | |
ruby: 2.2.5 -> 2.2.7
(cherry picked from commit ec2c46923078ceda67f944ae09bcb4d435d45ce5)
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 811c6c415e85..bb42966974b5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -196,11 +196,11 @@ in { }; }; - ruby_2_2_5 = generic { - version = rubyVersion "2" "2" "5" ""; + ruby_2_2_7 = generic { + version = rubyVersion "2" "2" "7" ""; sha256 = { - src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; - git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; + src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p"; + git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 89661fd90492..5052c757b205 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,10 +24,10 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.5" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.2.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; "2.3.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aec03025b50..9a9f506f7dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3324,7 +3324,7 @@ with pkgs; paper-gtk-theme = callPackage ../misc/themes/paper { }; paperwork = callPackage ../applications/office/paperwork { }; - + papertrail = callPackage ../tools/text/papertrail { }; par2cmdline = callPackage ../tools/networking/par2cmdline { }; @@ -6014,7 +6014,7 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_5 + ruby_2_2_7 ruby_2_3_5 ruby_2_4_0; @@ -6022,7 +6022,7 @@ with pkgs; ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_5; + ruby_2_2 = ruby_2_2_7; ruby_2_3 = ruby_2_3_5; ruby_2_4 = ruby_2_4_0; @@ -11043,7 +11043,7 @@ with pkgs; b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { }; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; - + bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { }; |