summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-04-03 15:23:18 -0400
committerTim Steinbach <tim@nequissimus.com>2017-04-03 15:23:18 -0400
commitbc45ee50c4f043bea57422e94a92e79fd07eb379 (patch)
tree6e4bf2455f977ad1048ea5a55ce804d1ae85de0d /pkgs
parent1bf690c1bb7bfc167d6ad78102a625320691e1ac (diff)
downloadnixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.tar
nixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.tar.gz
nixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.tar.bz2
nixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.tar.lz
nixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.tar.xz
nixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.tar.zst
nixpkgs-bc45ee50c4f043bea57422e94a92e79fd07eb379.zip
ruby: 2.4.0 -> 2.4.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/ruby/default.nix8
-rw-r--r--pkgs/development/interpreters/ruby/patchsets.nix8
-rw-r--r--pkgs/development/interpreters/ruby/rvm-patchsets.nix6
-rw-r--r--pkgs/top-level/all-packages.nix8
4 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 98be02da3b2..6818a727155 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -212,11 +212,11 @@ in {
     };
   };
 
-  ruby_2_4_0 = generic {
-    version = rubyVersion "2" "4" "0" "";
+  ruby_2_4_1 = generic {
+    version = rubyVersion "2" "4" "1" "";
     sha256 = {
-      src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
-      git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
+      src = "0l0201fqwzwygnrgxay469gbb2w865bnqckq00x3prdmbh6y2c53";
+      git = "1gjn31ymypzzcwkrjx62hqw59fywz1x3cyvmi1f2yb9bwb3659ss";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index f1b82210aec..f8326ed325c 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -39,9 +39,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"
+  "2.4.1" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.4/head/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 51db26b7823..c60d6e3728d 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -1,8 +1,8 @@
 { fetchFromGitHub }:
 
 fetchFromGitHub {
-  owner  = "manveru";
+  owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "46e04f230ce91a786f5e583389443efec0ecd594";
-  sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
+  rev    = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94";
+  sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50aa1b0e8af..19a0c5cef0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -741,7 +741,7 @@ with pkgs;
   catclock = callPackage ../applications/misc/catclock { };
 
   cde = callPackage ../tools/package-management/cde { };
-  
+
   cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
 
   cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
@@ -5331,7 +5331,7 @@ with pkgs;
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;
-  
+
   openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
@@ -6084,7 +6084,7 @@ with pkgs;
     ruby_2_1_10
     ruby_2_2_5
     ruby_2_3_3
-    ruby_2_4_0;
+    ruby_2_4_1;
 
   # Ruby aliases
   ruby = ruby_2_3;
@@ -6092,7 +6092,7 @@ with pkgs;
   ruby_2_1 = ruby_2_1_10;
   ruby_2_2 = ruby_2_2_5;
   ruby_2_3 = ruby_2_3_3;
-  ruby_2_4 = ruby_2_4_0;
+  ruby_2_4 = ruby_2_4_1;
 
   scsh = callPackage ../development/interpreters/scsh { };