From a54473bc5d50b55e87742aaa9125e23f53879cda Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 29 Sep 2011 21:55:12 +0000
Subject: [PATCH] Use ruby 1.9 as the default

svn path=/nixpkgs/trunk/; revision=29543
---
 pkgs/development/interpreters/ruby/default.nix         | 10 +++++-----
 .../interpreters/ruby/{ruby-19.nix => ruby-18.nix}     | 10 +++++-----
 pkgs/development/interpreters/ruby/rubygems.nix        |  4 ----
 pkgs/top-level/all-packages.nix                        |  6 +++---
 4 files changed, 13 insertions(+), 17 deletions(-)
 rename pkgs/development/interpreters/ruby/{ruby-19.nix => ruby-18.nix} (84%)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index fcd57205dcfe..d5ccb19caecd 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   name = "ruby-${version}";
   
   src = fetchurl {
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
-    sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
+    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
   };
 
   passthru = rec {
-    majorVersion = "1.8";
-    minorVersion = "7";
-    patchLevel = "330";
+    majorVersion = "1.9";
+    minorVersion = "2";
+    patchLevel = "290";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };
diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-18.nix
similarity index 84%
rename from pkgs/development/interpreters/ruby/ruby-19.nix
rename to pkgs/development/interpreters/ruby/ruby-18.nix
index d5ccb19caecd..fcd57205dcfe 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-18.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   name = "ruby-${version}";
   
   src = fetchurl {
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
-    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
+    sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
   };
 
   passthru = rec {
-    majorVersion = "1.9";
-    minorVersion = "2";
-    patchLevel = "290";
+    majorVersion = "1.8";
+    minorVersion = "7";
+    patchLevel = "330";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 60e83332c08b..0d93b330ca0e 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,16 +1,12 @@
 args : with args; 
 rec {
 
-  # some packages (eg ruby-debug) still require 1.8. So let's stick to that for
-  # now if nobody has different requirements
-
   version = "1.8.10";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
     sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q";
   };
 
-
   buildInputs = [ruby makeWrapper];
   configureFlags = [];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c7e4435e132..21881994ac70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2601,9 +2601,9 @@ let
 
   regina = callPackage ../development/interpreters/regina {};
 
-  ruby18 = callPackage ../development/interpreters/ruby { };
-  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
-  ruby = ruby18;
+  ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
+  ruby19 = callPackage ../development/interpreters/ruby { };
+  ruby = ruby19;
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });