JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ruby 1.9 as the default

Browse Source 
svn path=/nixpkgs/trunk/; revision=29543
This commit is contained in:
Shea Levy 2011-09-29 21:55:12 +00:00
parent 9f3fb4b1ae
commit a54473bc5d
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/ruby/default.nix
View File

@ -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}";
};

10
pkgs/development/interpreters/ruby/ruby-19.nix → pkgs/development/interpreters/ruby/ruby-18.nix
View File

@ -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}";
};

4
pkgs/development/interpreters/ruby/rubygems.nix
View File

@ -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 = [];

6
pkgs/top-level/all-packages.nix
View File

@ -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 { });