[Nix-dev] [Nix-commits] SVN commit: nix - r29453 - in nixpkgs/trunk/pkgs: development/interpreters/ruby top-level

[shea at shealevy.com]

Hi all,

Ruby 1.9 has been out and stable for quite some time now, and most new
projects seem to expect it. Does anyone have a problem with dumping ruby
1.8 and making 1.9 the default? If no one objects I will make the change
in a week.

Cheers,
Shea

> Author: shlevy
> Date: Fri Sep 23 15:08:55 2011
> New Revision: 29453
> URL: https://ssl.nixos.org/websvn/nix/?rev=29453&sc=1
>
> Log:
> Get ruby-1.9.2-p290 to build
>
> Replaced:
>    nixpkgs/trunk/pkgs/development/interpreters/ruby/ruby-19.nix
>       - copied, changed from r29452,
> nixpkgs/trunk/pkgs/development/interpreters/ruby/default.nix
> Modified:
>    nixpkgs/trunk/pkgs/top-level/all-packages.nix
>
> Copied and modified:
> nixpkgs/trunk/pkgs/development/interpreters/ruby/ruby-19.nix (from r29452,
> nixpkgs/trunk/pkgs/development/interpreters/ruby/default.nix)
> ==============================================================================
> --- nixpkgs/trunk/pkgs/development/interpreters/ruby/default.nix	Fri Sep
> 23 14:41:22 2011	(r29452, copy source)
> +++ nixpkgs/trunk/pkgs/development/interpreters/ruby/ruby-19.nix	Fri Sep
> 23 15:08:55 2011	(r29453)
> @@ -17,8 +17,8 @@
>    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 @@
>    };
>
>    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}";
>    };
>
> Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
> ==============================================================================
> --- nixpkgs/trunk/pkgs/top-level/all-packages.nix	Fri Sep 23 14:41:22
> 2011	(r29452)
> +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix	Fri Sep 23 15:08:55
> 2011	(r29453)
> @@ -2600,7 +2600,7 @@
>    regina = callPackage ../development/interpreters/regina {};
>
>    ruby18 = callPackage ../development/interpreters/ruby { };
> -  #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit
> ruby18 fetchurl; };
> +  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
>    ruby = ruby18;
>
>    rubyLibs = recurseIntoAttrs (callPackage
> ../development/interpreters/ruby/libs.nix { });
> _______________________________________________
> nix-commits mailing list
> nix-commits at lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-commits
>